X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FAdderBusinessLogic.java;h=d525182ea539b82c1da1e4ac8c88943f80d0490a;hb=2eb3c45c9438a20777b0110defa593dd45c64511;hp=ecd9590de696b14501145682be4dbd58a0b6c955;hpb=d576eea9bc9208d9e5003bd8c8c132bed96b5c40;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 ecd9590..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,21 +24,23 @@ 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)
   {
-    if (!state.containsKey(user))
-      throw new IllegalStateException("No sumation for " + user + " in progress");
     if (value == null || value < 1)
       throw new IllegalArgumentException("Not a positive number: " + value);
 
-    long result = state.get(user) + value;
-    state.put(user, result);
+    long sum =
+        Optional
+            .ofNullable(state.get(user))
+            .map(result -> result.sum)
+            .orElse(0l);
+    state.put(user, new AdderResult(value, sum + value));
   }
 
-  public synchronized Long calculate(String user)
+  public synchronized AdderResult calculate(String user)
   {
     if (!state.containsKey(user))
       throw new IllegalStateException("No sumation for " + user + " in progress");
@@ -46,7 +48,7 @@ public class AdderBusinessLogic
     return state.remove(user);
   }
 
-  protected Map<String, Long> getState()
+  protected Map<String, AdderResult> getState()
   {
     return state;
   }