X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fconfig%2FModelLoaderConfig.java;h=88735d4d5b21ef05a583554894cd2a6ce4dcb11f;hb=aecbb49acfb4dfb3ee5abd0b96a46f38a4b2f568;hp=7523fce765be5807235193e0e7cb27b37b2848f0;hpb=5fe489423ea9f2a50e85da43581960f70684e069;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
index 7523fce..88735d4 100644
--- a/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
@@ -56,6 +56,7 @@ public class ModelLoaderConfig implements IConfiguration {
     protected static final String PROP_ML_DISTRIBUTION_ASDC_CONNECTION_DISABLED =
             PREFIX_DISTRIBUTION_CLIENT + "ASDC_CONNECTION_DISABLE";
     protected static final String PROP_ML_DISTRIBUTION_ASDC_ADDRESS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_ADDRESS";
+    protected static final String PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_USE_HTTPS";
     protected static final String PROP_ML_DISTRIBUTION_CONSUMER_GROUP = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_GROUP";
     protected static final String PROP_ML_DISTRIBUTION_CONSUMER_ID = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_ID";
     protected static final String PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME =
@@ -155,6 +156,16 @@ public class ModelLoaderConfig implements IConfiguration {
         return get(PROP_ML_DISTRIBUTION_ASDC_ADDRESS);
     }
 
+    @Override
+    public Boolean isUseHttpsWithSDC() {
+        /* if PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS is null, https will be used, as before */
+        String value = get(PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS);
+        if (value == null) {
+          return true;
+        }
+        return Boolean.parseBoolean(value);
+    }
+
     @Override
     public String getConsumerGroup() {
         return get(PROP_ML_DISTRIBUTION_CONSUMER_GROUP);
@@ -320,7 +331,7 @@ public class ModelLoaderConfig implements IConfiguration {
 
     /**
      * Read the value of the property and replace any wildcard OXM version "v*" with the supplied default OXM version
-     * 
+     *
      * @param propertyName
      *            the name of the property storing the OXM version (possibly containing v*)
      * @param version