splitter: 1.2.0 - Refined `SplitterApplicationConfiguration`

[demos/kafka/wordcount] / src / main / java / de / juplo / kafka / wordcount / splitter / SplitterApplicationConfiguration.java

diff --git a/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java
index 6be4b59..92537b2 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java
@@ -2,13 +2,12 @@ package de.juplo.kafka.wordcount.splitter;
 
 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 org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.support.serializer.JsonDeserializer;
 import org.springframework.kafka.support.serializer.JsonSerde;
 import org.springframework.kafka.support.serializer.JsonSerializer;
@@ -19,7 +18,7 @@ import java.util.concurrent.CompletableFuture;
 import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
-@SpringBootApplication
+@Configuration
 @EnableConfigurationProperties(SplitterApplicationProperties.class)
 @Slf4j
 public class SplitterApplicationConfiguration
@@ -27,41 +26,51 @@ public class SplitterApplicationConfiguration
        @Bean(initMethod = "start", destroyMethod = "stop")
        public SplitterStreamProcessor streamProcessor(
                        SplitterApplicationProperties properties,
+                       Properties streamProcessorProperties,
                        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, JsonSerde.class.getName());
-               propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, Recording.class.getName()    );
-               propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Recording.class.getName());
-               propertyMap.put(JsonSerializer.ADD_TYPE_INFO_HEADERS, false);
-               propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-
                SplitterStreamProcessor streamProcessor = new SplitterStreamProcessor(
                                properties.getInputTopic(),
                                properties.getOutputTopic(),
-                               propertyMap);
+                               streamProcessorProperties);
 
                streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
-       {
-               log.error("Unexpected error!", e);
-               CompletableFuture.runAsync(() ->
                {
-                       log.info("Stopping application...");
-                       SpringApplication.exit(context, () -> 1);
+                       log.error("Unexpected error!", e);
+                       CompletableFuture.runAsync(() ->
+                       {
+                               log.info("Stopping application...");
+                               SpringApplication.exit(context, () -> 1);
+                       });
+                       return SHUTDOWN_CLIENT;
                });
-               return SHUTDOWN_CLIENT;
-       });
-
 
                return streamProcessor;
        }
 
-       public static void main(String[] args)
+       @Bean
+       public Properties streamProcessorProperties(
+                       SplitterApplicationProperties applicationProperties)
        {
-               SpringApplication.run(SplitterApplicationConfiguration.class, args);
+               Properties properties = serializationConfig();
+
+               properties.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationProperties.getApplicationId());
+               properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, applicationProperties.getBootstrapServer());
+               properties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+
+               return properties;
+       }
+
+       static Properties serializationConfig()
+       {
+               Properties properties = new Properties();
+
+               properties.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+               properties.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+               properties.put(JsonDeserializer.KEY_DEFAULT_TYPE, User.class.getName());
+               properties.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Recording.class.getName());
+               properties.put(JsonSerializer.ADD_TYPE_INFO_HEADERS, false);
+
+               return properties;
        }
 }