X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fsplitter%2FSplitterStreamProcessor.java;h=60c569ba8ac16b55d050c755a7d0095d178ef281;hb=refs%2Ftags%2Fsplitter-1.1.4;hp=7218d6f2e94e44e5338de1d55854a9ed7255eeaa;hpb=3bc3ef7ceb76e7643e1e373293cfdc78f870838a;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterStreamProcessor.java
index 7218d6f..60c569b 100644
--- a/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/splitter/SplitterStreamProcessor.java
@@ -1,74 +1,48 @@
 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.KafkaStreams;
 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 javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.Arrays;
 import java.util.Properties;
-import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 
-import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
-
 
 @Slf4j
-@Component
 public class SplitterStreamProcessor
 {
-	final static Pattern PATTERN = Pattern.compile("\\W+");
+	final static Pattern PATTERN = Pattern.compile("[^\\p{IsAlphabetic}]+");
 
 	public final KafkaStreams streams;
 
 
 	public SplitterStreamProcessor(
-			SplitterApplicationProperties properties,
-			ConfigurableApplicationContext context)
+			String inputTopic,
+			String outputTopic,
+			Properties properties)
 	{
 		StreamsBuilder builder = new StreamsBuilder();
 
-		KStream<String, String> source = builder.stream(properties.getInputTopic());
-		source
-				.flatMapValues(sentence -> Arrays.asList(PATTERN.split(sentence)))
-				.to(properties.getOutputTopic());
+		KStream<String, Recording> source = builder.stream(inputTopic);
 
-		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");
+		source
+				.flatMapValues(recording -> Arrays
+							.stream(PATTERN.split(recording.getSentence()))
+							.map(word -> Word.of(recording.getUser(), word))
+							.toList())
+				.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");