X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10StreamProcessorTopologyTest.java;h=90d8e4cb90987d0455c84f67252b6080e5d9bed1;hb=478b25d6700bd0a48b55647f09386f3b1d59fa29;hp=f2a9eca4f2624937d567d26b5543dcd658820f0b;hpb=d1ac99074b22f357152644d4593b234540d1c952;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/top10/Top10StreamProcessorTopologyTest.java b/src/test/java/de/juplo/kafka/wordcount/top10/Top10StreamProcessorTopologyTest.java
index f2a9eca..90d8e4c 100644
--- a/src/test/java/de/juplo/kafka/wordcount/top10/Top10StreamProcessorTopologyTest.java
+++ b/src/test/java/de/juplo/kafka/wordcount/top10/Top10StreamProcessorTopologyTest.java
@@ -1,5 +1,9 @@
 package de.juplo.kafka.wordcount.top10;
 
+import de.juplo.kafka.wordcount.counter.TestCounter;
+import de.juplo.kafka.wordcount.counter.TestWord;
+import de.juplo.kafka.wordcount.query.TestRanking;
+import de.juplo.kafka.wordcount.query.TestUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.TestInputTopic;
 import org.apache.kafka.streams.TestOutputTopic;
@@ -11,19 +15,13 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.kafka.support.serializer.JsonDeserializer;
-import org.springframework.kafka.support.serializer.JsonSerde;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Stream;
 
-import static de.juplo.kafka.wordcount.top10.TestData.parseHeader;
 import static de.juplo.kafka.wordcount.top10.Top10ApplicationConfiguration.serializationConfig;
-import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME;
-import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.KEY_DEFAULT_CLASSID_FIELD_NAME;
 
 
 @Slf4j
@@ -35,8 +33,8 @@ public class Top10StreamProcessorTopologyTest
 
 
   TopologyTestDriver testDriver;
-  TestInputTopic<Key, Entry> in;
-  TestOutputTopic<User, Ranking> out;
+  TestInputTopic<TestWord, TestCounter> in;
+  TestOutputTopic<TestUser, TestRanking> out;
 
 
   @BeforeEach
@@ -47,27 +45,21 @@ public class Top10StreamProcessorTopologyTest
         OUT,
         Stores.inMemoryKeyValueStore(STORE_NAME));
 
-    Map<String, Object> propertyMap = serializationConfig();
-
-    Properties properties = new Properties();
-    properties.putAll(propertyMap);
-
-    JsonSerde<?> keySerde = new JsonSerde<>();
-    keySerde.configure(propertyMap, true);
-    JsonSerde<?> valueSerde = new JsonSerde<>();
-    valueSerde.configure(propertyMap, false);
-
-    testDriver = new TopologyTestDriver(topology, properties);
+    testDriver = new TopologyTestDriver(topology, serializationConfig());
 
     in = testDriver.createInputTopic(
         IN,
-        (JsonSerializer<Key>)keySerde.serializer(),
-        (JsonSerializer<Entry>)valueSerde.serializer());
+        jsonSerializer(TestWord.class, true),
+        jsonSerializer(TestCounter.class,false));
 
     out = testDriver.createOutputTopic(
         OUT,
-        (JsonDeserializer<User>)keySerde.deserializer(),
-        (JsonDeserializer<Ranking>)valueSerde.deserializer());
+        new JsonDeserializer()
+            .copyWithType(TestUser.class)
+            .ignoreTypeHeaders(),
+        new JsonDeserializer()
+            .copyWithType(TestRanking.class)
+            .ignoreTypeHeaders());
 
   }
 
@@ -75,25 +67,14 @@ public class Top10StreamProcessorTopologyTest
   @Test
   public void test()
   {
-    Stream
-        .of(TestData.INPUT_MESSAGES)
-        .forEach(kv -> in.pipeInput(
-            Key.of(kv.key.getUser(), kv.key.getWord()),
-            Entry.of(kv.value.getWord(), kv.value.getCounter())));
+    TestData
+        .getInputMessages()
+        .forEach(kv -> in.pipeInput(kv.key, kv.value));
 
-    MultiValueMap<User, Ranking> receivedMessages = new LinkedMultiValueMap<>();
+    MultiValueMap<TestUser, TestRanking> receivedMessages = new LinkedMultiValueMap<>();
     out
         .readRecordsToList()
-        .forEach(record ->
-        {
-          log.debug(
-              "OUT: {} -> {}, {}, {}",
-              record.key(),
-              record.value(),
-              parseHeader(record.headers(), KEY_DEFAULT_CLASSID_FIELD_NAME),
-              parseHeader(record.headers(), DEFAULT_CLASSID_FIELD_NAME));
-          receivedMessages.add(record.key(), record.value());
-        });
+        .forEach(record -> receivedMessages.add(record.key(), record.value()));
 
     TestData.assertExpectedMessages(receivedMessages);
 
@@ -109,4 +90,16 @@ public class Top10StreamProcessorTopologyTest
   {
     testDriver.close();
   }
+
+  private <T> JsonSerializer<T> jsonSerializer(Class<T> type, boolean isKey)
+  {
+    JsonSerializer<T> jsonSerializer = new JsonSerializer<>();
+    jsonSerializer.configure(
+        Map.of(
+            JsonSerializer.TYPE_MAPPINGS,
+            "word:" + TestWord.class.getName() + "," +
+            "counter:" + TestCounter.class.getName()),
+        isKey);
+    return jsonSerializer;
+  }
 }