counter: 1.2.7 - Refined bean-naming in `CounterApplicationConfiguration`

diff --git a/pom.xml b/pom.xml
index 46a71509e1a59dc121dc9724b589a44c8e7b46c7..22b9da00b1b766f74b402723673137c699a61444 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
        </parent>
        <groupId>de.juplo.kafka.wordcount</groupId>
        <artifactId>counter</artifactId>
-       <version>1.2.6</version>
+       <version>1.2.7</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/CounterApplicationConfiguriation.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
index 409c035be1c78cc32117f432867d02296fb33ea2..9785f69edd8558b48c9059d3eeac53995d546590 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -26,12 +26,12 @@ import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.St
 public class CounterApplicationConfiguriation
 {
        @Bean
-       public Properties propertyMap(CounterApplicationProperties properties)
+       public Properties streamProcessorProperties(CounterApplicationProperties counterProperties)
        {
                Properties propertyMap = new Properties();
 
-               propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
-               propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
+               propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, counterProperties.getApplicationId());
+               propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, counterProperties.getBootstrapServer());
                propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
                propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
                propertyMap.put(JsonSerializer.ADD_TYPE_INFO_HEADERS, false);
@@ -40,10 +40,10 @@ public class CounterApplicationConfiguriation
                propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Word.class.getName());
                propertyMap.put(JsonDeserializer.USE_TYPE_INFO_HEADERS, false);
                propertyMap.put(StreamsConfig.STATE_DIR_CONFIG, "target");
-               if (properties.getCommitInterval() != null)
-                       propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, properties.getCommitInterval());
-               if (properties.getCacheMaxBytes() != null)
-                       propertyMap.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, properties.getCacheMaxBytes());
+               if (counterProperties.getCommitInterval() != null)
+                       propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, counterProperties.getCommitInterval());
+               if (counterProperties.getCacheMaxBytes() != null)
+                       propertyMap.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, counterProperties.getCacheMaxBytes());
                propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
                return propertyMap;
@@ -51,15 +51,15 @@ public class CounterApplicationConfiguriation
 
        @Bean(initMethod = "start", destroyMethod = "stop")
        public CounterStreamProcessor streamProcessor(
-                       CounterApplicationProperties properties,
-                       Properties propertyMap,
+                       CounterApplicationProperties applicationProperties,
+                       Properties streamProcessorProperties,
                        KeyValueBytesStoreSupplier storeSupplier,
                        ConfigurableApplicationContext context)
        {
                CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
-                               properties.getInputTopic(),
-                               properties.getOutputTopic(),
-                               propertyMap,
+                               applicationProperties.getInputTopic(),
+                               applicationProperties.getOutputTopic(),
+                               streamProcessorProperties,
                                storeSupplier);
 
                streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->

diff --git a/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java b/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
index 2c8bd1e6c5e0d02db5949577a87dd4e3516aabfb..fe85dc49d2d23333ba89757801f82fddd3ce26c7 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessorTopologyTest.java
@@ -26,12 +26,12 @@ public class CounterStreamProcessorTopologyTest
         OUT,
         Stores.inMemoryKeyValueStore("TOPOLOGY-TEST"));
 
-    CounterApplicationConfiguriation config =
+    CounterApplicationConfiguriation applicationConfiguriation =
         new CounterApplicationConfiguriation();
-    Properties properties =
-        config.propertyMap(new CounterApplicationProperties());
+    Properties streamProcessorProperties =
+        applicationConfiguriation.streamProcessorProperties(new CounterApplicationProperties());
 
-    TopologyTestDriver testDriver = new TopologyTestDriver(topology, properties);
+    TopologyTestDriver testDriver = new TopologyTestDriver(topology, streamProcessorProperties);
 
     TestInputTopic<String, String> in = testDriver.createInputTopic(
         IN,