aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2023-05-08 18:17:03 +0100
committerefiacor <fiachra.corcoran@est.tech>2023-06-13 18:56:19 +0100
commitac4baf28eab0a4412810f02237b981933c985e95 (patch)
treec9fc3c3a6c35e5481b261ff2acc912bdf708fa12 /sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
parent289c0ceb2b3b0565ae19014a4cfa06a1bf10ccc3 (diff)
[SDC-DISTRO-CLIENT] SSL config updates
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: Iacaf5072241e56bf72db13acef0f533814ae8989 Issue-ID: SDC-4476
Diffstat (limited to 'sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java')
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
index add4185..8841856 100644
--- a/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
@@ -21,15 +21,14 @@
package org.onap.sdc.impl;
import java.util.List;
-
import org.onap.sdc.api.consumer.IConfiguration;
public class Configuration implements IConfiguration {
- private List<String> msgBusAddressList;
+ private String msgBusAddressList;
private final String kafkaSecurityProtocolConfig;
private final String kafkaSaslMechanism;
- private final String kafkaSaslJaasConfig;
+ private String kafkaSaslJaasConfig = null;
private final int kafkaConsumerMaxPollInterval;
private final int kafkaConsumerSessionTimeout;
private String sdcStatusTopicName;
@@ -60,7 +59,9 @@ public class Configuration implements IConfiguration {
public Configuration(IConfiguration other) {
this.kafkaSecurityProtocolConfig = other.getKafkaSecurityProtocolConfig();
this.kafkaSaslMechanism = other.getKafkaSaslMechanism();
- this.kafkaSaslJaasConfig = other.getKafkaSaslJaasConfig();
+ if (!"SSL".equals(this.kafkaSecurityProtocolConfig)) {
+ this.kafkaSaslJaasConfig = other.getKafkaSaslJaasConfig();
+ }
this.comsumerID = other.getConsumerID();
this.consumerGroup = other.getConsumerGroup();
this.pollingInterval = other.getPollingInterval();
@@ -233,11 +234,11 @@ public class Configuration implements IConfiguration {
this.sdcNotificationTopicName = sdcNotificationTopicName;
}
- public List<String> getMsgBusAddress() {
+ public String getMsgBusAddress() {
return msgBusAddressList;
}
- public void setMsgBusAddress(List<String> newMsgBusAddress) {
+ public void setMsgBusAddress(String newMsgBusAddress) {
msgBusAddressList = newMsgBusAddress;
}