From: Kai Moritz <kai@juplo.de>
Date: Sat, 11 Feb 2023 05:45:40 +0000 (+0100)
Subject: counter: 1.1.2 - Moved configuration into `CounterApplication`
X-Git-Tag: counter-1.1.2
X-Git-Url: https://juplo.de/gitweb/?p=demos%2Fkafka%2Fwordcount;a=commitdiff_plain;h=9856b2a34d6e2bda771b83d2825c1db8e2a6916f

counter: 1.1.2 - Moved configuration into `CounterApplication`
---

diff --git a/pom.xml b/pom.xml
index 1d2212c..83f96cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>de.juplo.kafka.wordcount</groupId>
 	<artifactId>counter</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<name>Wordcount-Counter</name>
 	<description>Word-counting stream-processor of the multi-user wordcount-example</description>
 	<properties>
diff --git a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java
index 1f73d32..1ee65ca 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java
@@ -1,14 +1,62 @@
 package de.juplo.kafka.wordcount.counter;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.Serdes;
+import org.apache.kafka.streams.StreamsConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
+
+import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
 @SpringBootApplication
 @EnableConfigurationProperties(CounterApplicationProperties.class)
+@Slf4j
 public class CounterApplication
 {
+	@Bean(initMethod = "start", destroyMethod = "stop")
+	public CounterStreamProcessor streamProcessor(
+			CounterApplicationProperties properties,
+			ObjectMapper objectMapper,
+			ConfigurableApplicationContext context)
+	{
+		Properties propertyMap = new Properties();
+
+		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
+		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
+		propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.StringSerde.class.getName());
+		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.StringSerde.class.getName());
+		propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+
+		CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
+				properties.getInputTopic(),
+				properties.getOutputTopic(),
+				propertyMap,
+				objectMapper);
+
+		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
+		{
+			log.error("Unexpected error!", e);
+			CompletableFuture.runAsync(() ->
+			{
+				log.info("Stopping application...");
+				SpringApplication.exit(context, () -> 1);
+			});
+			return SHUTDOWN_CLIENT;
+		});
+
+
+		return streamProcessor;
+	}
+
 	public static void main(String[] args)
 	{
 		SpringApplication.run(CounterApplication.class, args);
diff --git a/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
index 5248609..a823e25 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
@@ -3,40 +3,29 @@ package de.juplo.kafka.wordcount.counter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.KeyValue;
 import org.apache.kafka.streams.StreamsBuilder;
-import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.kstream.KStream;
-import org.springframework.boot.SpringApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.util.Properties;
-import java.util.concurrent.CompletableFuture;
-
-import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
 @Slf4j
-@Component
 public class CounterStreamProcessor
 {
 	public final KafkaStreams streams;
 
 
 	public CounterStreamProcessor(
-			CounterApplicationProperties properties,
-			ObjectMapper mapper,
-			ConfigurableApplicationContext context)
+			String inputTopic,
+			String outputTopic,
+			Properties properties,
+			ObjectMapper mapper)
 	{
 		StreamsBuilder builder = new StreamsBuilder();
 
-		KStream<String, String> source = builder.stream(properties.getInputTopic());
+		KStream<String, String> source = builder.stream(inputTopic);
 		source
 				.map((username, word) ->
 				{
@@ -54,36 +43,17 @@ public class CounterStreamProcessor
 				.count()
 				.mapValues(value->Long.toString(value))
 				.toStream()
-				.to(properties.getOutputTopic());
-
-		Properties props = new Properties();
-		props.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
-		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
-		props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
-		props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
-		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+				.to(outputTopic);
 
-		streams = new KafkaStreams(builder.build(), props);
-		streams.setUncaughtExceptionHandler((Throwable e) ->
-		{
-			log.error("Unexpected error!", e);
-			CompletableFuture.runAsync(() ->
-			{
-				log.info("Stopping application...");
-				SpringApplication.exit(context, () -> 1);
-			});
-			return SHUTDOWN_CLIENT;
-		});
+		streams = new KafkaStreams(builder.build(), properties);
 	}
 
-	@PostConstruct
 	public void start()
 	{
 		log.info("Starting Stream-Processor");
 		streams.start();
 	}
 
-	@PreDestroy
 	public void stop()
 	{
 		log.info("Stopping Stream-Processor");