Merge pull request #164 from CJSCommonPlatform/move-the-system-events…

…-into-their-own-module Move all system events into their own module
CJSCommonPlatform · Sep 26, 2019 · 816620a · 816620a
2 parents 5bcabf9 + b117911
commit 816620a
Show file tree

Hide file tree

Showing 91 changed files with 231 additions and 188 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- All system events moved into their own module 'event-store-management-events'
 
 ## [2.1.0] - 2019-09-26
 ### Changed

diff --git a/event-store-management/event-store-management-core/pom.xml b/event-store-management/event-store-management-core/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>event-store</artifactId>
+        <groupId>uk.gov.justice.event-store</groupId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>event-store-management-core</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.framework-api</groupId>
+            <artifactId>framework-api-messaging-jms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.utils</groupId>
+            <artifactId>utilities-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>published-event-processor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>jmx-command-handling</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>subscription-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>framework-management</artifactId>
+            <version>${framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>jmx-api</artifactId>
+            <version>${framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-management-events</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--Test Dependencies-->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>test-utils-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>test-utils-persistence</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...tchup/commands/CatchupCommandHandler.java → ...tchup/commands/CatchupCommandHandler.java b/...tchup/commands/CatchupCommandHandler.java → ...tchup/commands/CatchupCommandHandler.java
@@ -1,13 +1,14 @@
 package uk.gov.justice.services.eventstore.management.catchup.commands;
 
 import static java.lang.String.format;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 import static uk.gov.justice.services.jmx.api.command.CatchupCommand.CATCHUP;
 import static uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand.INDEXER_CATCHUP;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.CatchupCommand;
 import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;

diff --git a/...t/catchup/observers/CatchupLifecycle.java → ...t/catchup/observers/CatchupLifecycle.java b/...t/catchup/observers/CatchupLifecycle.java → ...t/catchup/observers/CatchupLifecycle.java
@@ -3,16 +3,16 @@
 import static java.lang.String.format;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupDurationCalculator;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupInProgress;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupsInProgressCache;
 import uk.gov.justice.services.eventstore.management.catchup.process.EventCatchupRunner;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.Duration;

diff --git a/...java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java b/...java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java
@@ -0,0 +1,49 @@
+package uk.gov.justice.services.eventstore.management.catchup.observers;
+
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.logging.MdcLogger;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+
+@ApplicationScoped
+public class CatchupObserver {
+
+    @Inject
+    private CatchupLifecycle catchupLifecycle;
+
+    @Inject
+    private MdcLogger mdcLogger;
+
+    public void onCatchupRequested(@Observes final CatchupRequestedEvent catchupRequestedEvent) {
+
+        mdcLogger
+                .mdcLoggerConsumer()
+                .accept(() -> catchupLifecycle.handleCatchupRequested(catchupRequestedEvent));
+    }
+
+    public void onCatchupStarted(@Observes final CatchupStartedEvent catchupStartedEvent) {
+
+        mdcLogger
+                .mdcLoggerConsumer()
+                .accept(() -> catchupLifecycle.handleCatchupStarted(catchupStartedEvent));
+    }
+
+    public void onCatchupStartedForSubscription(@Observes final CatchupStartedForSubscriptionEvent catchupStartedForSubscriptionEvent) {
+
+        mdcLogger
+                .mdcLoggerConsumer()
+                .accept(() -> catchupLifecycle.handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent));
+    }
+
+    public void onCatchupCompleteForSubscription(@Observes final CatchupCompletedForSubscriptionEvent catchupCompletedForSubscriptionEvent) {
+
+        mdcLogger
+                .mdcLoggerConsumer()
+                .accept(() -> catchupLifecycle.handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent));
+    }
+}
diff --git a/...up/process/CatchupDurationCalculator.java → ...up/process/CatchupDurationCalculator.java b/...up/process/CatchupDurationCalculator.java → ...up/process/CatchupDurationCalculator.java
@@ -2,7 +2,7 @@
 
 import static java.time.Duration.between;
 
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
 
 import java.time.Duration;
 import java.time.Instant;

diff --git a/...nt/catchup/process/CatchupInProgress.java → ...nt/catchup/process/CatchupInProgress.java b/...nt/catchup/process/CatchupInProgress.java → ...nt/catchup/process/CatchupInProgress.java
diff --git a/...p/process/CatchupSubscriptionContext.java → ...p/process/CatchupSubscriptionContext.java b/...p/process/CatchupSubscriptionContext.java → ...p/process/CatchupSubscriptionContext.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.catchup.process;
 
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;
 

