Allow env variables to be used in MSO adaptor

Allow env variables to be used in MSO adaptor properties file

Issue-ID: CCSDK-3360
Signed-off-by: lalena.aria <lalena.aria@att.com>
Change-Id: Ifd7abee6380c82bdde38b2476b977a91d3cbcf7f

diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml
index f6f28da..6be2f96 100755 (executable)
--- a/adaptors/artifacts/pom.xml
+++ b/adaptors/artifacts/pom.xml
@@ -72,6 +72,13 @@
                 <type>xml</type>
                 <classifier>feature</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>ccsdk-base-http</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
@@ -142,6 +149,16 @@
                 <artifactId>sql-resource-installer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>base-http-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>base-http-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml
index d5107b0..9cb359d 100644 (file)
--- a/adaptors/base/http/provider/pom.xml
+++ b/adaptors/base/http/provider/pom.xml
@@ -37,5 +37,10 @@
             <artifactId>logging-filter-base</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

diff --git a/adaptors/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java b/adaptors/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java
index cc6f06a..65cbdd7 100644 (file)
--- a/adaptors/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java
+++ b/adaptors/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java
@@ -9,6 +9,8 @@ import java.util.Properties;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 import javax.ws.rs.client.ClientBuilder;
+
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.onap.logging.filter.base.MetricLogClientFilter;
 import org.onap.logging.filter.base.PayloadLoggingClientFilter;
 import org.slf4j.Logger;
@@ -69,7 +71,7 @@ public abstract class AbstractHttpAdapter {
         if (propDir == null || propDir.length() < 1) {
             propDir = SDNC_CONFIG_DIR_DEFAULT;
         }
-        Properties properties = new Properties();
+        Properties properties = new EnvProperties();
         // forward slash is checked to support path src/test/resources on windows machine
         if (!propDir.endsWith(File.separator) && !propDir.endsWith("/")) {
             propDir = propDir + File.separator;