Merge ebd97e8 into 1c57c44

CJSCommonPlatform · Jul 16, 2019 · 7d74ee8 · 7d74ee8
2 parents 1c57c44 + ebd97e8
commit 7d74ee8
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [2.0.0-RC6] - 2019-07-16
+### Changed
+- Moved system commands to framework jmx-api
 ### Fixed 
 - Moved liquibase jars to correct test scope
 

diff --git a/event-store-management/pom.xml b/event-store-management/pom.xml
@@ -44,6 +44,11 @@
             <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>
 
         <!--Test Dependencies-->
         <dependency>

diff --git a/...n/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommand.java b/...n/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommand.java
diff --git a/...uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java b/...uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java
@@ -1,12 +1,13 @@
 package uk.gov.justice.services.eventstore.management.catchup.commands;
 
-import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupCommand.CATCHUP;
+import static uk.gov.justice.services.jmx.api.command.CatchupCommand.CATCHUP;
 
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent;
 import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
+import uk.gov.justice.services.jmx.api.command.CatchupCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
-import uk.gov.justice.services.jmx.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/...a/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedEvent.java b/...a/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.catchup.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...e/services/eventstore/management/catchup/events/CatchupCompletedForSubscriptionEvent.java b/...e/services/eventstore/management/catchup/events/CatchupCompletedForSubscriptionEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.catchup.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...a/uk/gov/justice/services/eventstore/management/catchup/events/CatchupRequestedEvent.java b/...a/uk/gov/justice/services/eventstore/management/catchup/events/CatchupRequestedEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.catchup.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

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
@@ -12,7 +12,7 @@
 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.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;

diff --git a/...uk/gov/justice/services/eventstore/management/indexer/commands/IndexerCatchupCommand.java b/...uk/gov/justice/services/eventstore/management/indexer/commands/IndexerCatchupCommand.java
diff --git a/...justice/services/eventstore/management/indexer/commands/IndexerCatchupCommandHandler.java b/...justice/services/eventstore/management/indexer/commands/IndexerCatchupCommandHandler.java
@@ -1,12 +1,13 @@
 package uk.gov.justice.services.eventstore.management.indexer.commands;
 
-import static uk.gov.justice.services.eventstore.management.indexer.commands.IndexerCatchupCommand.INDEXER_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.indexer.events.IndexerCatchupCompletedEvent;
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupRequestedEvent;
+import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
-import uk.gov.justice.services.jmx.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/...v/justice/services/eventstore/management/indexer/events/IndexerCatchupCompletedEvent.java b/...v/justice/services/eventstore/management/indexer/events/IndexerCatchupCompletedEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.indexer.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...ces/eventstore/management/indexer/events/IndexerCatchupCompletedForSubscriptionEvent.java b/...ces/eventstore/management/indexer/events/IndexerCatchupCompletedForSubscriptionEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.indexer.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...v/justice/services/eventstore/management/indexer/events/IndexerCatchupRequestedEvent.java b/...v/justice/services/eventstore/management/indexer/events/IndexerCatchupRequestedEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.indexer.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/.../gov/justice/services/eventstore/management/indexer/observers/IndexerCatchupObserver.java b/.../gov/justice/services/eventstore/management/indexer/observers/IndexerCatchupObserver.java
@@ -12,7 +12,7 @@
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupDurationCalculator;
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupInProgress;
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupsInProgressCache;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;

diff --git a/...n/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommand.java b/...n/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommand.java
diff --git a/...uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java b/...uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java
@@ -1,12 +1,13 @@
 package uk.gov.justice.services.eventstore.management.rebuild.commands;
 
-import static uk.gov.justice.services.eventstore.management.rebuild.commands.RebuildCommand.REBUILD;
+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.RebuildCompleteEvent;
 import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent;
