Introduced new generalized JSON-format for `top10`

* Added an attribute `type`, that denotes the type of the statistics.
* Introduces a common wording for the other attributes:
** Renamed `user` to `channel`.
** Renamed `word` to `key` (in the `key`/`counter`-pairing in the `Entry`).
* Adapted all services accordingly:
** `counter` generates statistics of the type `COUNTER`.
** `popular` generates statistics of the type `POPULAR`.
** `top10` generates `Ranking`s for _all_ types of statistics and hands
   the `type` through to its consumers.
** `query` is only intrested in rankings of the type `COUNTER`.

diff --git a/README.sh b/README.sh
index b785876..2f6d503 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -4,10 +4,10 @@ FORTUNE=juplo/wordcount--fortune:1.0.1
 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.1
-TOP10=juplo/wordcount--top10:1.2.1
-QUERY=juplo/wordcount--query:2.0.1
-POPULAR=juplo/wordcount--popular:1.1.1
+COUNTER=juplo/wordcount--counter:1.4.0
+TOP10=juplo/wordcount--top10:1.4.0
+QUERY=juplo/wordcount--query:2.1.0
+POPULAR=juplo/wordcount--popular:1.3.0
 
 if [ "$1" = "cleanup" ]
 then

diff --git a/counter b/counter
index f9156ed..123d1d3 160000 (submodule)
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit f9156ed2e1f43b64d39cc39a13d12ca8c0d24219
+Subproject commit 123d1d3df7e3665dbe511a2e7d7398e0aa235a63

diff --git a/docker-compose.yml b/docker-compose.yml
index 0040e57..8bc4b78 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       - kafka
 
   counter:
-    image: juplo/wordcount--counter:1.3.1
+    image: juplo/wordcount--counter:1.4.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.2.1
+    image: juplo/wordcount--top10:1.4.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.top10.rule=Host(`top10.localhost`)"
@@ -93,7 +93,7 @@ services:
       - kafka
 
   query:
-    image: juplo/wordcount--query:2.0.1
+    image: juplo/wordcount--query:2.1.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.query.rule=Host(`query.localhost`)"
@@ -104,7 +104,7 @@ services:
       - kafka
 
   popular:
-    image: juplo/wordcount--popular:1.1.1
+    image: juplo/wordcount--popular:1.3.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.popular.rule=Host(`popular.localhost`)"

diff --git a/popular b/popular
index 8af553a..73eec81 160000 (submodule)
--- a/popular
+++ b/popular
@@ -1 +1 @@
-Subproject commit 8af553a2b1cae0b7f5c9d9c63023b47af89bd5ab
+Subproject commit 73eec81b106ad2a145565c8e87bd6fe2a32b617e

diff --git a/query b/query
index b52ff02..d835b70 160000 (submodule)
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit b52ff02b6952dfc708c7c7d94205b5b24afd68f9
+Subproject commit d835b70fc4d49a50f42da9c21b3de1dbcd18cbaf

diff --git a/top10 b/top10
index aa9d59f..238491e 160000 (submodule)
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit aa9d59fa93178f40797a8bb3716dd0a30594833f
+Subproject commit 238491ed4d33495202e79879954802e5d0836006