Skip to content

Commit 775eb8f

Browse files
committed
Fix bootstrap.servers
`toString()` rendered the list of servers within [...]. Remove the brackets since streams expects a comma-delimited list.
1 parent 07f1da7 commit 775eb8f

File tree

2 files changed

+27
-18
lines changed

2 files changed

+27
-18
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.autoconfigure.kafka;
1818

1919
import java.io.IOException;
20+
import java.util.List;
2021
import java.util.Properties;
2122

2223
import org.apache.kafka.streams.StreamsBuilder;
@@ -151,8 +152,14 @@ public static class KafkaStreamsConfiguration {
151152
@Bean(KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME)
152153
public Properties defaultKafkaStreamsConfig(KafkaProperties properties) {
153154
Properties streamsConfig = new Properties();
154-
properties.buildStreamsProperties()
155-
.forEach((k, v) -> streamsConfig.put(k, v.toString()));
155+
properties.buildStreamsProperties().forEach((k, v) -> {
156+
String value = v.toString();
157+
if (v instanceof List && value.length() > 1) {
158+
// trim [...] - revert to comma-delimited list
159+
value = value.substring(1, value.length() - 1);
160+
}
161+
streamsConfig.put(k, value);
162+
});
156163
return streamsConfig;
157164
}
158165

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -279,25 +279,27 @@ public void adminProperties() {
279279
@Test
280280
public void streamsProperties() {
281281
this.contextRunner.withPropertyValues("spring.kafka.clientId=cid",
282-
"spring.application.name=appName",
283-
"spring.kafka.properties.foo.bar.baz=qux.fiz.buz",
284-
"spring.kafka.streams.cache-max-bytes-buffering=42",
285-
"spring.kafka.streams.client-id=override",
286-
"spring.kafka.streams.properties.fiz.buz=fix.fox",
287-
"spring.kafka.streams.replication-factor=2",
288-
"spring.kafka.streams.state-dir=/tmp/state",
289-
"spring.kafka.streams.ssl.key-password=p7",
290-
"spring.kafka.streams.ssl.key-store-location=classpath:ksLocP",
291-
"spring.kafka.streams.ssl.key-store-password=p8",
292-
"spring.kafka.streams.ssl.key-store-type=PKCS12",
293-
"spring.kafka.streams.ssl.trust-store-location=classpath:tsLocP",
294-
"spring.kafka.streams.ssl.trust-store-password=p9",
295-
"spring.kafka.streams.ssl.trust-store-type=PKCS12",
296-
"spring.kafka.streams.ssl.protocol=TLSv1.2")
297-
.run((context) -> {
282+
"spring.kafka.bootstrap-servers=localhost:9092,localhost:9093",
283+
"spring.application.name=appName",
284+
"spring.kafka.properties.foo.bar.baz=qux.fiz.buz",
285+
"spring.kafka.streams.cache-max-bytes-buffering=42",
286+
"spring.kafka.streams.client-id=override",
287+
"spring.kafka.streams.properties.fiz.buz=fix.fox",
288+
"spring.kafka.streams.replication-factor=2",
289+
"spring.kafka.streams.state-dir=/tmp/state",
290+
"spring.kafka.streams.ssl.key-password=p7",
291+
"spring.kafka.streams.ssl.key-store-location=classpath:ksLocP",
292+
"spring.kafka.streams.ssl.key-store-password=p8",
293+
"spring.kafka.streams.ssl.key-store-type=PKCS12",
294+
"spring.kafka.streams.ssl.trust-store-location=classpath:tsLocP",
295+
"spring.kafka.streams.ssl.trust-store-password=p9",
296+
"spring.kafka.streams.ssl.trust-store-type=PKCS12",
297+
"spring.kafka.streams.ssl.protocol=TLSv1.2").run((context) -> {
298298
Properties configs = context.getBean(
299299
KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
300300
Properties.class);
301+
assertThat(configs.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG))
302+
.isEqualTo("localhost:9092, localhost:9093");
301303
assertThat(
302304
configs.get(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG))
303305
.isEqualTo("42");

0 commit comments

Comments
 (0)