diff options
Diffstat (limited to 'ms/sdclistener/application/src/main')
3 files changed, 7 insertions, 28 deletions
diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java index b56772afb..511dc08d5 100644 --- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java @@ -31,11 +31,8 @@ public class SdcListenerConfiguration implements IConfiguration { public static final String TOSCA_CSAR = "TOSCA_CSAR"; - @Value("${listenerservice.config.asdcAddress}") - private String asdcAddress; - - @Value("${listenerservice.config.messageBusAddress}") - private List<String> messageBusAddress; + @Value("${listenerservice.config.sdcAddress}") + private String sdcAddress; @Value("${listenerservice.config.user}") private String user; @@ -64,9 +61,6 @@ public class SdcListenerConfiguration implements IConfiguration { @Value("${listenerservice.config.activateServerTLSAuth}") private boolean activateServerTLSAuth; - @Value("${listenerservice.config.isUseHttpsWithDmaap}") - private boolean isUseHttpsWithDmaap; - @Value("${listenerservice.config.isUseHttpsWithSDC}") private boolean isUseHttpsWithSDC; @@ -83,13 +77,8 @@ public class SdcListenerConfiguration implements IConfiguration { private int getHttpProxyPort; @Override - public String getAsdcAddress() { - return asdcAddress; - } - - @Override - public List<String> getMsgBusAddress() { - return messageBusAddress; + public String getSdcAddress() { + return sdcAddress; } @Override @@ -153,11 +142,6 @@ public class SdcListenerConfiguration implements IConfiguration { } @Override - public Boolean isUseHttpsWithDmaap() { - return isUseHttpsWithDmaap; - } - - @Override public Boolean isUseHttpsWithSDC() { return isUseHttpsWithSDC; } @@ -169,7 +153,7 @@ public class SdcListenerConfiguration implements IConfiguration { @Override public String getHttpProxyHost() { - return getHttpsProxyHost; + return getHttpProxyHost; } @Override @@ -179,9 +163,7 @@ public class SdcListenerConfiguration implements IConfiguration { @Override public int getHttpProxyPort() { - return getHttpsProxyPort; + return getHttpProxyPort; } - } - diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java index 2d8c1fe04..3847350f7 100644 --- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java @@ -64,7 +64,6 @@ public class SdcListenerClient { listenerDto.setManagedChannelForGrpc(); listenerDto.setDistributionClient(distributionClient); - IDistributionClientResult result = distributionClient.init(configuration, notification); startSdcClientBasedOnTheResult(result); } diff --git a/ms/sdclistener/application/src/main/resources/application.yaml b/ms/sdclistener/application/src/main/resources/application.yaml index 080f19d26..259f8c4c5 100644 --- a/ms/sdclistener/application/src/main/resources/application.yaml +++ b/ms/sdclistener/application/src/main/resources/application.yaml @@ -1,7 +1,6 @@ listenerservice: config: - asdcAddress: ${asdcAddress:localhost:8443} - messageBusAddress: ${messageBusAddress:localhost} + sdcAddress: ${sdcAddress:localhost:8443} user: ${sdcusername:cds} password: ${password:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} pollingInterval: ${pollingInterval:15} @@ -13,7 +12,6 @@ listenerservice: keyStorePassword: ${keyStorePassword} keyStorePath: ${keyStorePath} activateServerTLSAuth : ${activateServerTLSAuth:false} - isUseHttpsWithDmaap: ${isUseHttpsWithDmaap:false} isUseHttpsWithSDC: ${isUseHttpsWithSDC:true} archivePath: ${archivePath:/opt/app/onap/cds-sdc-listener/} grpcAddress: ${grpcAddress:localhost} |