popular: 1.1.1 - Refined output JSON

diff --git a/pom.xml b/pom.xml
index a9ba9e18031377ea78c56d11527443662eb766c7..0c992005d7217821c835c12face2f6728d2099fa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
        </parent>
        <groupId>de.juplo.kafka.wordcount</groupId>
        <artifactId>popular</artifactId>
-       <version>1.1.0</version>
+       <version>1.1.1</version>
        <name>Wordcount-Popular-Words</name>
        <description>Query stream-processor that gives access to the most popular words</description>
        <properties>

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/WindowedWord.java b/src/main/java/de/juplo/kafka/wordcount/popular/WindowedWord.java
index df988fb25d39fbfd2310aaf6b5a278367a4fc532..b759f2ec8c6022f2c1ffd9648beabfd21c599f47 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/WindowedWord.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/WindowedWord.java
@@ -14,5 +14,5 @@ public class WindowedWord
 {
   ZonedDateTime start;
   ZonedDateTime end;
-  String word;
+  String key;
 }

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/WordCounter.java b/src/main/java/de/juplo/kafka/wordcount/popular/WordCounter.java
index c94ec0e96e7889ff4d68f08e1bbf13d15372c98e..bc4243efbd793fdf89837f297b293f93d2c955d8 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/WordCounter.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/WordCounter.java
@@ -10,6 +10,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor(staticName = "of")
 public class WordCounter
 {
-  String word;
+  String key;
   long counter;
 }

diff --git a/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java b/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
index fa6a2585a3685560662750850d2b3a62a88742a5..4ac9fd4940babe8c53adacfe8f7e31f1400a1464 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
@@ -192,7 +192,7 @@ class TestData
 
                windowedWord.setStart(ZonedDateTime.ofInstant(outputWindowedWord.getStart(), CLOCK.getZone()));
                windowedWord.setEnd(ZonedDateTime.ofInstant(outputWindowedWord.getEnd(), CLOCK.getZone()));
-               windowedWord.setWord(outputWindowedWord.getWord());
+               windowedWord.setKey(outputWindowedWord.getKey());
 
                return windowedWord;
        }
@@ -211,7 +211,7 @@ class TestData
                        WordCounter counter)
        {
                OutputWordCounter outputWordCounter = OutputWordCounter.of(
-                               word.getWord(),
+                               word.getKey(),
                                counter.getCounter());
                assertWordCountEqualsWordCountFromLastMessage(word, outputWordCounter);
        }

diff --git a/src/test/java/de/juplo/kafka/wordcount/stats/OutputWindowedWord.java b/src/test/java/de/juplo/kafka/wordcount/stats/OutputWindowedWord.java
index 1589ea05d5d431db8a6d095482cd9ecfc40b0b10..470f72782981bc3f3a66e8ff90bc01060a0ac6e5 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/stats/OutputWindowedWord.java
+++ b/src/test/java/de/juplo/kafka/wordcount/stats/OutputWindowedWord.java
@@ -14,5 +14,5 @@ public class OutputWindowedWord
 {
   Instant start;
   Instant end;
-  String word;
+  String key;
 }

diff --git a/src/test/java/de/juplo/kafka/wordcount/stats/OutputWordCounter.java b/src/test/java/de/juplo/kafka/wordcount/stats/OutputWordCounter.java
index f132707360d748c10e179806045ed641ec5e0b01..ce8a764f4475329e3d3da4152ac03aa5d22178b8 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/stats/OutputWordCounter.java
+++ b/src/test/java/de/juplo/kafka/wordcount/stats/OutputWordCounter.java
@@ -10,6 +10,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor(staticName = "of")
 public class OutputWordCounter
 {
-  String word;
+  String key;
   long counter;
 }