diff options
author | 2024-04-11 10:09:42 +0000 | |
---|---|---|
committer | 2024-04-11 10:09:42 +0000 | |
commit | f6ded15d10ebaf6ee9740c98ca6599bdbe5d1546 (patch) | |
tree | 7c40fefbea7fd2e51ac33f384489d2e4e2bc1e79 /cps-ncmp-service | |
parent | e33a3c09f747ccabae31db4dfe7b3461c0530aa9 (diff) | |
parent | 4d16019dc5b5c92c9fb0a3da1f8eff8d99115eb5 (diff) |
Merge "Update depcrecated method in KafaConfig"
Diffstat (limited to 'cps-ncmp-service')
2 files changed, 11 insertions, 7 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfig.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfig.java index 4f2674aca..167df5a98 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfig.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfig.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2023 Nordix Foundation + * Copyright (C) 2023-2024 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import java.util.Map; import lombok.RequiredArgsConstructor; import org.apache.kafka.clients.producer.ProducerConfig; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.ssl.SslBundles; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -51,6 +52,8 @@ public class KafkaConfig<T> { private final KafkaProperties kafkaProperties; + private static final SslBundles NO_SSL = null; + /** * This sets the strategy for creating legacy Kafka producer instance from kafka properties defined into * application.yml and replaces value-serializer by JsonSerializer. @@ -59,7 +62,7 @@ public class KafkaConfig<T> { */ @Bean public ProducerFactory<String, T> legacyEventProducerFactory() { - final Map<String, Object> producerConfigProperties = kafkaProperties.buildProducerProperties(); + final Map<String, Object> producerConfigProperties = kafkaProperties.buildProducerProperties(NO_SSL); producerConfigProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); return new DefaultKafkaProducerFactory<>(producerConfigProperties); } @@ -72,7 +75,7 @@ public class KafkaConfig<T> { */ @Bean public ConsumerFactory<String, T> legacyEventConsumerFactory() { - final Map<String, Object> consumerConfigProperties = kafkaProperties.buildConsumerProperties(); + final Map<String, Object> consumerConfigProperties = kafkaProperties.buildConsumerProperties(NO_SSL); consumerConfigProperties.put("spring.deserializer.value.delegate.class", JsonDeserializer.class); return new DefaultKafkaConsumerFactory<>(consumerConfigProperties); } @@ -112,7 +115,7 @@ public class KafkaConfig<T> { */ @Bean public ProducerFactory<String, CloudEvent> cloudEventProducerFactory() { - final Map<String, Object> producerConfigProperties = kafkaProperties.buildProducerProperties(); + final Map<String, Object> producerConfigProperties = kafkaProperties.buildProducerProperties(NO_SSL); return new DefaultKafkaProducerFactory<>(producerConfigProperties); } @@ -124,7 +127,7 @@ public class KafkaConfig<T> { */ @Bean public ConsumerFactory<String, CloudEvent> cloudEventConsumerFactory() { - final Map<String, Object> consumerConfigProperties = kafkaProperties.buildConsumerProperties(); + final Map<String, Object> consumerConfigProperties = kafkaProperties.buildConsumerProperties(NO_SSL); return new DefaultKafkaConsumerFactory<>(consumerConfigProperties); } @@ -136,7 +139,8 @@ public class KafkaConfig<T> { */ @Bean public KafkaTemplate<String, CloudEvent> cloudEventKafkaTemplate() { - final KafkaTemplate<String, CloudEvent> kafkaTemplate = new KafkaTemplate<>(cloudEventProducerFactory()); + final KafkaTemplate<String, CloudEvent> kafkaTemplate = + new KafkaTemplate<>(cloudEventProducerFactory()); kafkaTemplate.setConsumerFactory(cloudEventConsumerFactory()); return kafkaTemplate; } diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfigSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfigSpec.groovy index d5b091552..16f27d081 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfigSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/kafka/KafkaConfigSpec.groovy @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2023 Nordix Foundation + * Copyright (C) 2023-2024 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |