diff --git a/pom.xml b/pom.xml
index 47f072c8..e93eb140 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
dev.vality
service-parent-pom
- 3.0.0
+ 3.1.0
fraudbusters
@@ -109,17 +109,6 @@
dev.vality
damsel
- 1.648-ad715bd
-
-
- dev.vality.woody
- woody-thrift
- 2.0.8
-
-
- dev.vality.woody
- woody-api
- 2.0.8
io.opentelemetry
diff --git a/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java b/src/main/java/dev/vality/fraudbusters/config/KafkaStreamConfig.java
index 4b552afb..906e2657 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());
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 fac534bb..196a7fed 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