summaryrefslogtreecommitdiffstats
path: root/adaptors/base
diff options
context:
space:
mode:
authorTIMONEY, DANIEL <dtimoney@att.com>2021-07-02 13:51:13 +0000
committerKAPIL SINGAL <ks220y@att.com>2021-07-02 19:52:06 +0000
commit8a1e6dfddf777e5ce84a2112f4a0f1f42246f293 (patch)
tree094260c8c1d5aa8a0578550a08da8de358c403d2 /adaptors/base
parent300dfeff13b3535f1c2fbfc68ab74e2e690b504f (diff)
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 (cherry picked from commit dd477ba94c66fd9c5fd1a73b57a64348ac073023)
Diffstat (limited to 'adaptors/base')
-rw-r--r--adaptors/base/http/provider/pom.xml5
-rw-r--r--adaptors/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java4
2 files changed, 8 insertions, 1 deletions
diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml
index a401559d2..3ea7e8181 100644
--- 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 cc6f06a4d..65cbdd764 100644
--- 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;