From 3e34fda1f814cc7fcc04d704af812f374ff4a7cd Mon Sep 17 00:00:00 2001
From: "Lee, Tian (tl5884)" <tianl@amdocs.com>
Date: Tue, 15 Aug 2017 16:18:20 +0100
Subject: [AAI-170 R1710] Upversion sdc-distribution-client

- from 1.0.0 to 1.1.32-SNAPSHOT

Change-Id: Iac775e7ae3378dcaeca717cdafde9a8472c24172
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
---
 pom.xml                                               |  4 ++--
 .../modelloader/config/ModelLoaderConfig.java         | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b77f49..88e6804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,9 +157,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
+			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
 		    <artifactId>sdc-distribution-client</artifactId>
-		    <version>1.0.0</version>
+		    <version>1.1.32-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
index 107010d..adc8f0b 100644
--- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
@@ -62,6 +62,8 @@ public class ModelLoaderConfig implements IConfiguration {
   protected static final String PROP_ML_DISTRIBUTION_USER = PREFIX_DISTRIBUTION_CLIENT + "USER";
   protected static final String PROP_ML_DISTRIBUTION_ARTIFACT_TYPES = PREFIX_DISTRIBUTION_CLIENT
       + "ARTIFACT_TYPES";
+  protected static final String PROP_ML_DISTRIBUTION_HTTPS_WITH_DMAAP =
+          PREFIX_DISTRIBUTION_CLIENT + "USE_HTTPS_WITH_DMAAP";
 
   protected static final String PROP_AAI_BASE_URL = PREFIX_AAI + "BASE_URL";
   protected static final String PROP_AAI_KEYSTORE_FILE = PREFIX_AAI + "KEYSTORE_FILE";
@@ -165,6 +167,17 @@ public class ModelLoaderConfig implements IConfiguration {
     return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_USER);
   }
 
+  @Override
+  public boolean isFilterInEmptyResources() {
+      return false;
+  }
+
+  @Override
+  public Boolean isUseHttpsWithDmaap() {
+      String useHTTPS = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_HTTPS_WITH_DMAAP);
+      return useHTTPS == null ? false : Boolean.valueOf(useHTTPS);
+  }
+  
   public String getAaiKeyStorePath() {
     return certLocation + "/" + modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_FILE);
   }
@@ -224,9 +237,5 @@ public class ModelLoaderConfig implements IConfiguration {
 
     return false;
   }
-
-  public boolean isFilterInEmptyResources() {
-	  return false;
-  }
-
+  
 }
-- 
cgit 1.2.3-korg