From 432733b0f4f26b96035a182ec03984c2bae7de02 Mon Sep 17 00:00:00 2001
From: Brad Baker <bbaker@atlassian.com>
Date: Sat, 13 Apr 2024 16:46:24 +1000
Subject: [PATCH] ig there is a specific predicate for a dataloader - its is
 the final say

---
 .../ScheduledDataLoaderRegistry.java          |  8 ++---
 ...eduledDataLoaderRegistryPredicateTest.java | 32 +++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java b/src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java
index 7e54fab..6ea9425 100644
--- a/src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java
+++ b/src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java
@@ -217,8 +217,8 @@ public void rescheduleNow() {
     }
 
     /**
-     * Returns true if the dataloader has a predicate which returned true, OR the overall
-     * registry predicate returned true.
+     * If a specific {@link DispatchPredicate} is registered for this dataloader then it uses it values
+     * otherwise the overall registry predicate is used.
      *
      * @param dataLoaderKey the key in the dataloader map
      * @param dataLoader    the dataloader
@@ -228,9 +228,7 @@ public void rescheduleNow() {
     private boolean shouldDispatch(String dataLoaderKey, DataLoader<?, ?> dataLoader) {
         DispatchPredicate dispatchPredicate = dataLoaderPredicates.get(dataLoader);
         if (dispatchPredicate != null) {
-            if (dispatchPredicate.test(dataLoaderKey, dataLoader)) {
-                return true;
-            }
+            return dispatchPredicate.test(dataLoaderKey, dataLoader);
         }
         return this.dispatchPredicate.test(dataLoaderKey, dataLoader);
     }
diff --git a/src/test/java/org/dataloader/registries/ScheduledDataLoaderRegistryPredicateTest.java b/src/test/java/org/dataloader/registries/ScheduledDataLoaderRegistryPredicateTest.java
index 43da82f..4eab564 100644
--- a/src/test/java/org/dataloader/registries/ScheduledDataLoaderRegistryPredicateTest.java
+++ b/src/test/java/org/dataloader/registries/ScheduledDataLoaderRegistryPredicateTest.java
@@ -139,13 +139,13 @@ public void test_the_registry_overall_predicate_firing_works() {
         DataLoader<Object, Object> dlB = newDataLoader(identityBatchLoader);
         DataLoader<Object, Object> dlC = newDataLoader(identityBatchLoader);
 
-        DispatchPredicate predicateOnSix = new CountingDispatchPredicate(6);
+        DispatchPredicate predicateOnThree = new CountingDispatchPredicate(3);
 
         ScheduledDataLoaderRegistry registry = ScheduledDataLoaderRegistry.newScheduledRegistry()
-                .register("a", dlA, DISPATCH_NEVER)
-                .register("b", dlB, DISPATCH_NEVER)
-                .register("c", dlC, DISPATCH_NEVER)
-                .dispatchPredicate(predicateOnSix)
+                .register("a", dlA, new CountingDispatchPredicate(99))
+                .register("b", dlB, new CountingDispatchPredicate(99))
+                .register("c", dlC) // has none
+                .dispatchPredicate(predicateOnThree)
                 .schedule(Duration.ofHours(1000))
                 .build();
 
@@ -160,16 +160,22 @@ public void test_the_registry_overall_predicate_firing_works() {
         assertThat(cfB.isDone(), equalTo(false));
         assertThat(cfC.isDone(), equalTo(false));
 
-        count = registry.dispatchAllWithCount(); // second firing but the overall been asked 6 times already
+        count = registry.dispatchAllWithCount(); // second firing
         assertThat(count, equalTo(0));
         assertThat(cfA.isDone(), equalTo(false));
         assertThat(cfB.isDone(), equalTo(false));
         assertThat(cfC.isDone(), equalTo(false));
 
-        count = registry.dispatchAllWithCount(); // third firing but the overall been asked 9 times already
-        assertThat(count, equalTo(3));
-        assertThat(cfA.isDone(), equalTo(true));
-        assertThat(cfB.isDone(), equalTo(true));
+        count = registry.dispatchAllWithCount(); // third firing
+        assertThat(count, equalTo(0));
+        assertThat(cfA.isDone(), equalTo(false));
+        assertThat(cfB.isDone(), equalTo(false));
+        assertThat(cfC.isDone(), equalTo(false));
+
+        count = registry.dispatchAllWithCount(); // fourth firing
+        assertThat(count, equalTo(1));
+        assertThat(cfA.isDone(), equalTo(false));
+        assertThat(cfB.isDone(), equalTo(false)); // they wont ever finish until 99 calls
         assertThat(cfC.isDone(), equalTo(true));
     }
 
@@ -217,9 +223,9 @@ public void test_the_registry_overall_predicate_firing_works_when_on_schedule()
         DispatchPredicate predicateOnTwenty = new CountingDispatchPredicate(20);
 
         ScheduledDataLoaderRegistry registry = ScheduledDataLoaderRegistry.newScheduledRegistry()
-                .register("a", dlA, DISPATCH_NEVER)
-                .register("b", dlB, DISPATCH_NEVER)
-                .register("c", dlC, DISPATCH_NEVER)
+                .register("a", dlA)
+                .register("b", dlB)
+                .register("c", dlC)
                 .dispatchPredicate(predicateOnTwenty)
                 .schedule(Duration.ofMillis(5))
                 .build();