#3 Use of Java Stream is strange

Fixing the issue where the new state was not properly updated recursively.

Author: idugalic

pom.xml

@@ -9,10 +9,10 @@
     <name>fmodel-java</name>
     <description>fmodel-java</description>
     <properties>
-        <java.version>21</java.version>
+        <java.version>23</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>
@@ -28,8 +28,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>23</source>
+                    <target>23</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/com/fraktalio/fmodel/application/aggregate/statestored/StateStoredLockingOrchestratingAggregate.java

@@ -85,9 +85,13 @@ public Pair<S, V> handle(C command) {
     private S computeNewState(S state, C command) {
         var currentState = state != null ? state : initialState().get();
         var events = decide().apply(command, currentState);
-        var newState = events.sequential().reduce(currentState, (s, e) -> evolve().apply(s, e), (s, s2) -> s);
-        events.flatMap(it -> react().apply(it)).forEach(it -> computeNewState(newState, it));
-        return newState;
+
+        return events.sequential()
+                .reduce(currentState, (s, e) -> {
+                    var evolved = evolve().apply(s, e);
+                    return react().apply(e).sequential()
+                            .reduce(evolved, this::computeNewState, (s1, s2) -> s1);
+                }, (s1, s2) -> s1);
     }
 
 }

src/main/java/com/fraktalio/fmodel/application/aggregate/statestored/StateStoredOrchestratingAggregate.java

@@ -76,9 +76,13 @@ public S handle(C command) {
     private S computeNewState(S state, C command) {
         var currentState = state != null ? state : initialState().get();
         var events = decide().apply(command, currentState);
-        var newState = events.sequential().reduce(currentState, (s, e) -> evolve().apply(s, e), (s, s2) -> s);
-        events.flatMap(it -> react().apply(it)).forEach(it -> computeNewState(newState, it));
-        return newState;
+
+        return events.sequential()
+                .reduce(currentState, (s, e) -> {
+                    var evolved = evolve().apply(s, e);
+                    return react().apply(e).sequential()
+                            .reduce(evolved, this::computeNewState, (s1, s2) -> s1);
+                }, (s1, s2) -> s1);
     }
 
 }