diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-06 14:36:31 +0200 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-14 07:20:48 +0000 |
commit | b378f9961c74efacccd71badfeaad0654b27ed27 (patch) | |
tree | 1e3c0231c4a70ed49365e07cfdc412711a4dda97 /asdc-controller/src | |
parent | 5e67cc099f6bcade2f12bf9220bdf3682f2d06c1 (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
Diffstat (limited to 'asdc-controller/src')
-rw-r--r-- | asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java | 5 | ||||
-rw-r--r-- | asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCConfigurationTest.java | 7 |
2 files changed, 9 insertions, 3 deletions
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); } } |