X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fsplitter%2FSplitterApplicationConfiguration.java;h=7143e1a3d3f136fee201d967ede5fbfffb9d2b86;hb=b95a6dae1b668f87ec14d0ace9b768ca89e338b3;hp=6be4b59f5c6c2d6ac151d6c9fabc84ef98b9059f;hpb=9c784dad94b97334cc55d90326f4810b7aa9a199;p=demos%2Fkafka%2Fwordcount

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..7143e1a 100644
--- a/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterApplicationConfiguration.java
@@ -5,10 +5,10 @@ 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 +19,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
@@ -33,9 +33,10 @@ public class SplitterApplicationConfiguration
 
 		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_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
 		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
-		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, Recording.class.getName()	);
+		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, SplitterApplication.class.getName());
+		propertyMap.put(JsonDeserializer.KEY_DEFAULT_TYPE, User.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");
@@ -46,22 +47,16 @@ public class SplitterApplicationConfiguration
 				propertyMap);
 
 		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)
-	{
-		SpringApplication.run(SplitterApplicationConfiguration.class, args);
-	}
 }