diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfig.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfig.java deleted file mode 100644 index 749f35d98..000000000 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package uk.gov.justice.services.event.sourcing.subscription.catchup; - -import static java.lang.Boolean.valueOf; - -import uk.gov.justice.services.common.configuration.Value; - -import javax.inject.Inject; - -public class EventCatchupConfig { - - @Inject - @Value(key = "event.catchup.enabled", defaultValue = "false") - String eventCatchupEnabled; - - public boolean isEventCatchupEnabled() { - return valueOf(eventCatchupEnabled); - } -} - - diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManager.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManager.java similarity index 90% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManager.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManager.java index 54dccda31..18ff1860b 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManager.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManager.java @@ -1,12 +1,10 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import static java.lang.String.format; import uk.gov.justice.services.event.sourcing.subscription.catchup.EventCatchupException; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer; import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Queue; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventQueueConsumerFactory.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventQueueConsumerFactory.java similarity index 68% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventQueueConsumerFactory.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventQueueConsumerFactory.java index 4b5d682bb..ad67feb82 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventQueueConsumerFactory.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventQueueConsumerFactory.java @@ -1,10 +1,9 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import static org.slf4j.LoggerFactory.getLogger; import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer; import javax.inject.Inject; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamConsumerManager.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumerManager.java similarity index 89% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamConsumerManager.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumerManager.java index 1921d4d28..23f191c91 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamConsumerManager.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumerManager.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/EventStreamConsumptionResolver.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumptionResolver.java similarity index 88% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/EventStreamConsumptionResolver.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumptionResolver.java index 815f2dc76..0c026aa48 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/EventStreamConsumptionResolver.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamConsumptionResolver.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.listener; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; /** * Interface for listening to Event Stream Consumers. diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressList.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressList.java similarity index 94% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressList.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressList.java index 2a1c3b54a..86342645f 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressList.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressList.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import static java.lang.Thread.currentThread; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/FinishedProcessingMessage.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/FinishedProcessingMessage.java similarity index 90% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/FinishedProcessingMessage.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/FinishedProcessingMessage.java index 96dd3217e..5246ce01f 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/listener/FinishedProcessingMessage.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/FinishedProcessingMessage.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.listener; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/ConsumeEventQueueBean.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/ConsumeEventQueueBean.java similarity index 86% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/ConsumeEventQueueBean.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/ConsumeEventQueueBean.java index 40e3934b8..f5c11f588 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/ConsumeEventQueueBean.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/ConsumeEventQueueBean.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.task; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumer.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumer.java similarity index 83% rename from event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumer.java rename to event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumer.java index 5ada3afd0..e21b4d699 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumer.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumer.java @@ -1,10 +1,10 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.task; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task; import static java.lang.String.format; import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumptionResolver; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.FinishedProcessingMessage; import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Queue; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessor.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessor.java index 82e7d4c1d..b094e0066 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessor.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessor.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent; import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; import uk.gov.justice.services.eventsourcing.source.core.PublishedEventSource; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactory.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactory.java index 5cdfbe7e9..fb81fc622 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactory.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactory.java @@ -4,7 +4,7 @@ import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent; import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; import javax.enterprise.event.Event; diff --git a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactory.java b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactory.java index 8ab822f34..26db2ebf8 100644 --- a/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactory.java +++ b/event-sourcing/subscription-manager/src/main/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactory.java @@ -1,10 +1,10 @@ package uk.gov.justice.services.event.sourcing.subscription.catchup.task; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.ConcurrentEventStreamConsumerManager; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.ConcurrentEventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; import javax.inject.Inject; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfigTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfigTest.java deleted file mode 100644 index d3d9a16fd..000000000 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfigTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package uk.gov.justice.services.event.sourcing.subscription.catchup; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; - - -@RunWith(MockitoJUnitRunner.class) -public class EventCatchupConfigTest { - - @InjectMocks - private EventCatchupConfig eventCatchupConfig; - - @Test - public void shouldReturnTrueIfEventCatchupSetToTrue() throws Exception { - - eventCatchupConfig.eventCatchupEnabled = "true"; - - assertThat(eventCatchupConfig.isEventCatchupEnabled(), is(true)); - } - - @Test - public void shouldReturnFalseIfEventCatchupSetToFalse() throws Exception { - - eventCatchupConfig.eventCatchupEnabled = "false"; - - assertThat(eventCatchupConfig.isEventCatchupEnabled(), is(false)); - } - - @Test - public void shouldReturnFalseIfEventCatchupSetToSometingRandom() throws Exception { - - eventCatchupConfig.eventCatchupEnabled = "something silly"; - - assertThat(eventCatchupConfig.isEventCatchupEnabled(), is(false)); - } - - @Test - public void shouldBeCaseInsensitive() throws Exception { - - eventCatchupConfig.eventCatchupEnabled = "TrUe"; - - assertThat(eventCatchupConfig.isEventCatchupEnabled(), is(true)); - } - - @Test - public void shouldBeFalseIfNull() throws Exception { - - eventCatchupConfig.eventCatchupEnabled = null; - - assertThat(eventCatchupConfig.isEventCatchupEnabled(), is(false)); - } -} diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventStreamCatchupIT.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventStreamCatchupIT.java index 6d90d7496..8ab26d4ab 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventStreamCatchupIT.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventStreamCatchupIT.java @@ -6,11 +6,11 @@ import static uk.gov.justice.services.core.postgres.OpenEjbConfigurationBuilder.createOpenEjbConfigurationBuilder; import uk.gov.justice.services.cdi.LoggerProducer; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; -import uk.gov.justice.services.event.sourcing.subscription.startup.util.DummyTransactionalEventProcessor; -import uk.gov.justice.services.event.sourcing.subscription.startup.util.TestCatchupBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util.DummyTransactionalEventProcessor; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util.TestCatchupBean; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.messaging.Poller; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManagerTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManagerTest.java similarity index 95% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManagerTest.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManagerTest.java index 280fa575f..431a3545a 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/ConcurrentEventStreamConsumerManagerTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/ConcurrentEventStreamConsumerManagerTest.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import static java.util.UUID.randomUUID; import static javax.json.Json.createObjectBuilder; @@ -14,9 +14,8 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import uk.gov.justice.services.event.sourcing.subscription.catchup.EventCatchupException; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer; import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.List; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressListTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressListTest.java similarity index 93% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressListTest.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressListTest.java index de162bf9a..f6f5bfb91 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/manager/EventStreamsInProgressListTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/manager/EventStreamsInProgressListTest.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.manager; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumerTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumerTest.java similarity index 91% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumerTest.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumerTest.java index 38e093f1b..8b2b5f319 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/task/EventQueueConsumerTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/task/EventQueueConsumerTest.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.task; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task; import static java.util.UUID.fromString; import static javax.json.Json.createObjectBuilder; @@ -11,8 +11,8 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver; -import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumptionResolver; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.FinishedProcessingMessage; import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Queue; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/DummyTransactionalEventProcessor.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/DummyTransactionalEventProcessor.java similarity index 93% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/DummyTransactionalEventProcessor.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/DummyTransactionalEventProcessor.java index 8d53842b1..ecdfb1953 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/DummyTransactionalEventProcessor.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/DummyTransactionalEventProcessor.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.util; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util; import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/EventFactory.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/EventFactory.java similarity index 97% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/EventFactory.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/EventFactory.java index dd56f56fc..c5e6e3a48 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/EventFactory.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/EventFactory.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.util; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/TestCatchupBean.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/TestCatchupBean.java similarity index 74% rename from event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/TestCatchupBean.java rename to event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/TestCatchupBean.java index 837d74ad6..b8404f846 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/startup/util/TestCatchupBean.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/consumer/util/TestCatchupBean.java @@ -1,10 +1,10 @@ -package uk.gov.justice.services.event.sourcing.subscription.startup.util; +package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.ConcurrentEventStreamConsumerManager; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.ConcurrentEventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.stream.Stream; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactoryTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactoryTest.java index 97423a0f4..3be557108 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactoryTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactoryTest.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent; import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; import javax.enterprise.event.Event; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorTest.java index f127432b2..0a5f51ddc 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorTest.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent; import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; import uk.gov.justice.services.eventsourcing.source.core.PublishedEventSource; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; diff --git a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactoryTest.java b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactoryTest.java index 70911a1e4..9f765212d 100644 --- a/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactoryTest.java +++ b/event-sourcing/subscription-manager/src/test/java/uk/gov/justice/services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactoryTest.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertThat; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.getValueOfField; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager; -import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList; -import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList; +import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean; import org.junit.Test; import org.junit.runner.RunWith;