Merge branch 'master' into issue2868

factcast · May 13, 2024 · 9f6dc43 · 9f6dc43
2 parents 6f69ffc + 08a3913
commit 9f6dc43
Show file tree

Hide file tree

Showing 46 changed files with 79 additions and 50 deletions.
diff --git a/factcast-bom/pom.xml b/factcast-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-bom</artifactId>

diff --git a/factcast-client-grpc-cli/pom.xml b/factcast-client-grpc-cli/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-client-grpc-cli</artifactId>

diff --git a/factcast-client-grpc/pom.xml b/factcast-client-grpc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-client-grpc</artifactId>

diff --git a/factcast-core/pom.xml b/factcast-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-core</artifactId>

diff --git a/factcast-docker-dep/pom.xml b/factcast-docker-dep/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-docker-dep</artifactId>

diff --git a/factcast-docker/pom.xml b/factcast-docker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-docker</artifactId>

diff --git a/factcast-examples/factcast-example-client-basicauth/pom.xml b/factcast-examples/factcast-example-client-basicauth/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-client-basicauth</artifactId>

diff --git a/factcast-examples/factcast-example-client-spring-boot2/pom.xml b/factcast-examples/factcast-example-client-spring-boot2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-client-spring-boot2</artifactId>

diff --git a/factcast-examples/factcast-example-schema-registry/pom.xml b/factcast-examples/factcast-example-schema-registry/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
       <plugin>
         <groupId>org.factcast</groupId>
         <artifactId>factcast-schema-registry-maven-plugin</artifactId>
-        <version>0.7.7-SNAPSHOT</version>
+        <version>0.7.8-SNAPSHOT</version>
         <executions>
           <execution>
             <id>build</id>

diff --git a/factcast-examples/factcast-example-server-basicauth/pom.xml b/factcast-examples/factcast-example-server-basicauth/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-server-basicauth</artifactId>

diff --git a/factcast-examples/factcast-example-server/pom.xml b/factcast-examples/factcast-example-server/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-server</artifactId>

diff --git a/factcast-examples/factcast-example-tls-client/pom.xml b/factcast-examples/factcast-example-tls-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-tls-client</artifactId>

diff --git a/factcast-examples/factcast-example-tls-server/pom.xml b/factcast-examples/factcast-example-tls-server/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-examples</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-example-tls-server</artifactId>

diff --git a/factcast-examples/pom.xml b/factcast-examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-examples</artifactId>

diff --git a/factcast-factus-bin-snapser/pom.xml b/factcast-factus-bin-snapser/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-factus-bin-snapser</artifactId>

diff --git a/factcast-factus-event/pom.xml b/factcast-factus-event/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-factus-event</artifactId>

diff --git a/factcast-factus-redis/pom.xml b/factcast-factus-redis/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-factus-redis</artifactId>

diff --git a/factcast-factus-spring-tx/pom.xml b/factcast-factus-spring-tx/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-factus-spring-tx</artifactId>

diff --git a/factcast-factus/pom.xml b/factcast-factus/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-factus</artifactId>

diff --git a/factcast-factus/src/main/java/org/factcast/factus/FactusImpl.java b/factcast-factus/src/main/java/org/factcast/factus/FactusImpl.java
@@ -414,7 +414,11 @@ public void onFastForward(@NonNull FactStreamPosition factIdToFfwdTo) {
             if (projection instanceof FactStreamPositionAware) {
               ((FactStreamPositionAware) projection).factStreamPosition(factIdToFfwdTo);
             }
-            positionOfLastFactApplied.set(factIdToFfwdTo);
+
+            // only persist ffwd if we ever had a state or applied facts in this catchup
+            if (stateOrNull != null || positionOfLastFactApplied.get() != null) {
+              positionOfLastFactApplied.set(factIdToFfwdTo);
+            }
           }
         };
 

