This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 91a8442985db0334636bbcfe9671de40cc098ef9 Author: Christian Schneider <[email protected]> AuthorDate: Tue Jun 23 13:13:21 2020 +0200 SLING-9259 - Move PackageRegtries and LocalStore to shared --- .../sling/distribution/journal/impl/queue/impl/PubQueueCache.java | 2 +- .../distribution/journal/impl/queue/impl/PubQueueCacheService.java | 3 +-- .../apache/sling/distribution/journal/impl/queue/impl/SubQueue.java | 1 + .../distribution/journal/impl/{subscriber => shared}/LocalStore.java | 2 +- .../journal/impl/{queue/impl => shared}/PackageRetries.java | 2 +- .../apache/sling/distribution/journal/impl/subscriber/BookKeeper.java | 3 ++- .../sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java | 2 +- .../distribution/journal/impl/queue/impl/PubQueueProviderTest.java | 2 +- .../sling/distribution/journal/impl/queue/impl/SubQueueTest.java | 2 ++ .../journal/impl/{subscriber => shared}/LocalStoreTest.java | 3 ++- .../journal/impl/{queue/impl => shared}/PackageRetriesTest.java | 4 +++- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java index 6cf0be7..fb83127 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java @@ -41,8 +41,8 @@ import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.distribution.journal.impl.event.DistributionEvent; import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService; import org.apache.sling.distribution.journal.impl.shared.JMXRegistration; +import org.apache.sling.distribution.journal.impl.shared.LocalStore; import org.apache.commons.io.IOUtils; -import org.apache.sling.distribution.journal.impl.subscriber.LocalStore; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.osgi.service.event.Event; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java index 2eddc6f..5e98ab4 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java @@ -23,13 +23,12 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService; +import org.apache.sling.distribution.journal.impl.shared.LocalStore; import org.apache.sling.distribution.journal.impl.shared.PublisherConfigurationAvailable; import org.apache.sling.distribution.journal.impl.shared.Topics; import org.apache.sling.distribution.journal.impl.queue.OffsetQueue; import org.apache.sling.distribution.journal.MessagingProvider; import org.apache.sling.distribution.journal.JournalAvailable; - -import org.apache.sling.distribution.journal.impl.subscriber.LocalStore; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.apache.sling.settings.SlingSettingsService; import org.osgi.service.component.annotations.Activate; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueue.java b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueue.java index 5d34e6d..4bfa2bf 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueue.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueue.java @@ -29,6 +29,7 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import org.apache.sling.distribution.queue.spi.DistributionQueue; +import org.apache.sling.distribution.journal.impl.shared.PackageRetries; import org.apache.sling.distribution.queue.DistributionQueueEntry; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.apache.sling.distribution.queue.DistributionQueueItemState; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStore.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/LocalStore.java similarity index 98% rename from src/main/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStore.java rename to src/main/java/org/apache/sling/distribution/journal/impl/shared/LocalStore.java index 878c831..b8a3a73 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStore.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/LocalStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.distribution.journal.impl.subscriber; +package org.apache.sling.distribution.journal.impl.shared; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.ModifiableValueMap; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetries.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageRetries.java similarity index 96% rename from src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetries.java rename to src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageRetries.java index 23f9463..a124eca 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetries.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageRetries.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.distribution.journal.impl.queue.impl; +package org.apache.sling.distribution.journal.impl.shared; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java index 4ec2fc0..0541b41 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java @@ -38,8 +38,9 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.commons.metrics.Timer; import org.apache.sling.distribution.common.DistributionException; -import org.apache.sling.distribution.journal.impl.queue.impl.PackageRetries; import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService; +import org.apache.sling.distribution.journal.impl.shared.LocalStore; +import org.apache.sling.distribution.journal.impl.shared.PackageRetries; import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService.GaugeService; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.journal.messages.PackageStatusMessage; diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java index e7f2444..957062e 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java @@ -47,8 +47,8 @@ import org.apache.sling.distribution.journal.MessagingProvider; import org.apache.sling.distribution.journal.Reset; import org.apache.sling.distribution.journal.impl.queue.OffsetQueue; import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService; +import org.apache.sling.distribution.journal.impl.shared.LocalStore; import org.apache.sling.distribution.journal.impl.shared.TestMessageInfo; -import org.apache.sling.distribution.journal.impl.subscriber.LocalStore; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.journal.messages.PackageMessage.ReqType; import org.apache.sling.distribution.queue.DistributionQueueItem; diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java index 2435c3a..70885e5 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java @@ -41,13 +41,13 @@ import javax.management.ReflectionException; import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.api.resource.ResourceResolverFactory; +import org.apache.sling.distribution.journal.impl.shared.LocalStore; import org.apache.sling.distribution.journal.impl.shared.Topics; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.journal.messages.PackageMessage.ReqType; import org.apache.sling.distribution.journal.messages.PackageStatusMessage; import org.apache.sling.distribution.journal.messages.PackageStatusMessage.Status; import org.apache.sling.distribution.journal.MessageSender; -import org.apache.sling.distribution.journal.impl.subscriber.LocalStore; import org.apache.sling.distribution.queue.DistributionQueueEntry; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.apache.sling.distribution.queue.spi.DistributionQueue; diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueueTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueueTest.java index d2784e9..3b73074 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueueTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/SubQueueTest.java @@ -26,6 +26,8 @@ import org.junit.Assert; import org.junit.Test; import org.apache.sling.distribution.journal.impl.queue.QueueItemFactory; +import org.apache.sling.distribution.journal.impl.shared.PackageRetries; + import com.google.common.collect.Lists; public class SubQueueTest { diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LocalStoreTest.java similarity index 96% rename from src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java rename to src/test/java/org/apache/sling/distribution/journal/impl/shared/LocalStoreTest.java index c989b4a..f95c470 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LocalStoreTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.distribution.journal.impl.subscriber; +package org.apache.sling.distribution.journal.impl.shared; import java.util.HashMap; import java.util.Map; @@ -29,6 +29,7 @@ import static org.junit.Assert.assertEquals; 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.distribution.journal.impl.shared.LocalStore; import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetriesTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageRetriesTest.java similarity index 91% rename from src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetriesTest.java rename to src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageRetriesTest.java index 6c33412..8e7adb9 100644 --- a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PackageRetriesTest.java +++ b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageRetriesTest.java @@ -16,12 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.distribution.journal.impl.queue.impl; +package org.apache.sling.distribution.journal.impl.shared; import org.junit.Test; import static org.junit.Assert.assertEquals; +import org.apache.sling.distribution.journal.impl.shared.PackageRetries; + public class PackageRetriesTest { @Test
