aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.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/utils/kafka/KafkaCommonConfig.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/utils/kafka/KafkaCommonConfig.java')
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.java
index 477e677..b285bfe 100644
--- a/sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/kafka/KafkaCommonConfig.java
@@ -19,18 +19,22 @@
*/
package org.onap.sdc.utils.kafka;
+import java.util.Properties;
+import java.util.UUID;
+import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.config.SslConfigs;
import org.onap.sdc.impl.Configuration;
-import java.util.Properties;
-import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class KafkaCommonConfig {
+ private static final Logger log = LoggerFactory.getLogger(KafkaCommonConfig.class);
+
private final Configuration configuration;
- public KafkaCommonConfig(Configuration configuration){
+ public KafkaCommonConfig(Configuration configuration) {
this.configuration = configuration;
}
@@ -47,7 +51,6 @@ public class KafkaCommonConfig {
props.put(ConsumerConfig.ALLOW_AUTO_CREATE_TOPICS_CONFIG, false);
props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
-
return props;
}
@@ -70,10 +73,10 @@ public class KafkaCommonConfig {
props.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, configuration.getTrustStorePassword());
props.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, configuration.getTrustStorePath());
props.put(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG, configuration.getKeyStorePassword());
+ props.put(SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG, "");
props.put(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG, configuration.getKeyStorePath());
props.put(SslConfigs.SSL_KEY_PASSWORD_CONFIG, configuration.getKeyStorePassword());
- }
- else{
+ } else {
props.put(SaslConfigs.SASL_JAAS_CONFIG, configuration.getKafkaSaslJaasConfig());
props.put(SaslConfigs.SASL_MECHANISM, configuration.getKafkaSaslMechanism());
}