aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aai-traversal/pom.xml17
-rw-r--r--aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java6
-rw-r--r--aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java4
-rw-r--r--pom.xml2
4 files changed, 5 insertions, 24 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 141f8f7..724b2db 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -15,7 +15,6 @@
<properties>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
- <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
@@ -30,22 +29,6 @@
<sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
</properties>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>ECOMP Release Repository</name>
- <url>${nexusproxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>ECOMP Snapshot Repository</name>
- <url>${nexusproxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
- <site>
- <id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
diff --git a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
index 32e8cbe..4b0f24d 100644
--- a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
@@ -942,10 +942,8 @@ public class SearchGraph {
invItemList.add(invItem);
}
}
- if (invItemList != null) {
- inventoryItems.set("inventoryResponseItem", invItemList);
- inventoryItem.set("inventoryResponseItems", inventoryItems);
- }
+ inventoryItems.set("inventoryResponseItem", invItemList);
+ inventoryItem.set("inventoryResponseItems", inventoryItems);
}
}
return inventoryItem;
diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
index ee6b1ab..4330db1 100644
--- a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
@@ -105,7 +105,7 @@ public class SearchProvider extends RESTAPI {
//only consider header value for search
DBConnectionType type = this.determineConnectionType("force-cache", realTime);
final Version version;
- if (versionParam.equals("latest")) {
+ if ("latest".equals(versionParam)) {
version = AAIProperties.LATEST;
} else {
version = Version.valueOf(versionParam);
@@ -197,7 +197,7 @@ public class SearchProvider extends RESTAPI {
DBConnectionType type = this.determineConnectionType("force-cache", realTime);
final Version version;
- if (versionParam.equals("latest")) {
+ if ("latest".equals(versionParam)) {
version = AAIProperties.LATEST;
} else {
version = Version.valueOf(versionParam);
diff --git a/pom.xml b/pom.xml
index e84c225..b179c3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<properties>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
- <sitePath>/content/sites/site/org/onap/aai/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</sitePath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>