Merge "[SDC] Update SDC Distribution Client"

4 files changed, 16 insertions, 5 deletions

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index e44d2ed1ee..92efb800fe 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -198,6 +198,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.9</version>
+    </dependency>
+    <dependency>
       <groupId>org.onap.so</groupId>
       <artifactId>mso-catalog-db</artifactId>
       <version>${project.version}</version>
@@ -205,7 +210,7 @@
     <dependency>
       <groupId>org.onap.sdc.sdc-distribution-client</groupId>
       <artifactId>sdc-distribution-client</artifactId>
-      <version>1.3.0</version>
+      <version>1.4.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java
index 3e5f82bc5e..c69800d640 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java
@@ -84,6 +84,11 @@ public class ASDCConfiguration implements IConfiguration {
     }
 
     @Override
+    public java.lang.Boolean isUseHttpsWithSDC() {
+        return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.useHttpsWithSdc", true);
+    }
+
+    @Override
     public boolean isConsumeProduceStatusTopic() {
         return true;
     }
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
index 40c403fd72..e4749742ee 100644
--- a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * THis class tests the ASDC Controller by using the ASDC Mock CLient
- * 
+ *
  *
  */
 public class ASDCConfigurationTest extends BaseTest {
@@ -52,6 +52,7 @@ public class ASDCConfigurationTest extends BaseTest {
         assertTrue(config.getRelevantArtifactTypes().size() == config.SUPPORTED_ARTIFACT_TYPES_LIST.size());
         assertTrue(config.getWatchDogTimeout() == 1);
         assertTrue(config.isUseHttpsWithDmaap() == true);
+        assertTrue(config.isUseHttpsWithSDC() == true);
     }
 
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index a046123778..ccbe32de5a 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -167,7 +167,7 @@
     <dependency>
       <groupId>org.onap.sdc.sdc-distribution-client</groupId>
       <artifactId>sdc-distribution-client</artifactId>
-      <version>1.3.0</version>
+      <version>1.4.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>