summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-04-06 14:36:31 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-05-14 07:20:48 +0000
commitb378f9961c74efacccd71badfeaad0654b27ed27 (patch)
tree1e3c0231c4a70ed49365e07cfdc412711a4dda97
parent5e67cc099f6bcade2f12bf9220bdf3682f2d06c1 (diff)
[SDC] Update SDC Distribution Client
Use the latest (currently on SNAPSHOT) version od SDC Distribution Client on SO, in order to be able to (later) discuss also with HTTP protocol Issue-ID: SO-2792 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I8d49361ba4889a0c4200a9f35901c49534a8f03d
-rw-r--r--asdc-controller/pom.xml7
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java5
-rw-r--r--asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java7
-rw-r--r--mso-api-handlers/mso-api-handler-infra/pom.xml2
4 files changed, 16 insertions, 5 deletions
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 60a3b5a07b..42c4a12a37 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 3a7c7ad477..08cc22bc7b 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>