X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FAdderBusinessLogic.java;fp=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FAdderBusinessLogic.java;h=d525182ea539b82c1da1e4ac8c88943f80d0490a;hb=7c0368363c3e5dbb7eb2a08f343187a93f050617;hp=64fdb8ca3197e0d20861a8a0df5ccd0762460654;hpb=4a8642d0c36413cbc283d35dda8977b0e9320372;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/AdderBusinessLogic.java b/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
index 64fdb8c..d525182 100644
--- 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;
   }