X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryApplicationConfiguration.java;h=0e30e7490c6336e8ad4903de132f61982bae7979;hb=b26eaed7d929a056ba5bf432118fe02341a60848;hp=dfc4339db48319637ce3dd55573f94368bbea196;hpb=194a4fa4c90d322f4e95d4b3b6ffe75dc46945c2;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
index dfc4339..0e30e74 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -1,6 +1,9 @@
 package de.juplo.kafka.wordcount.query;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.Serdes;
+import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.state.HostInfo;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -11,6 +14,7 @@ import org.springframework.context.annotation.Configuration;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.util.Properties;
 
 
 @Configuration
@@ -18,16 +22,14 @@ import java.net.Socket;
 public class QueryApplicationConfiguration
 {
 	@Bean
-	public QueryStreamProcessor streamProcessor(
+	public HostInfo applicationServer(
 			ServerProperties serverProperties,
-			QueryApplicationProperties properties,
-			ObjectMapper mapper,
-			ConfigurableApplicationContext context) throws IOException
+			QueryApplicationProperties applicationProperties) throws IOException
 	{
 		String host;
 		if (serverProperties.getAddress() == null)
 		{
-			HostInfo bootstrapServer = HostInfo.buildFromEndpoint(properties.getBootstrapServer());
+			HostInfo bootstrapServer = HostInfo.buildFromEndpoint(applicationProperties.getBootstrapServer());
 			Socket socket = new Socket();
 			socket.connect(new InetSocketAddress(bootstrapServer.host(), bootstrapServer.port()));
 			host = socket.getLocalAddress().getHostAddress();
@@ -39,12 +41,52 @@ public class QueryApplicationConfiguration
 
 		Integer port = serverProperties.getPort() == null ? 8080 : serverProperties.getPort();
 
+		return new HostInfo(host, port);
+	}
+
+	@Bean
+	public Properties streamProcessorProperties(
+			QueryApplicationProperties applicationProperties,
+			HostInfo applicationServer)
+	{
+		Properties props = new Properties();
+
+		props.putAll(serializationConfig());
+
+		String applicationId = applicationProperties.getApplicationId();
+		String bootstrapServer = applicationProperties.getBootstrapServer();
+
+		props.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationId);
+		props.put(StreamsConfig.APPLICATION_SERVER_CONFIG, applicationServer.host() + ":" + applicationServer.port());
+		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
+		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+
+		return props;
+	}
+
+	static Properties serializationConfig()
+	{
+		Properties props = new Properties();
+
+		props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
+		props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
+
+		return props;
+	}
+
+	@Bean
+	public QueryStreamProcessor streamProcessor(
+			Properties streamProcessorProperties,
+			HostInfo applicationServer,
+			QueryApplicationProperties applicationProperties,
+			ObjectMapper mapper,
+			ConfigurableApplicationContext context)
+	{
 		return new QueryStreamProcessor(
-				properties.getApplicationId(),
-				new HostInfo(host, port),
-				properties.getBootstrapServer(),
-				properties.getUsersInputTopic(),
-				properties.getRankingInputTopic(),
+				streamProcessorProperties,
+				applicationServer,
+				applicationProperties.getUsersInputTopic(),
+				applicationProperties.getRankingInputTopic(),
 				mapper,
 				context);
 	}