projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ROT: (Erwartet!) Merge der Korrigierten Test-Logik und Erwartungen
[demos/kafka/training]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
AdderBusinessLogic.java
diff --git
a/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
b/src/main/java/de/juplo/kafka/AdderBusinessLogic.java
index
ecd9590
..
d525182
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
{
public class AdderBusinessLogic
{
- private final Map<String,
Long
> state;
+ private final Map<String,
AdderResult
> state;
public AdderBusinessLogic()
public AdderBusinessLogic()
@@
-16,7
+16,7
@@
public class AdderBusinessLogic
this(new HashMap<>());
}
this(new HashMap<>());
}
- public AdderBusinessLogic(Map<String,
Long
> state)
+ public AdderBusinessLogic(Map<String,
AdderResult
> state)
{
this.state = state;
}
{
this.state = state;
}
@@
-24,21
+24,23
@@
public class AdderBusinessLogic
public synchronized Optional<Long> getSum(String user)
{
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)
{
}
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);
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");
{
if (!state.containsKey(user))
throw new IllegalStateException("No sumation for " + user + " in progress");
@@
-46,7
+48,7
@@
public class AdderBusinessLogic
return state.remove(user);
}
return state.remove(user);
}
- protected Map<String,
Long
> getState()
+ protected Map<String,
AdderResult
> getState()
{
return state;
}
{
return state;
}