diff --git a/factcast-factus/src/test/java/org/factcast/factus/FactusImplTest.java b/factcast-factus/src/test/java/org/factcast/factus/FactusImplTest.java
@@ -69,14 +69,12 @@
 import org.factcast.factus.snapshot.SnapshotSerializerSupplier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@Tag("integration") // technically unit, but it takes some time due to waiting
 class FactusImplTest {
 
   @Mock private FactCast fc;
@@ -1394,6 +1392,33 @@ void createSnapshot(SnapshotProjection projection, UUID state) {
   @SuppressWarnings("resource")
   @Nested
   class WhenCatchingUp {
+    @Test
+    @SneakyThrows
+    void returnsFactIdOfFastForward() {
+      Projector pro = mock(Projector.class);
+      Subscription sub = mock(Subscription.class);
+      FactSpec spec1 = FactSpec.from(NameEvent.class);
+      CompletableFuture<Void> cf = new CompletableFuture<>();
+
+      Fact f = new TestFact();
+      UUID id = f.id();
+      FactStreamPosition pos = FactStreamPosition.of(id, 42L);
+
+      when(ehFactory.create(any())).thenReturn(pro);
+      when(fc.subscribe(any(SubscriptionRequest.class), any(FactObserver.class)))
+          .thenAnswer(
+              i -> {
+                FactObserver fo = i.getArgument(1);
+                fo.onFastForward(pos);
+                return sub;
+              });
+      when(pro.createFactSpecs()).thenReturn(Lists.newArrayList(spec1));
+
+      SomeSnapshotProjection p = new SomeSnapshotProjection();
+      UUID ret = underTest.catchupProjection(p, UUID.randomUUID(), null);
+
+      Assertions.assertThat(ret).isNotNull().isEqualTo(id);
+    }
 
     @Test
     @SneakyThrows
@@ -1423,7 +1448,7 @@ void returnsFactIdOfLastFactApplied() {
     }
 
     @Test
-    void returnsFactIdForwardTarget() {
+    void returnsNoFactIdForwardTarget() {
 
       Projector pro = mock(Projector.class);
       Subscription sub = mock(Subscription.class);
@@ -1446,7 +1471,7 @@ void returnsFactIdForwardTarget() {
       SomeSnapshotProjection p = new SomeSnapshotProjection();
       UUID ret = underTest.catchupProjection(p, null, null);
 
-      Assertions.assertThat(ret).isNotNull().isEqualTo(id);
+      Assertions.assertThat(ret).isNull();
     }
   }
 }

diff --git a/factcast-grpc-api/pom.xml b/factcast-grpc-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-grpc-api</artifactId>

diff --git a/factcast-internal-dep-boot/pom.xml b/factcast-internal-dep-boot/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-internal-dep-boot</artifactId>

diff --git a/factcast-internal-dep/pom.xml b/factcast-internal-dep/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-internal-dep</artifactId>

diff --git a/factcast-itests/factcast-itests-doc/pom.xml b/factcast-itests/factcast-itests-doc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-doc</artifactId>

diff --git a/factcast-itests/factcast-itests-exception-handling/pom.xml b/factcast-itests/factcast-itests-exception-handling/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-exception-handling</artifactId>

diff --git a/factcast-itests/factcast-itests-factus/pom.xml b/factcast-itests/factcast-itests-factus/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-factus</artifactId>

diff --git a/factcast-itests/factcast-itests-novalidation/pom.xml b/factcast-itests/factcast-itests-novalidation/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-novalidation</artifactId>

diff --git a/factcast-itests/factcast-itests-security/pom.xml b/factcast-itests/factcast-itests-security/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-security</artifactId>

diff --git a/factcast-itests/factcast-itests-store/pom.xml b/factcast-itests/factcast-itests-store/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-store</artifactId>

diff --git a/factcast-itests/factcast-itests-tls/pom.xml b/factcast-itests/factcast-itests-tls/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-tls</artifactId>

diff --git a/factcast-itests/factcast-itests-transformation/pom.xml b/factcast-itests/factcast-itests-transformation/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast-itests</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests-transformation</artifactId>

diff --git a/factcast-itests/pom.xml b/factcast-itests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-itests</artifactId>

diff --git a/factcast-schema-registry-cli/pom.xml b/factcast-schema-registry-cli/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>

diff --git a/factcast-schema-registry-maven-plugin/pom.xml b/factcast-schema-registry-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/factcast-server-grpc/pom.xml b/factcast-server-grpc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.factcast</groupId>
     <artifactId>factcast</artifactId>
-    <version>0.7.7-SNAPSHOT</version>
+    <version>0.7.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>factcast-server-grpc</artifactId>