This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch SLING-12226 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit ff418a6551446269ae9097db708bfbb04ea60e0e Author: Christian Schneider <[email protected]> AuthorDate: Thu Jan 11 12:09:25 2024 +0100 SLING-12226 Add creation date check --- .../journal/impl/subscriber/DistributionSubscriber.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git 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 index 5fadcff..0751456 100644 --- 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 @@ -51,15 +51,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.util.Text; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.PersistenceException; -import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.commons.metrics.Timer; -import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.distribution.ImportPostProcessException; import org.apache.sling.distribution.agent.DistributionAgentState; import org.apache.sling.distribution.common.DistributionException; import org.apache.sling.distribution.journal.FullMessage; import org.apache.sling.distribution.journal.HandlerAdapter; -import org.apache.sling.distribution.journal.JournalAvailable; import org.apache.sling.distribution.journal.MessageInfo; import org.apache.sling.distribution.journal.MessagingProvider; import org.apache.sling.distribution.journal.Reset; @@ -72,7 +69,6 @@ import org.apache.sling.distribution.journal.messages.LogMessage; import org.apache.sling.distribution.journal.messages.OffsetMessage; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.journal.messages.PackageStatusMessage; -import org.apache.sling.distribution.journal.messages.PingMessage; import org.apache.sling.distribution.journal.shared.Delay; import org.apache.sling.distribution.journal.shared.DistributionMetricsService; import org.apache.sling.distribution.journal.shared.Topics; @@ -84,6 +80,7 @@ import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; import org.osgi.service.metatype.annotations.Designate; +import org.osgi.util.converter.Converters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -177,7 +174,6 @@ public class DistributionSubscriber { } if (config.subscriberIdleCheck()) { - // Unofficial config (currently just for test) AtomicBoolean readyHolder = subscriberReadyStore.getReadyHolder(subAgentName); idleCheck = new SubscriberIdle(idleMillies, SubscriberIdle.DEFAULT_FORCE_IDLE_MILLIS, readyHolder); @@ -212,7 +208,7 @@ public class DistributionSubscriber { queueThread = startBackgroundThread(this::processQueue, format("Queue Processor for Subscriber agent %s", subAgentName)); - int announceDelay = PropertiesUtil.toInteger(properties.get("announceDelay"), 10000); + int announceDelay = Converters.standardConverter().convert(properties.get("announceDelay")).defaultValue(10000).to(Integer.class); announcer = new Announcer(subSlingId, subAgentName, queueNames, messagingProvider.createSender(topics.getDiscoveryTopic()), bookKeeper, config.maxRetries(), config.editable(), announceDelay);
