Issue #908: added fromNullable to SpecBuilder (#909)

* #908: added fromNullable to FluentSubscriptionRequest * #908: #908: added fromNullable to FluentSubscriptionRequest
factcast · Jun 30, 2020 · 671f9b6 · 671f9b6
1 parent ae2631e
commit 671f9b6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/factcast-core/src/main/java/org/factcast/core/subscription/FluentSubscriptionRequest.java b/factcast-core/src/main/java/org/factcast/core/subscription/FluentSubscriptionRequest.java
@@ -92,6 +92,11 @@ public SubscriptionRequest from(@NonNull UUID id) {
             return toBuild;
         }
 
+        public SubscriptionRequest fromNullable(UUID id) {
+            toBuild.startingAfter = id;
+            return toBuild;
+        }
+
         public SpecBuilder follow(FactSpec specification) {
             or(specification);
             toBuild.continuous = true;

diff --git a/factcast-core/src/main/java/org/factcast/core/subscription/SpecBuilder.java b/factcast-core/src/main/java/org/factcast/core/subscription/SpecBuilder.java
@@ -27,6 +27,8 @@ public interface SpecBuilder {
 
     SubscriptionRequest from(@NonNull UUID id);
 
+    SubscriptionRequest fromNullable(UUID id);
+
     SubscriptionRequest fromScratch();
 
     SubscriptionRequest fromNowOn();

diff --git a/...cast-core/src/test/java/org/factcast/core/subscription/FluentSubscriptionRequestTest.java b/...cast-core/src/test/java/org/factcast/core/subscription/FluentSubscriptionRequestTest.java
@@ -40,6 +40,12 @@ void testFollowNull() {
                 (FactSpec) null));
     }
 
+    @Test
+    void testFollowNullable() {
+        SubscriptionRequest req = SubscriptionRequest.follow(FactSpec.ns("foo")).fromNullable(null);
+        assertFalse(req.startingAfter().isPresent());
+    }
+
     @Test
     void testCatchupNull() {
         Assertions.assertThrows(NullPointerException.class, () -> SubscriptionRequest.catchup(