This is an automated email from the ASF dual-hosted git repository. tmaret pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 5b17d76fba0cc2ba88d8de223d042a303094a0c5 Merge: 21d0b95 3ecc77a Author: Timothee Maret <timothee.ma...@gmail.com> AuthorDate: Tue Feb 4 13:53:41 2025 +0100 Merge branch 'eds-handler' into master .../journal/bookkeeper/BookKeeperFactory.java | 28 +++----- .../bookkeeper/ContentPackageExtractor.java | 6 +- .../journal/bookkeeper/PackageHandler.java | 84 +--------------------- .../journal/bookkeeper/PackageHandlerFactory.java | 26 +++++++ .../bookkeeper/DefaultPackageHandler.java} | 22 +++--- .../bookkeeper/DefaultPackageHandlerFactory.java | 40 +++++++++++ .../journal/impl/eds/EdsPackageHandler.java | 57 +++++++++++++++ .../journal/impl/eds/EdsPackageHandlerFactory.java | 34 +++++++++ .../impl/subscriber/DistributionSubscriber.java | 19 ++++- .../journal/impl/subscriber/SubscriberTest.java | 22 +++++- 10 files changed, 219 insertions(+), 119 deletions(-) diff --cc src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java index e35953d,1f99c84..5fb5cfe --- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java @@@ -126,9 -129,12 +130,15 @@@ public class DistributionSubscriber @Reference private SubscriberReadyStore subscriberReadyStore; + @Reference + private OnlyOnLeader onlyOnLeader; + + @Reference(name = "packageHandlerFactory") + PackageHandlerFactory packageHandlerFactory; + + @Reference + Packaging packaging; + private SubscriberMetrics subscriberMetrics; private volatile Closeable idleReadyCheck; // NOSONAR