From ef39ff8988e0169f4fb067374af9a03d1cdc7ae6 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 7 May 2019 11:58:38 -0400
Subject: [PATCH] Start building against Spring Kafka 2.3.0.M2 snapshots

See gh-16739
See gh-16752
---
 .../kafka/KafkaAutoConfigurationTests.java    | 23 ++++++++++++-------
 .../spring-boot-dependencies/pom.xml          |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
index bf9caf594b..cee5c62933 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.kafka;
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -289,6 +290,7 @@ public class KafkaAutoConfigurationTests {
 				});
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void streamsProperties() {
 		this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class)
@@ -314,15 +316,16 @@ public class KafkaAutoConfigurationTests {
 					Properties configs = context.getBean(
 							KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
 							KafkaStreamsConfiguration.class).asProperties();
-					assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
-							.isEqualTo("localhost:9092, localhost:9093");
+					assertThat((List<String>) configs
+							.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
+									.containsExactly("localhost:9092", "localhost:9093");
 					assertThat(
 							configs.get(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG))
-									.isEqualTo("1024");
+									.isEqualTo(1024);
 					assertThat(configs.get(StreamsConfig.CLIENT_ID_CONFIG))
 							.isEqualTo("override");
 					assertThat(configs.get(StreamsConfig.REPLICATION_FACTOR_CONFIG))
-							.isEqualTo("2");
+							.isEqualTo(2);
 					assertThat(configs.get(StreamsConfig.STATE_DIR_CONFIG))
 							.isEqualTo("/tmp/state");
 					assertThat(configs.get(SslConfigs.SSL_KEY_PASSWORD_CONFIG))
@@ -354,6 +357,7 @@ public class KafkaAutoConfigurationTests {
 				});
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void streamsApplicationIdUsesMainApplicationNameByDefault() {
 		this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class)
@@ -364,8 +368,9 @@ public class KafkaAutoConfigurationTests {
 					Properties configs = context.getBean(
 							KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
 							KafkaStreamsConfiguration.class).asProperties();
-					assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
-							.isEqualTo("localhost:9092, localhost:9093");
+					assertThat((List<String>) configs
+							.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
+									.containsExactly("localhost:9092", "localhost:9093");
 					assertThat(configs.get(StreamsConfig.APPLICATION_ID_CONFIG))
 							.isEqualTo("my-test-app");
 				});
@@ -390,6 +395,7 @@ public class KafkaAutoConfigurationTests {
 				});
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void streamsWithSeveralStreamsBuilderFactoryBeans() {
 		this.contextRunner
@@ -402,8 +408,9 @@ public class KafkaAutoConfigurationTests {
 					Properties configs = context.getBean(
 							KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME,
 							KafkaStreamsConfiguration.class).asProperties();
-					assertThat(configs.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
-							.isEqualTo("localhost:9092, localhost:9093");
+					assertThat((List<String>) configs
+							.get(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG))
+									.containsExactly("localhost:9092", "localhost:9093");
 					verify(context.getBean("&firstStreamsBuilderFactoryBean",
 							StreamsBuilderFactoryBean.class), never())
 									.setAutoStartup(false);
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 3ed5e40ae8..7bdd0b5c61 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -187,7 +187,7 @@
 		<spring-framework.version>${spring.version}</spring-framework.version>
 		<spring-hateoas.version>1.0.0.M1</spring-hateoas.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-plugin.version>2.0.0.M1</spring-plugin.version>
 		<spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>