Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-44438
This commit is contained in:
Moritz Halbritter
2025-02-26 11:35:08 +01:00
parent 2ec99a7591 ea25734599
commit e7d9f195d2
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
View File

@@ -238,7 +238,7 @@ public class KafkaAutoConfiguration {
static void applySslBundle(Map<String, Object> properties, SslBundle sslBundle) {
if (sslBundle != null) {
properties.put(SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG, SslBundleSslEngineFactory.class.getName());
properties.put(SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG, SslBundleSslEngineFactory.class);
properties.put(SslBundle.class.getName(), sslBundle);
}
}

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
View File

@@ -216,8 +216,7 @@ class KafkaAutoConfigurationTests {
assertThat(context).hasSingleBean(KafkaConnectionDetails.class);
DefaultKafkaConsumerFactory<?, ?> consumerFactory = context.getBean(DefaultKafkaConsumerFactory.class);
Map<String, Object> configs = consumerFactory.getConfigurationProperties();
assertThat(configs).containsEntry("ssl.engine.factory.class",
"org.springframework.boot.autoconfigure.kafka.SslBundleSslEngineFactory");
assertThat(configs).containsEntry("ssl.engine.factory.class", SslBundleSslEngineFactory.class);
assertThat(configs).containsEntry("org.springframework.boot.ssl.SslBundle", sslBundle);
});
}
@@ -310,8 +309,7 @@ class KafkaAutoConfigurationTests {
assertThat(context).hasSingleBean(KafkaConnectionDetails.class);
DefaultKafkaProducerFactory<?, ?> producerFactory = context.getBean(DefaultKafkaProducerFactory.class);
Map<String, Object> configs = producerFactory.getConfigurationProperties();
assertThat(configs).containsEntry("ssl.engine.factory.class",
"org.springframework.boot.autoconfigure.kafka.SslBundleSslEngineFactory");
assertThat(configs).containsEntry("ssl.engine.factory.class", SslBundleSslEngineFactory.class);
assertThat(configs).containsEntry("org.springframework.boot.ssl.SslBundle", sslBundle);
});
}
@@ -394,8 +392,7 @@ class KafkaAutoConfigurationTests {
assertThat(context).hasSingleBean(KafkaConnectionDetails.class);
KafkaAdmin admin = context.getBean(KafkaAdmin.class);
Map<String, Object> configs = admin.getConfigurationProperties();
assertThat(configs).containsEntry("ssl.engine.factory.class",
"org.springframework.boot.autoconfigure.kafka.SslBundleSslEngineFactory");
assertThat(configs).containsEntry("ssl.engine.factory.class", SslBundleSslEngineFactory.class);
assertThat(configs).containsEntry("org.springframework.boot.ssl.SslBundle", sslBundle);
});
}
@@ -490,8 +487,7 @@ class KafkaAutoConfigurationTests {
.getBean(KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
KafkaStreamsConfiguration.class)
.asProperties();
assertThat(configs).containsEntry("ssl.engine.factory.class",
"org.springframework.boot.autoconfigure.kafka.SslBundleSslEngineFactory");
assertThat(configs).containsEntry("ssl.engine.factory.class", SslBundleSslEngineFactory.class);
assertThat(configs).containsEntry("org.springframework.boot.ssl.SslBundle", sslBundle);
});
}