diff --git a/.../catchup/process/CatchupTypeSelector.java → .../catchup/process/CatchupTypeSelector.java b/.../catchup/process/CatchupTypeSelector.java → .../catchup/process/CatchupTypeSelector.java
@@ -2,10 +2,10 @@
 
 import static uk.gov.justice.services.core.annotation.Component.EVENT_INDEXER;
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 
 public class CatchupTypeSelector {
 

diff --git a/...chup/process/CatchupsInProgressCache.java → ...chup/process/CatchupsInProgressCache.java b/...chup/process/CatchupsInProgressCache.java → ...chup/process/CatchupsInProgressCache.java
@@ -1,8 +1,8 @@
 package uk.gov.justice.services.eventstore.management.catchup.process;
 
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...rocess/EventCatchupByComponentRunner.java → ...rocess/EventCatchupByComponentRunner.java b/...rocess/EventCatchupByComponentRunner.java → ...rocess/EventCatchupByComponentRunner.java
@@ -2,7 +2,7 @@
 
 import static java.lang.String.format;
 
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.SubscriptionsDescriptor;

diff --git a/...atchup/process/EventCatchupProcessor.java → ...atchup/process/EventCatchupProcessor.java b/...atchup/process/EventCatchupProcessor.java → ...atchup/process/EventCatchupProcessor.java
@@ -9,9 +9,9 @@
 import uk.gov.justice.services.eventsourcing.repository.jdbc.event.MissingEventNumberException;
 import uk.gov.justice.services.eventsourcing.repository.jdbc.event.PublishedEvent;
 import uk.gov.justice.services.eventsourcing.source.api.service.core.PublishedEventSource;
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.subscription.ProcessedEventTrackingService;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;

diff --git a/...up/process/EventCatchupProcessorBean.java → ...up/process/EventCatchupProcessorBean.java b/...up/process/EventCatchupProcessorBean.java → ...up/process/EventCatchupProcessorBean.java
diff --git a/...t/catchup/process/EventCatchupRunner.java → ...t/catchup/process/EventCatchupRunner.java b/...t/catchup/process/EventCatchupRunner.java → ...t/catchup/process/EventCatchupRunner.java
@@ -3,8 +3,8 @@
 import static java.lang.String.format;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.SubscriptionsDescriptor;
 import uk.gov.justice.subscription.registry.SubscriptionsDescriptorsRegistry;

diff --git a/...ocess/RunCatchupForComponentSelector.java → ...ocess/RunCatchupForComponentSelector.java b/...ocess/RunCatchupForComponentSelector.java → ...ocess/RunCatchupForComponentSelector.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.catchup.process;
 
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 
 import javax.inject.Inject;
 

diff --git a/...ntstore/management/logging/MdcLogger.java → ...ntstore/management/logging/MdcLogger.java b/...ntstore/management/logging/MdcLogger.java → ...ntstore/management/logging/MdcLogger.java
diff --git a/...build/commands/RebuildCommandHandler.java → ...build/commands/RebuildCommandHandler.java b/...build/commands/RebuildCommandHandler.java → ...build/commands/RebuildCommandHandler.java
@@ -4,7 +4,7 @@
 import static uk.gov.justice.services.jmx.api.command.RebuildCommand.REBUILD;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent;
 import uk.gov.justice.services.jmx.api.command.RebuildCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
 

diff --git a/...nt/rebuild/observers/RebuildObserver.java → ...nt/rebuild/observers/RebuildObserver.java b/...nt/rebuild/observers/RebuildObserver.java → ...nt/rebuild/observers/RebuildObserver.java
@@ -5,9 +5,9 @@
 
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventsourcing.publishedevent.rebuild.PublishedEventRebuilder;
+import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildCompleteEvent;
+import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent;
 import uk.gov.justice.services.eventstore.management.logging.MdcLogger;
-import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildCompleteEvent;
-import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;

diff --git a/...ublishQueueDrainedShutteringObserver.java → ...ublishQueueDrainedShutteringObserver.java b/...ublishQueueDrainedShutteringObserver.java → ...ublishQueueDrainedShutteringObserver.java
diff --git a/...ervers/ShutterCommandHandlerObserver.java → ...ervers/ShutterCommandHandlerObserver.java b/...ervers/ShutterCommandHandlerObserver.java → ...ervers/ShutterCommandHandlerObserver.java
diff --git a/...tering/observers/ShutteringException.java → ...tering/observers/ShutteringException.java b/...tering/observers/ShutteringException.java → ...tering/observers/ShutteringException.java
diff --git a/...cess/CommandHandlerQueueInterrogator.java → ...cess/CommandHandlerQueueInterrogator.java b/...cess/CommandHandlerQueueInterrogator.java → ...cess/CommandHandlerQueueInterrogator.java
diff --git a/...s/CommandHandlerQueueSupplierFactory.java → ...s/CommandHandlerQueueSupplierFactory.java b/...s/CommandHandlerQueueSupplierFactory.java → ...s/CommandHandlerQueueSupplierFactory.java
diff --git a/...ing/process/PublishQueueInterrogator.java → ...ing/process/PublishQueueInterrogator.java b/...ing/process/PublishQueueInterrogator.java → ...ing/process/PublishQueueInterrogator.java
diff --git a/...mands/AddRemoveTriggerCommandHandler.java → ...mands/AddRemoveTriggerCommandHandler.java b/...mands/AddRemoveTriggerCommandHandler.java → ...mands/AddRemoveTriggerCommandHandler.java
diff --git a/...r/process/EventLogTriggerManipulator.java → ...r/process/EventLogTriggerManipulator.java b/...r/process/EventLogTriggerManipulator.java → ...r/process/EventLogTriggerManipulator.java
diff --git a/...EventStoreTriggerManipulatorProvider.java → ...EventStoreTriggerManipulatorProvider.java b/...EventStoreTriggerManipulatorProvider.java → ...EventStoreTriggerManipulatorProvider.java
diff --git a/...commands/VerifyCatchupCommandHandler.java → ...commands/VerifyCatchupCommandHandler.java b/...commands/VerifyCatchupCommandHandler.java → ...commands/VerifyCatchupCommandHandler.java
diff --git a/...ation/process/ActiveStreamIdProvider.java → ...ation/process/ActiveStreamIdProvider.java b/...ation/process/ActiveStreamIdProvider.java → ...ation/process/ActiveStreamIdProvider.java
diff --git a/...n/process/AllEventsInStreamsVerifier.java → ...n/process/AllEventsInStreamsVerifier.java b/...n/process/AllEventsInStreamsVerifier.java → ...n/process/AllEventsInStreamsVerifier.java
diff --git a/...process/CatchupVerificationException.java → ...process/CatchupVerificationException.java b/...process/CatchupVerificationException.java → ...process/CatchupVerificationException.java
diff --git a/...n/process/CatchupVerificationProcess.java → ...n/process/CatchupVerificationProcess.java b/...n/process/CatchupVerificationProcess.java → ...n/process/CatchupVerificationProcess.java
diff --git a/...lidation/process/EventLinkageChecker.java → ...lidation/process/EventLinkageChecker.java b/...lidation/process/EventLinkageChecker.java → ...lidation/process/EventLinkageChecker.java
diff --git a/...rocess/EventLogActiveEventRowCounter.java → ...rocess/EventLogActiveEventRowCounter.java b/...rocess/EventLogActiveEventRowCounter.java → ...rocess/EventLogActiveEventRowCounter.java
diff --git a/.../process/ProcessedEventCountVerifier.java → .../process/ProcessedEventCountVerifier.java b/.../process/ProcessedEventCountVerifier.java → .../process/ProcessedEventCountVerifier.java
diff --git a/...n/process/ProcessedEventLinkVerifier.java → ...n/process/ProcessedEventLinkVerifier.java b/...n/process/ProcessedEventLinkVerifier.java → ...n/process/ProcessedEventLinkVerifier.java
diff --git a/.../process/PublishedEventCountVerifier.java → .../process/PublishedEventCountVerifier.java b/.../process/PublishedEventCountVerifier.java → .../process/PublishedEventCountVerifier.java
diff --git a/...n/process/PublishedEventLinkVerifier.java → ...n/process/PublishedEventLinkVerifier.java b/...n/process/PublishedEventLinkVerifier.java → ...n/process/PublishedEventLinkVerifier.java
diff --git a/...on/process/StreamBufferEmptyVerifier.java → ...on/process/StreamBufferEmptyVerifier.java b/...on/process/StreamBufferEmptyVerifier.java → ...on/process/StreamBufferEmptyVerifier.java
diff --git a/...t/validation/process/TableRowCounter.java → ...t/validation/process/TableRowCounter.java b/...t/validation/process/TableRowCounter.java → ...t/validation/process/TableRowCounter.java
diff --git a/...alidation/process/VerificationResult.java → ...alidation/process/VerificationResult.java b/...alidation/process/VerificationResult.java → ...alidation/process/VerificationResult.java
diff --git a/...nagement/validation/process/Verifier.java → ...nagement/validation/process/Verifier.java b/...nagement/validation/process/Verifier.java → ...nagement/validation/process/Verifier.java
diff --git a/.../validation/process/VerifierProvider.java → .../validation/process/VerifierProvider.java b/.../validation/process/VerifierProvider.java → .../validation/process/VerifierProvider.java
diff --git a/...ent/src/main/resources/META-INF/beans.xml → ...ore/src/main/resources/META-INF/beans.xml b/...ent/src/main/resources/META-INF/beans.xml → ...ore/src/main/resources/META-INF/beans.xml
diff --git a/...p/commands/CatchupCommandHandlerTest.java → ...p/commands/CatchupCommandHandlerTest.java b/...p/commands/CatchupCommandHandlerTest.java → ...p/commands/CatchupCommandHandlerTest.java
@@ -4,11 +4,11 @@
 import static java.time.ZonedDateTime.of;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
 import uk.gov.justice.services.jmx.api.command.CatchupCommand;
 import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand;
 

diff --git a/...tchup/observers/CatchupLifecycleTest.java → ...tchup/observers/CatchupLifecycleTest.java b/...tchup/observers/CatchupLifecycleTest.java → ...tchup/observers/CatchupLifecycleTest.java
@@ -9,19 +9,19 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupDurationCalculator;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupInProgress;
 import uk.gov.justice.services.eventstore.management.catchup.process.CatchupsInProgressCache;
 import uk.gov.justice.services.eventstore.management.catchup.process.EventCatchupRunner;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType;
 import uk.gov.justice.services.jmx.api.command.CatchupCommand;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
 

diff --git a/...atchup/observers/CatchupObserverTest.java → ...atchup/observers/CatchupObserverTest.java b/...atchup/observers/CatchupObserverTest.java → ...atchup/observers/CatchupObserverTest.java
@@ -4,10 +4,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent;
 import uk.gov.justice.services.eventstore.management.logging.MdcLogger;
 
 import java.util.function.Consumer;

diff --git a/...rocess/CatchupDurationCalculatorTest.java → ...rocess/CatchupDurationCalculatorTest.java b/...rocess/CatchupDurationCalculatorTest.java → ...rocess/CatchupDurationCalculatorTest.java
@@ -6,7 +6,7 @@
 import static org.mockito.Mockito.when;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent;
+import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;

diff --git a/...chup/process/CatchupTypeSelectorTest.java → ...chup/process/CatchupTypeSelectorTest.java b/...chup/process/CatchupTypeSelectorTest.java → ...chup/process/CatchupTypeSelectorTest.java
@@ -2,8 +2,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/.../process/CatchupsInProgressCacheTest.java → .../process/CatchupsInProgressCacheTest.java b/.../process/CatchupsInProgressCacheTest.java → .../process/CatchupsInProgressCacheTest.java
@@ -4,8 +4,8 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP;
 
 import uk.gov.justice.services.common.util.UtcClock;
 

diff --git a/...ss/EventCatchupByComponentRunnerTest.java → ...ss/EventCatchupByComponentRunnerTest.java b/...ss/EventCatchupByComponentRunnerTest.java → ...ss/EventCatchupByComponentRunnerTest.java
@@ -5,7 +5,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP;
+import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP;
 
 import uk.gov.justice.services.jmx.api.command.CatchupCommand;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;

diff --git a/...rocess/EventCatchupProcessorBeanTest.java → ...rocess/EventCatchupProcessorBeanTest.java b/...rocess/EventCatchupProcessorBeanTest.java → ...rocess/EventCatchupProcessorBeanTest.java