root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #16739 from Gary Russell

Browse Source 
* gh-16739:
  Start building against Spring Kafka 2.3.0.M2 snapshots

Closes gh-16739
pull/16815/head
Andy Wilkinson 6 years ago
parent 5514192672 ef39ff8988
commit 1d4335931f
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.kafka;
import java.io.File; import java.io.File;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
@ -289,6 +290,7 @@ public class KafkaAutoConfigurationTests {
}); });
} }
@SuppressWarnings("unchecked")
@Test @Test
public void streamsProperties() { public void streamsProperties() {
this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class) this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class)
@ -314,15 +316,16 @@ public class KafkaAutoConfigurationTests {
Properties configs = context.getBean( Properties configs = context.getBean(
KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME, KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
KafkaStreamsConfiguration.class).asProperties(); KafkaStreamsConfiguration.class).asProperties();
assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG)) assertThat((List<String>) configs
.isEqualTo("localhost:9092, localhost:9093"); .get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
.containsExactly("localhost:9092", "localhost:9093");
assertThat( assertThat(
configs.get(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG)) configs.get(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG))
.isEqualTo("1024"); .isEqualTo(1024);
assertThat(configs.get(StreamsConfig.CLIENT_ID_CONFIG)) assertThat(configs.get(StreamsConfig.CLIENT_ID_CONFIG))
.isEqualTo("override"); .isEqualTo("override");
assertThat(configs.get(StreamsConfig.REPLICATION_FACTOR_CONFIG)) assertThat(configs.get(StreamsConfig.REPLICATION_FACTOR_CONFIG))
.isEqualTo("2"); .isEqualTo(2);
assertThat(configs.get(StreamsConfig.STATE_DIR_CONFIG)) assertThat(configs.get(StreamsConfig.STATE_DIR_CONFIG))
.isEqualTo("/tmp/state"); .isEqualTo("/tmp/state");
assertThat(configs.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG)) assertThat(configs.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG))
@ -354,6 +357,7 @@ public class KafkaAutoConfigurationTests {
}); });
} }
@SuppressWarnings("unchecked")
@Test @Test
public void streamsApplicationIdUsesMainApplicationNameByDefault() { public void streamsApplicationIdUsesMainApplicationNameByDefault() {
this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class) this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class)
@ -364,8 +368,9 @@ public class KafkaAutoConfigurationTests {
Properties configs = context.getBean( Properties configs = context.getBean(
KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME, KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
KafkaStreamsConfiguration.class).asProperties(); KafkaStreamsConfiguration.class).asProperties();
assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG)) assertThat((List<String>) configs
.isEqualTo("localhost:9092, localhost:9093"); .get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
.containsExactly("localhost:9092", "localhost:9093");
assertThat(configs.get(StreamsConfig.APPLICATION_ID_CONFIG)) assertThat(configs.get(StreamsConfig.APPLICATION_ID_CONFIG))
.isEqualTo("my-test-app"); .isEqualTo("my-test-app");
}); });
@ -390,6 +395,7 @@ public class KafkaAutoConfigurationTests {
}); });
} }
@SuppressWarnings("unchecked")
@Test @Test
public void streamsWithSeveralStreamsBuilderFactoryBeans() { public void streamsWithSeveralStreamsBuilderFactoryBeans() {
this.contextRunner this.contextRunner
@ -402,8 +408,9 @@ public class KafkaAutoConfigurationTests {
Properties configs = context.getBean( Properties configs = context.getBean(
KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME, KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
KafkaStreamsConfiguration.class).asProperties(); KafkaStreamsConfiguration.class).asProperties();
assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG)) assertThat((List<String>) configs
.isEqualTo("localhost:9092, localhost:9093"); .get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
.containsExactly("localhost:9092", "localhost:9093");
verify(context.getBean("&firstStreamsBuilderFactoryBean", verify(context.getBean("&firstStreamsBuilderFactoryBean",
StreamsBuilderFactoryBean.class), never()) StreamsBuilderFactoryBean.class), never())
.setAutoStartup(false); .setAutoStartup(false);

2
spring-boot-project/spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -187,7 +187,7 @@
<spring-framework.version>${spring.version}</spring-framework.version> <spring-framework.version>${spring.version}</spring-framework.version>
<spring-hateoas.version>1.0.0.M1</spring-hateoas.version> <spring-hateoas.version>1.0.0.M1</spring-hateoas.version>
<spring-integration.version>5.2.0.M1</spring-integration.version> <spring-integration.version>5.2.0.M1</spring-integration.version>
<spring-kafka.version>2.3.0.M1</spring-kafka.version> <spring-kafka.version>2.3.0.BUILD-SNAPSHOT</spring-kafka.version>
<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version> <spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
<spring-plugin.version>2.0.0.M1</spring-plugin.version> <spring-plugin.version>2.0.0.M1</spring-plugin.version>
<spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version> <spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>

Write Preview
Loading…
Cancel
Save