From: Kai Moritz <kai@juplo.de>
Date: Sat, 4 Feb 2023 09:20:55 +0000 (+0100)
Subject: Switched to `JsonSerializer` / `JsonDeserializer`
X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=1a371209e0578e1bbf917d14ce9c0c7229074a41;p=demos%2Fkafka%2Fwordcount

Switched to `JsonSerializer` / `JsonDeserializer`

* Switched all services from manual serialization/deserialization with
  direct calls to the `ObjectMapper` to ``JsonSerializer`` /
  ``JsonDeserializer``.
* All keys and values are serialized as JSON (expect the key from `users`).
---

diff --git a/README.sh b/README.sh
index 1a3efb2..bfb612a 100755
--- a/README.sh
+++ b/README.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 FORTUNE=juplo/wordcount--fortune:1.0.0
-RECORDER=juplo/wordcount--recorder:1.0.1
-USERS=juplo/wordcount--users:1.0.4
-SPLITTER=juplo/wordcount--splitter:1.0.0
-COUNTER=juplo/wordcount--counter:1.1.0
-TOP10=juplo/wordcount--top10:1.0.1
-QUERY=juplo/wordcount--query:1.0.4
+RECORDER=juplo/wordcount--recorder:1.2.0
+USERS=juplo/wordcount--users:1.0.5
+SPLITTER=juplo/wordcount--splitter:1.2.0
+COUNTER=juplo/wordcount--counter:1.3.0
+TOP10=juplo/wordcount--top10:1.2.1
+QUERY=juplo/wordcount--query:2.0.0
 
 if [ "$1" = "cleanup" ]
 then
@@ -89,7 +89,7 @@ http -v query.localhost/bart
 http -v query.localhost/nerd
 http -v query.localhost/riddler
 
-// docker compose up -d --scale query=5 query
+# docker compose up -d --scale query=5 query
 http -v --follow query.localhost/bart
 sleep 1
 http -v --follow query.localhost/bart
diff --git a/counter b/counter
index fe04994..140800c 160000
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit fe049944648d9675ffe66b586b6bf860fbac696f
+Subproject commit 140800c53f2422665602b8c38d2d8fe0a5d6730b
diff --git a/docker-compose.yml b/docker-compose.yml
index 41716af..3795f05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
 
 
   recorder:
-    image: juplo/wordcount--recorder:1.0.1
+    image: juplo/wordcount--recorder:1.2.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.recorder.rule=Host(`recorder.localhost`)"
@@ -49,7 +49,7 @@ services:
       - kafka
 
   users:
-    image: juplo/wordcount--users:1.0.4
+    image: juplo/wordcount--users:1.0.5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.users.rule=Host(`users.localhost`)"
@@ -60,7 +60,7 @@ services:
       - kafka
 
   splitter:
-    image: juplo/wordcount--splitter:1.0.0
+    image: juplo/wordcount--splitter:1.2.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.splitter.rule=Host(`splitter.localhost`)"
@@ -71,7 +71,7 @@ services:
       - kafka
 
   counter:
-    image: juplo/wordcount--counter:1.1.0
+    image: juplo/wordcount--counter:1.3.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"
@@ -82,7 +82,7 @@ services:
       - kafka
 
   top10:
-    image: juplo/wordcount--top10:1.0.1
+    image: juplo/wordcount--top10:1.2.1
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.top10.rule=Host(`top10.localhost`)"
@@ -93,7 +93,7 @@ services:
       - kafka
 
   query:
-    image: juplo/wordcount--query:1.0.4
+    image: juplo/wordcount--query:2.0.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.query.rule=Host(`query.localhost`)"
@@ -105,7 +105,7 @@ services:
 
 
   bart:
-    image: juplo/wordcount--fortune:1.0.0
+    image: juplo/wordcount--fortune:1.0.1
     command: bash -c "
       while [ true ];
       do
diff --git a/fortune b/fortune
index dde18ef..8c69a7c 160000
--- a/fortune
+++ b/fortune
@@ -1 +1 @@
-Subproject commit dde18ef24d54bb988ad458ad6e12ed99fbc53061
+Subproject commit 8c69a7caad51f067f129a751966d0f4638fa228c
diff --git a/pom.xml b/pom.xml
index e116624..b9ee3bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.juplo.kafka.wordcount</groupId>
 	<artifactId>docker</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2</version>
+	<version>2.0.0</version>
 	<name>Docker-Compose Setup</name>
 	<description>Docker-Compose Setup for the multiuser-wordcount example</description>
 
diff --git a/query b/query
index 251cf79..3ba64ce 160000
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit 251cf79927d4c1c941467c8fee0349c1a7eb4b93
+Subproject commit 3ba64ce6decf9343fe689bfb687a9b234cd47ebf
diff --git a/recorder b/recorder
index c5700c2..b06e664 160000
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit c5700c2117f6c445278f272572c8b5732bf53bbf
+Subproject commit b06e6649f54c4ab58cea812b96301dadbbd23b23
diff --git a/splitter b/splitter
index 3bc3ef7..836368a 160000
--- a/splitter
+++ b/splitter
@@ -1 +1 @@
-Subproject commit 3bc3ef7ceb76e7643e1e373293cfdc78f870838a
+Subproject commit 836368acb5e435a733df5893e477a406daeafcb3
diff --git a/top10 b/top10
index b3c3b1c..aa9d59f 160000
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit b3c3b1c1ab19d197d323d7c69e03d9bd09147690
+Subproject commit aa9d59fa93178f40797a8bb3716dd0a30594833f
diff --git a/users b/users
index 58563cd..aa0d1c4 160000
--- a/users
+++ b/users
@@ -1 +1 @@
-Subproject commit 58563cdc022363375c00ac580672f7daa22f6453
+Subproject commit aa0d1c4c8e47b2fffc5fa0ca2cae83f64ed8dd4e