GRÜN: Implementierung der Erwartungen inkl. Anpassungen an der Anwendung

* Neue Erwartungen an `AdderBusinessLogic` implementiert.
* Die Implementierung hat sich über die nicht von den Unit-Tests
  abgedeckte Methode auch auf andere Teile der Anwendung ausgewirkt.
* `AdderBusinessLogic.getState()` liefert jetzt in der Map die neue
  Klasse `AdderResult` und benötigt diese auch als Konstruktor-Argument.
* Über die Integration-Tests ist sichergestellt, dass die Datenhaltung
  trotz der Umstellung von `Long` auf `AdderResult` funktioniert.

diff --git a/src/main/java/de/juplo/kafka/AdderBusinessLogic.java b/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
index 64fdb8ca3197e0d20861a8a0df5ccd0762460654..d525182ea539b82c1da1e4ac8c88943f80d0490a 100644 (file)
--- a/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
+++ b/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
@@ -8,7 +8,7 @@ import java.util.Optional;
 
 public class AdderBusinessLogic
 {
-  private final Map<String, Long> state;
+  private final Map<String, AdderResult> state;
 
 
   public AdderBusinessLogic()
@@ -16,7 +16,7 @@ public class AdderBusinessLogic
     this(new HashMap<>());
   }
 
-  public AdderBusinessLogic(Map<String, Long> state)
+  public AdderBusinessLogic(Map<String, AdderResult> state)
   {
     this.state = state;
   }
@@ -24,7 +24,7 @@ public class AdderBusinessLogic
 
   public synchronized Optional<Long> getSum(String user)
   {
-    return Optional.ofNullable(state.get(user));
+    return Optional.ofNullable(state.get(user)).map(result -> result.sum);
   }
 
   public synchronized void addToSum(String user, Integer value)
@@ -35,8 +35,9 @@ public class AdderBusinessLogic
     long sum =
         Optional
             .ofNullable(state.get(user))
+            .map(result -> result.sum)
             .orElse(0l);
-    state.put(user, sum + value);
+    state.put(user, new AdderResult(value, sum + value));
   }
 
   public synchronized AdderResult calculate(String user)
@@ -44,10 +45,10 @@ public class AdderBusinessLogic
     if (!state.containsKey(user))
       throw new IllegalStateException("No sumation for " + user + " in progress");
 
-    return new AdderResult(66, state.remove(user));
+    return state.remove(user);
   }
 
-  protected Map<String, Long> getState()
+  protected Map<String, AdderResult> getState()
   {
     return state;
   }

diff --git a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index 542af2d563a42466f971546f01e7f38eb9a5e1ed..5a013935a32f2d1e90b61e60916f9cd3c734ca6e 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -62,7 +62,7 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
           offset);
       if (commitsEnabled)
       {
-        Map<String, Long> removed = recordHandler.removePartition(partition);
+        Map<String, AdderResult> removed = recordHandler.removePartition(partition);
         stateRepository.save(new StateDocument(partition, removed, offset));
       }
       else

diff --git a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
index 828dbc239cabb071153e999a82b0f31749fd6dae..93e12976b9e665d5c359f39fd55ba289588ca8ce 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
@@ -30,12 +30,12 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
     state.get(partition).addToSum(user, Integer.parseInt(message));
   }
 
-  protected void addPartition(Integer partition, Map<String, Long> state)
+  protected void addPartition(Integer partition, Map<String, AdderResult> state)
   {
     this.state.put(partition, new AdderBusinessLogic(state));
   }
 
-  protected Map<String, Long> removePartition(Integer partition)
+  protected Map<String, AdderResult> removePartition(Integer partition)
   {
     return this.state.remove(partition).getState();
   }

diff --git a/src/main/java/de/juplo/kafka/DriverController.java b/src/main/java/de/juplo/kafka/DriverController.java
index d38927126ab58dd55a2c884ec0cbb104db08dc60..63f015d42cfb6ebb5de00b980c0e88dc98f97071 100644 (file)
--- a/src/main/java/de/juplo/kafka/DriverController.java
+++ b/src/main/java/de/juplo/kafka/DriverController.java
@@ -33,7 +33,7 @@ public class DriverController
 
 
   @GetMapping("state")
-  public Map<Integer, Map<String, Long>> state()
+  public Map<Integer, Map<String, AdderResult>> state()
   {
     return
         recordHandler

diff --git a/src/main/java/de/juplo/kafka/StateDocument.java b/src/main/java/de/juplo/kafka/StateDocument.java
index 0540e3fac650ea6e8b040002b371b1a15afadabd..82306d05741b5c4d4c5f247a23e68f10c878e034 100644 (file)
--- a/src/main/java/de/juplo/kafka/StateDocument.java
+++ b/src/main/java/de/juplo/kafka/StateDocument.java
@@ -15,7 +15,7 @@ public class StateDocument
   @Id
   public String id;
   public long offset = -1l;
-  public Map<String, Long> state;
+  public Map<String, AdderResult> state;
 
   public StateDocument()
   {
@@ -29,7 +29,7 @@ public class StateDocument
 
   public StateDocument(
       Integer partition,
-      Map<String, Long> state,
+      Map<String, AdderResult> state,
       long offset)
   {
     this.id = Integer.toString(partition);