popular: 1.3.0 - Changed the type-mapping from `word` to `key`

[demos/kafka/wordcount] / src / main / java / de / juplo / kafka / wordcount / popular / PopularStreamProcessor.java

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
index 788ae20..74aa2c6 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
@@ -3,10 +3,7 @@ package de.juplo.kafka.wordcount.popular;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.*;
-import org.apache.kafka.streams.kstream.Consumed;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.kstream.Produced;
-import org.apache.kafka.streams.kstream.TimeWindows;
+import org.apache.kafka.streams.kstream.*;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
@@ -15,8 +12,6 @@ import org.springframework.kafka.support.serializer.JsonSerde;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 
 import java.time.Duration;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -25,6 +20,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class PopularStreamProcessor
 {
+       public static final String TYPE = "POPULAR";
        public static final String KEY_VALUE_STORE_NAME = "popular";
        public static final String WINDOW_STORE_NAME = "popular-windows";
        public static final Duration WINDOW_SIZE = Duration.ofSeconds(30);
@@ -37,14 +33,12 @@ public class PopularStreamProcessor
                        String inputTopic,
                        String outputTopic,
                        Properties properties,
-                       ZoneId zone,
                        WindowBytesStoreSupplier windowBytesStoreSupplier,
                        KeyValueBytesStoreSupplier keyValueBytesStoreSupplier)
        {
                Topology topology = PopularStreamProcessor.buildTopology(
                                inputTopic,
                                outputTopic,
-                               zone,
                                windowBytesStoreSupplier,
                                keyValueBytesStoreSupplier);
 
@@ -54,7 +48,6 @@ public class PopularStreamProcessor
        static Topology buildTopology(
                        String inputTopic,
                        String outputTopic,
-                       ZoneId zone,
                        WindowBytesStoreSupplier windowBytesStoreSupplier,
                        KeyValueBytesStoreSupplier keyValueBytesStoreSupplier)
        {
@@ -72,12 +65,12 @@ public class PopularStreamProcessor
                                                                .<Word, Long>as(windowBytesStoreSupplier)
                                                                .withKeySerde(new JsonSerde<>(Word.class).noTypeInfo())
                                                                .withValueSerde(Serdes.Long()))
+                               .suppress(Suppressed.untilWindowCloses(Suppressed.BufferConfig.unbounded()))
                                .toStream()
                                .peek((windowedWord, counter) -> log.info("windowed: {} -> {}", windowedWord, counter))
                                .map((windowedWord, counter) -> new KeyValue<>(
                                                WindowedWord.of(
-                                                               ZonedDateTime.ofInstant(windowedWord.window().startTime(), zone),
-                                                               ZonedDateTime.ofInstant(windowedWord.window().endTime(), zone),
+                                                               Long.toString(windowedWord.window().startTime().getEpochSecond()),
                                                                windowedWord.key().getWord()),
                                                WordCounter.of(windowedWord.key().getWord(), counter)))
                                .peek((windowedWord, wordCounter) -> log.info("results: {} -> {}", windowedWord, wordCounter))
@@ -149,11 +142,11 @@ public class PopularStreamProcessor
                return typeMappingsConfig(WindowedWord.class, WordCounter.class);
        }
 
-       public static String typeMappingsConfig(Class wordClass, Class wordCounterClass)
+       public static String typeMappingsConfig(Class keyClass, Class counterClass)
        {
                return Map.of(
-                                               "word", wordClass,
-                                               "counter", wordCounterClass)
+                                               "key", keyClass,
+                                               "counter", counterClass)
                                .entrySet()
                                .stream()
                                .map(entry -> entry.getKey() + ":" + entry.getValue().getName())