+import uk.gov.justice.services.jmx.api.command.RebuildCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
-import uk.gov.justice.services.jmx.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/...va/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildCompleteEvent.java b/...va/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildCompleteEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.rebuild.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...a/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildRequestedEvent.java b/...a/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildRequestedEvent.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.eventstore.management.rebuild.events;
 
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;

diff --git a/...java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java b/...java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java
@@ -7,7 +7,7 @@
 import uk.gov.justice.services.eventsourcing.publishedevent.rebuild.PublishedEventRebuilder;
 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.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.ZonedDateTime;
 

diff --git a/...ov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java b/...ov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java
@@ -8,7 +8,8 @@
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent;
 import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.CatchupCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/.../uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java b/.../uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java
@@ -20,7 +20,7 @@
 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.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;

diff --git a/...gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java b/...gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java
@@ -12,7 +12,7 @@
 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.CatchupStartedForSubscriptionEvent;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.justice.services.subscription.ProcessedEventTrackingService;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;

diff --git a/...ice/services/eventstore/management/indexer/commands/IndexerCatchupCommandHandlerTest.java b/...ice/services/eventstore/management/indexer/commands/IndexerCatchupCommandHandlerTest.java
@@ -8,7 +8,8 @@
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupCompletedEvent;
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupRequestedEvent;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/.../justice/services/eventstore/management/indexer/observers/IndexerCatchupObserverTest.java b/.../justice/services/eventstore/management/indexer/observers/IndexerCatchupObserverTest.java
@@ -20,7 +20,7 @@
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupDurationCalculator;
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupInProgress;
 import uk.gov.justice.services.eventstore.management.indexer.process.IndexerCatchupsInProgressCache;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;

diff --git a/...tice/services/eventstore/management/indexer/process/EventIndexerCatchupProcessorTest.java b/...tice/services/eventstore/management/indexer/process/EventIndexerCatchupProcessorTest.java
@@ -12,7 +12,7 @@
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupCompletedForSubscriptionEvent;
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupRequestedEvent;
 import uk.gov.justice.services.eventstore.management.indexer.events.IndexerCatchupStartedForSubscriptionEvent;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.justice.services.subscription.ProcessedEventTrackingService;
 import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription;

diff --git a/...ov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java b/...ov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java
@@ -8,7 +8,8 @@
 import uk.gov.justice.services.common.util.UtcClock;
 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.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.RebuildCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringCompleteEvent;
 import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent;
 import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent;

diff --git a/.../uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java b/.../uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java
@@ -7,9 +7,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.rebuild.commands.RebuildCommand;
 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.RebuildCommand;
 
 import java.time.ZonedDateTime;
 

diff --git a/...eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java b/...eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java
@@ -10,7 +10,7 @@
 
 import uk.gov.justice.services.eventsourcing.util.jee.timer.StopWatchFactory;
 import uk.gov.justice.services.eventstore.management.shuttering.process.PublishQueueInterrogator;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringProcessStartedEvent;
 import uk.gov.justice.services.management.shuttering.observers.shuttering.ShutteringRegistry;
 

diff --git a/...ervices/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java b/...ervices/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java
@@ -11,7 +11,7 @@
 
 import uk.gov.justice.services.eventsourcing.util.jee.timer.StopWatchFactory;
 import uk.gov.justice.services.eventstore.management.shuttering.process.CommandHandlerQueueInterrogator;
-import uk.gov.justice.services.jmx.command.SystemCommand;
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
 import uk.gov.justice.services.management.shuttering.events.ShutteringProcessStartedEvent;
 import uk.gov.justice.services.management.shuttering.observers.shuttering.ShutteringRegistry;
 

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
         <cpp.repo.name>event-store</cpp.repo.name>
 
         <framework-api.version>4.0.1</framework-api.version>
-        <framework.version>6.0.0-RC4</framework.version>
+        <framework.version>6.0.0-RC6</framework.version>
         <common-bom.version>2.4.0</common-bom.version>
         <utilities.version>1.20.1</utilities.version>
         <test-utils.version>1.24.3</test-utils.version>