Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible #133

bbakerman · 2023-09-29T10:55:29Z

This adds a map of per dataloader predicates to ScheduledDataLoaderRegistry so people can have more fine grain control on when a dataloader is dispatched.

if its not used then it goes back to the default behavior of one predicate for the ScheduledDataLoaderRegistry

…edicates is also possible

…try_per_dataloader # Conflicts: # src/test/java/org/dataloader/fixtures/TestKit.java

bbakerman · 2023-10-03T01:44:40Z

src/main/java/org/dataloader/annotations/GuardedBy.java

@@ -15,7 +15,7 @@
 public @interface GuardedBy {

  /**
-   * The lock that should be held.
+   * @return The lock that should be held.


stopped a javadoc warning

…code tweaks

…lders

rstoyanchev

Looks good to me. Some minor comments below.

rstoyanchev · 2023-10-05T13:38:24Z

src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java

+        Builder combinedBuilder = ScheduledDataLoaderRegistry.newScheduledRegistry()
+                .dispatchPredicate(this.dispatchPredicate);
+        combinedBuilder.registerAll(this);
+        combinedBuilder.registerAll(registry);


Maybe worth checking here, or inside registerAll if the other registry is also a ScheduledDataLoaderRegistry and if so picking up its dispatchPredicates too.

checked - it does

rstoyanchev · 2023-10-05T13:46:55Z

src/main/java/org/dataloader/registries/ScheduledDataLoaderRegistry.java

+     */
+    public DispatchPredicate getDispatchPredicate() {
+        return dispatchPredicate;
+    }


Now that a DispatchPredicate can be registered per DataLoader, this should ideally be called defaultDispatchPredicate. However, I understand that would involve renaming, and/or a deprecation and a property with the new name. In the very least, the Javadoc should be updated to indicate that it applies by default, if there isn't already a registration for that DataLoader.

Also, really minor but the field and getter for dispatchPredicate could be ordered after the map of predicates, like it is in the builder to reflect it comes after the other registrations.

done. I didnt deprecate but I did redocument

…ain) (#17708) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.graphql-java:java-dataloader](https://togithub.com/graphql-java/java-dataloader) | `3.2.0` -> `3.3.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.graphql-java:java-dataloader/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.graphql-java:java-dataloader/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.graphql-java:java-dataloader/3.2.0/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.graphql-java:java-dataloader/3.2.0/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>graphql-java/java-dataloader (com.graphql-java:java-dataloader)</summary> ### [`v3.3.0`](https://togithub.com/graphql-java/java-dataloader/releases/tag/v3.3.0): 3.3.0 [Compare Source](https://togithub.com/graphql-java/java-dataloader/compare/v3.2.2...v3.3.0) #### What's Changed - Pre-size resulting lists by [@dfa1](https://togithub.com/dfa1) in [graphql-java/java-dataloader#142 - Minor javadoc fixes by [@dfa1](https://togithub.com/dfa1) in [graphql-java/java-dataloader#141 - Shuts down executor if its was auto added by our code by [@bbakerman](https://togithub.com/bbakerman) in [graphql-java/java-dataloader#144 - If there is a specific predicate for a dataloader - its is the final say on whether to dispatch by [@bbakerman](https://togithub.com/bbakerman) in [graphql-java/java-dataloader#145 **Full Changelog**: graphql-java/java-dataloader@v3.2.2...v3.3.0 ### [`v3.2.2`](https://togithub.com/graphql-java/java-dataloader/releases/tag/v3.2.2): 3.2.2 [Compare Source](https://togithub.com/graphql-java/java-dataloader/compare/v3.2.1...v3.2.2) #### What's Changed A series of small fixes to make the code more efficient - Lazily initialize Executor in ScheduledDataLoaderRegistry builder by [@kilink](https://togithub.com/kilink) in [graphql-java/java-dataloader#135 - Avoid allocations in DataLoaderHelper.dispatch when there's no work by [@kilink](https://togithub.com/kilink) in [graphql-java/java-dataloader#136 #### New Contributors - [@kilink](https://togithub.com/kilink) made their first contribution in [graphql-java/java-dataloader#135 **Full Changelog**: graphql-java/java-dataloader@v3.2.1...v3.2.2 ### [`v3.2.1`](https://togithub.com/graphql-java/java-dataloader/releases/tag/v3.2.1): 3.2.1 [Compare Source](https://togithub.com/graphql-java/java-dataloader/compare/v3.2.0...v3.2.1) ### New ticker mode There is a new mode in `ScheduledDataLoaderRegistry` called ticker mode that will continue to tick away and allow for chained data loader calls. See the readme for more details. ```java ScheduledDataLoaderRegistry registry = ScheduledDataLoaderRegistry.newScheduledRegistry() .register("a", dataLoaderA) .register("b", dataLoaderB) .scheduledExecutorService(executorService) .schedule(Duration.ofMillis(10)) .tickerMode(true) // ticker mode is on .build(); CompletableFuture<Object> chainedCalls = dataLoaderA.load("user1") .thenCompose(userAsKey -> dataLoaderB.load(userAsKey)); ``` ### Predicates per dataloader in ScheduledDataLoaderRegistry `ScheduledDataLoaderRegistry` now has the capability to have a predicate per data loader specified as well as an overall one. This allows you to have fine control on when dataloaders get dispatched. #### What's Changed - Try.getThrowable - fixed incorrect exception message by [@rstata](https://togithub.com/rstata) in [graphql-java/java-dataloader#122 - Prepend 0.0.0 to build version by [@dondonz](https://togithub.com/dondonz) in [graphql-java/java-dataloader#126 - Batch scheduler function support by [@bbakerman](https://togithub.com/bbakerman) in [graphql-java/java-dataloader#128 - Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible by [@bbakerman](https://togithub.com/bbakerman) in [graphql-java/java-dataloader#133 - Ticker mode on ScheduledDataLoaderRegistry by [@bbakerman](https://togithub.com/bbakerman) in [graphql-java/java-dataloader#131 #### New Contributors - [@rstata](https://togithub.com/rstata) made their first contribution in [graphql-java/java-dataloader#122 - [@dondonz](https://togithub.com/dondonz) made their first contribution in [graphql-java/java-dataloader#126 **Full Changelog**: graphql-java/java-dataloader@v3.2.0...v3.2.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 10pm every weekday,before 6am every weekday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/camunda/zeebe).

bbakerman added 5 commits September 29, 2023 20:54

Adds a predicate to DataLoaderRegistry and a per dataloader map of pr…

1151ccb

…edicates is also possible

Adds a predicate to DataLoaderRegistry - added tests

fb0a072

Merge remote-tracking branch 'origin/master' into predicate_per_regis…

9320fb4

…try_per_dataloader # Conflicts: # src/test/java/org/dataloader/fixtures/TestKit.java

Adds a predicate to DataLoaderRegistry - added more tests

c528455

Adds a predicate to ScheduledDataLoaderRegistry - no longer in DLR

c0c6eef

bbakerman commented Oct 3, 2023

View reviewed changes

bbakerman added 2 commits October 3, 2023 12:50

Adds a predicate to ScheduledDataLoaderRegistry - no longer in DLR - …

1c8d48c

…code tweaks

Adds a predicate to ScheduledDataLoaderRegistry - removed generic bui…

69528f1

…lders

rstoyanchev reviewed Oct 5, 2023

View reviewed changes

Adds a predicate to ScheduledDataLoaderRegistry - improved doco

3099f1a

bbakerman added this to the 3.2.1 milestone Oct 8, 2023

bbakerman merged commit 442edf4 into master Oct 8, 2023
1 check passed

dondonz deleted the predicate_per_registry_per_dataloader branch October 17, 2023 05:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible #133

Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible #133

bbakerman commented Sep 29, 2023 •

edited

bbakerman Oct 3, 2023

rstoyanchev left a comment •

edited

rstoyanchev Oct 5, 2023

bbakerman Oct 5, 2023

rstoyanchev Oct 5, 2023 •

edited

bbakerman Oct 5, 2023

Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible #133

Adds a predicate to DataLoaderRegistry and a per dataloader map of pedicates is also possible #133

Conversation

bbakerman commented Sep 29, 2023 • edited

bbakerman Oct 3, 2023

Choose a reason for hiding this comment

rstoyanchev left a comment • edited

Choose a reason for hiding this comment

rstoyanchev Oct 5, 2023

Choose a reason for hiding this comment

bbakerman Oct 5, 2023

Choose a reason for hiding this comment

rstoyanchev Oct 5, 2023 • edited

Choose a reason for hiding this comment

bbakerman Oct 5, 2023

Choose a reason for hiding this comment

bbakerman commented Sep 29, 2023 •

edited

rstoyanchev left a comment •

edited

rstoyanchev Oct 5, 2023 •

edited