From b8f6728e1957d3cfdd34efebd430e33797b67b58 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 14 Feb 2023 20:17:12 +0100
Subject: [PATCH] counter: 1.1.9 - Refactored creation of `Properties` as a
 separate bean

---
 pom.xml                                       |  2 +-
 .../wordcount/counter/CounterApplication.java | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93a541b..b0ca36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>de.juplo.kafka.wordcount</groupId>
 	<artifactId>counter</artifactId>
-	<version>1.1.8</version>
+	<version>1.1.9</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 20cb4d2..31086ca 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplication.java
@@ -24,12 +24,8 @@ import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.St
 @Slf4j
 public class CounterApplication
 {
-	@Bean(initMethod = "start", destroyMethod = "stop")
-	public CounterStreamProcessor streamProcessor(
-			CounterApplicationProperties properties,
-			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper objectMapper,
-			ConfigurableApplicationContext context)
+	@Bean
+	public Properties propertyMap(CounterApplicationProperties properties)
 	{
 		Properties propertyMap = new Properties();
 
@@ -44,6 +40,17 @@ public class CounterApplication
 			propertyMap.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, properties.getCacheMaxBytes());
 		propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
+		return propertyMap;
+	}
+
+	@Bean(initMethod = "start", destroyMethod = "stop")
+	public CounterStreamProcessor streamProcessor(
+			CounterApplicationProperties properties,
+			Properties propertyMap,
+			KeyValueBytesStoreSupplier storeSupplier,
+			ObjectMapper objectMapper,
+			ConfigurableApplicationContext context)
+	{
 		CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
 				properties.getInputTopic(),
 				properties.getOutputTopic(),
-- 
2.20.1