diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-06-12 13:40:51 +0200 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-06-12 13:40:51 +0200 |
| commit | b62fc3ddf19b23a8b7cd52e718bced699444dd84 (patch) | |
| tree | d57dafc670d04747b9cadfbb67a9e8bcc94bce97 | |
| parent | 73133eaa2339548d8293f8069e314bf564fbedc6 (diff) | |
Update aai-common to 1.14.0 in traversal1.14.0
- update aai-common to 1.14.0 which contains Janusgraph update to 0.3.3
Issue-ID: AAI-3870
Change-Id: I7200d140a04845866bb189d8bdf5a820a710dd68
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
| -rw-r--r-- | aai-traversal/pom.xml | 2 | ||||
| -rw-r--r-- | aai-traversal/src/main/java/org/onap/aai/rest/dsl/DslQueryBuilder.java | 9 | ||||
| -rw-r--r-- | pom.xml | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 7581a03..5544ae7 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.13.5-SNAPSHOT</version> + <version>1.14.0-SNAPSHOT</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>aai-traversal</artifactId> diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/DslQueryBuilder.java b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/DslQueryBuilder.java index a953fcb..524321f 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/DslQueryBuilder.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/DslQueryBuilder.java @@ -88,7 +88,7 @@ public class DslQueryBuilder { if (selectCounter <= 0) { return this.end(); } else { - query.append(".select('stepMain').fold().dedup()"); + query.append(".select(Pop.mixed,'stepMain').fold().dedup()"); } return this; } @@ -244,14 +244,15 @@ public class DslQueryBuilder { } + private static final Pattern AAI_NODE_TYPE_PATTERN = Pattern.compile("aai-node-type"); + public DslQueryBuilder select(long selectCounter, List<String> keys) { /* * TODO : isNot should look at the vertex properties and include everything except the * notKeys */ - Pattern p = Pattern.compile("aai-node-type"); - Matcher m = p.matcher(query); + Matcher m = AAI_NODE_TYPE_PATTERN.matcher(query); int count = 0; while (m.find()) { count++; @@ -260,7 +261,7 @@ public class DslQueryBuilder { if (selectCounter == count || keys == null) { String selectStep = "step" + selectCounter; // String keysArray = String.join(",", keys); - query.append(".as('").append(selectStep).append("')").append(".as('stepMain').select('") + query.append(".as('").append(selectStep).append("')").append(".as('stepMain').select(Pop.mixed,'") .append(selectStep).append("')"); } return this; @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.13.3</version> + <version>1.14.0</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.13.5-SNAPSHOT</version> + <version>1.14.0-SNAPSHOT</version> <name>aai-traversal</name> <packaging>pom</packaging> <modules> @@ -41,7 +41,8 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> - <aai.common.version>1.13.6</aai.common.version> + <!-- <aai.common.version>1.13.4</aai.common.version> --> + <aai.common.version>1.14.0-SNAPSHOT</aai.common.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path> <release.path>/content/repositories/releases/</release.path> @@ -58,7 +59,7 @@ Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order Use in combination to rewrite code and imports, then checkstyle - + mvn formatter:format spotless:apply process-sources --> <plugin> |