Merge "Use managed guava version"

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index ef35eec..3768b81 100755 (executable)
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -62,7 +62,7 @@
                                                                        <descriptor>assembly/assembly-for-plugin.xml</descriptor>\r
                                                                </assembly>\r
                                                                <tags>\r
-                                                                 <tag>2.0-STAGING-latest</tag>\r
+                                                                 <tag>3.0-STAGING-latest</tag>\r
                                                                </tags>\r
                                                                    \r
                                                        </build>\r

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 2ec04fe..050c3c5 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
                the Portal team. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>epsdk-app-onap</artifactId>\r
-       <version>2.0.0-SNAPSHOT</version>\r
+       <version>3.0.0-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>ECOMP SDK Webapp for OpenSource</name>\r
        <description>ECOMP SDK Web Application for public release</description>\r

diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 6a0ca5f..02144f0 100644 (file)
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -2,7 +2,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
-major=2\r
+major=3\r
 minor=0\r
 patch=0\r
 \r

diff --git a/pom.xml b/pom.xml
index 74ff570..f16ca60 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
        <properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <build.version>2.0.0-SNAPSHOT</build.version>\r
+               <build.version>3.0.0-SNAPSHOT</build.version>\r
                <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
@@ -267,5 +267,5 @@
                        <version>4.5.3</version>\r
                </dependency>\r
        </dependencies>\r
-       <version>2.0.0-SNAPSHOT</version>\r
+       <version>3.0.0-SNAPSHOT</version>\r
 </project>\r

diff --git a/version.properties b/version.properties
index 6a0ca5f..02144f0 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
-major=2\r
+major=3\r
 minor=0\r
 patch=0\r
 \r

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 9a6210b..57d3de1 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
                inherit from a parent maven module. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>vid-app-common</artifactId>\r
-       <version>2.0.0-SNAPSHOT</version>\r
+       <version>3.0.0-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>VID Common</name>\r
        <description>VID Common code for opensource version</description>\r

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
index 6b17c93..f5625ce 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
@@ -309,7 +309,7 @@ public class AAIRestInterface {
         */
        public Response RestPost(String fromAppId, String path, String payload, boolean xml) {
                String methodName = "RestPost";
-               String url=systemPropertyHelper.getFullServicePath(path);
+               String url=systemPropertyHelper.getServiceBasePath(path);
                String transId = UUID.randomUUID().toString();
                logger.debug(EELFLoggerDelegate.debugLogger, methodName + START_STRING);
 
@@ -317,7 +317,7 @@ public class AAIRestInterface {
                try {
                        initRestClient();
                        Logging.logRequest(outgoingRequestsLogger, HttpMethod.POST, url, payload);
-                       response = authenticateRequest(client.target(systemPropertyHelper.getFullServicePath(path))
+                       response = authenticateRequest(client.target(systemPropertyHelper.getServiceBasePath(path))
                                        .request()
                     .accept(xml ? MediaType.APPLICATION_XML : MediaType.APPLICATION_JSON)
                                        .header(TRANSACTION_ID_HEADER, transId)

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
index ebf39c4..4d43d3b 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SystemPropertyHelper.java
@@ -38,6 +38,10 @@ public class SystemPropertyHelper {
         return getSystemProperty(AAIProperties.AAI_SERVER_URL);
     }
 
+    public Optional<String> getAAIServerBaseUrl(){
+        return getSystemProperty(AAIProperties.AAI_SERVER_URL_BASE);
+    }
+
     public Optional<String> getAAIVIDUsername(){
         return getSystemProperty(AAIProperties.AAI_VID_USERNAME);
     }
@@ -70,6 +74,10 @@ public class SystemPropertyHelper {
         return getAAIServerUrl().orElse("") + path;
     }
 
+    public String getServiceBasePath(String path) {
+        return getAAIServerBaseUrl().orElse("") + path;
+    }
+
     public String getEncodedCredentials() throws InvalidPropertyException, UnsupportedEncodingException {
         String vidUsername = getAAIVIDUsername().orElseThrow(InvalidPropertyException::new);
         String vidPassword = Password.deobfuscate(getAAIVIDPasswd().orElseThrow(InvalidPropertyException::new));

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
index 288b891..cd2b8ff 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/util/SingleAAIRestInterfaceTest.java
@@ -302,6 +302,7 @@ public class SingleAAIRestInterfaceTest {
         when(systemPropertyHelper.getAAIVIDUsername()).thenReturn(Optional.of("user"));
         when(systemPropertyHelper.getEncodedCredentials()).thenReturn("someCredentials");
         when(systemPropertyHelper.getFullServicePath(Mockito.anyString())).thenReturn("http://localhost/path");
+        when(systemPropertyHelper.getServiceBasePath(Mockito.anyString())).thenReturn("http://localhost/path");
     }
 
 }
\ No newline at end of file

diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 6a0ca5f..02144f0 100755 (executable)
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -2,7 +2,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
-major=2\r
+major=3\r
 minor=0\r
 patch=0\r
 \r