From 19335341ad94b04e0b735f77d651320c4ffc7f81 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Wed, 30 Oct 2019 20:53:33 -0400
Subject: [PATCH] Refactor test-embedded-kafka

---
 testing-samples/test-embedded-kafka/pom.xml   | 97 ++++++++++++++++++-
 .../java/demo/EmbeddedKafkaApplication.java   | 15 ++-
 .../src/main/resources/application.properties |  6 +-
 3 files changed, 102 insertions(+), 16 deletions(-)

diff --git a/testing-samples/test-embedded-kafka/pom.xml b/testing-samples/test-embedded-kafka/pom.xml
index b645c04..4034617 100644
--- a/testing-samples/test-embedded-kafka/pom.xml
+++ b/testing-samples/test-embedded-kafka/pom.xml
@@ -10,12 +10,28 @@
 	<description>Spring Cloud Stream Sample for Testing with Embedded Kafka</description>
 
 	<parent>
-		<groupId>io.spring.cloud.stream.sample</groupId>
-		<artifactId>spring-cloud-stream-samples-parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.0.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
+	<properties>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -31,5 +47,78 @@
 			<artifactId>spring-kafka-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-releases</id>
+			<name>Spring Releases</name>
+			<url>https://repo.spring.io/libs-release-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
diff --git a/testing-samples/test-embedded-kafka/src/main/java/demo/EmbeddedKafkaApplication.java b/testing-samples/test-embedded-kafka/src/main/java/demo/EmbeddedKafkaApplication.java
index 39fe36f..b4603f3 100644
--- a/testing-samples/test-embedded-kafka/src/main/java/demo/EmbeddedKafkaApplication.java
+++ b/testing-samples/test-embedded-kafka/src/main/java/demo/EmbeddedKafkaApplication.java
@@ -16,29 +16,26 @@
 
 package demo;
 
+import java.util.function.Function;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.messaging.Processor;
-import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.context.annotation.Bean;
 
 /**
  * @author Gary Russell
  *
  */
 @SpringBootApplication
-@EnableBinding(Processor.class)
 public class EmbeddedKafkaApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(EmbeddedKafkaApplication.class, args);
 	}
 
-	@StreamListener(Processor.INPUT)
-	@SendTo(Processor.OUTPUT)
-	public byte[] handle(byte[] in){
-		return new String(in).toUpperCase().getBytes();
+	@Bean
+	public Function<byte[], byte[]> handle(){
+		return in -> new String(in).toUpperCase().getBytes();
 	}
 
 }
diff --git a/testing-samples/test-embedded-kafka/src/main/resources/application.properties b/testing-samples/test-embedded-kafka/src/main/resources/application.properties
index 193fc6c..0366f9e 100644
--- a/testing-samples/test-embedded-kafka/src/main/resources/application.properties
+++ b/testing-samples/test-embedded-kafka/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 # Binding properties
-spring.cloud.stream.bindings.output.destination=testEmbeddedOut
-spring.cloud.stream.bindings.input.destination=testEmbeddedIn
-spring.cloud.stream.bindings.input.group=embeddedKafkaApplication
+spring.cloud.stream.bindings.handle-out-0.destination=testEmbeddedOut
+spring.cloud.stream.bindings.handle-in-0.destination=testEmbeddedIn
+spring.cloud.stream.bindings.handle-in-0.group=embeddedKafkaApplication