From 9ecf5313ab7648a114426e2f0516e190ee1cbf70 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 29 May 2025 17:27:35 +0300 Subject: [PATCH 1/4] Up libs --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 47f072c..af53af7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 3.0.0 + 3.0.9 fraudbusters @@ -109,17 +109,16 @@ dev.vality damsel - 1.648-ad715bd dev.vality.woody woody-thrift - 2.0.8 + 2.0.9 dev.vality.woody woody-api - 2.0.8 + 2.0.9 io.opentelemetry From 1de752e2295a18b94457821b52900eb812322902 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 29 May 2025 17:32:52 +0300 Subject: [PATCH 2/4] Up libs --- .../dev/vality/fraudbusters/config/KafkaStreamConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java b/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java index 4b552af..906e265 100644 --- a/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java +++ b/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java @@ -6,7 +6,9 @@ import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.LogAndContinueExceptionHandler; +import org.springframework.beans.factory.ObjectProvider; 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; @@ -19,10 +21,11 @@ public class KafkaStreamConfig { public static final String SENDER = "sender"; private final ConsumerGroupIdService consumerGroupIdService; + private final ObjectProvider sslBundles; @Bean public Properties rewriteStreamProperties(KafkaProperties kafkaProperties) { - final Map props = kafkaProperties.buildStreamsProperties(); + final Map props = kafkaProperties.buildStreamsProperties(sslBundles.getIfAvailable()); props.put(StreamsConfig.APPLICATION_ID_CONFIG, consumerGroupIdService.generateGroupId(SENDER)); props.put(StreamsConfig.CLIENT_ID_CONFIG, consumerGroupIdService.generateGroupId(SENDER)); props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName()); From f2203edf487c1c5efb79c2a1601aa93d6905ee4f Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 29 May 2025 17:42:33 +0300 Subject: [PATCH 3/4] Up libs --- .../fraudbusters/extension/config/KafkaTopicsConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/dev/vality/fraudbusters/extension/config/KafkaTopicsConfig.java b/src/test/java/dev/vality/fraudbusters/extension/config/KafkaTopicsConfig.java index fac534b..196a7fe 100644 --- a/src/test/java/dev/vality/fraudbusters/extension/config/KafkaTopicsConfig.java +++ b/src/test/java/dev/vality/fraudbusters/extension/config/KafkaTopicsConfig.java @@ -1,8 +1,10 @@ package dev.vality.fraudbusters.extension.config; import org.apache.kafka.clients.admin.NewTopic; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.ssl.SslBundles; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.kafka.config.TopicBuilder; @@ -11,12 +13,15 @@ @TestConfiguration public class KafkaTopicsConfig { + @Autowired + private ObjectProvider sslBundles; + @Autowired private KafkaProperties kafkaProperties; @Bean public KafkaAdmin adminClient() { - return new KafkaAdmin(kafkaProperties.buildAdminProperties()); + return new KafkaAdmin(kafkaProperties.buildAdminProperties(sslBundles.getIfAvailable())); } @Bean From 3789b8e8b46c337e0ff1a7210c56a456b7ab36dd Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Tue, 3 Jun 2025 13:55:14 +0300 Subject: [PATCH 4/4] Up libs --- pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index af53af7..e93eb14 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 3.0.9 + 3.1.0 fraudbusters @@ -110,16 +110,6 @@ dev.vality damsel - - dev.vality.woody - woody-thrift - 2.0.9 - - - dev.vality.woody - woody-api - 2.0.9 - io.opentelemetry opentelemetry-semconv