Merge fb02cce into 4c114a0

CJSCommonPlatform · Nov 7, 2019 · 39452a6 · 39452a6
2 parents 4c114a0 + fb02cce
commit 39452a6
Show file tree

Hide file tree

Showing 73 changed files with 585 additions and 659 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [6.2.6] - 2019-11-07
+### Changed
+- JMX client is now called using the command name as a String rather than the SystemCommand itself.
+- SystemCommands moved out to the projects that contain their CommandHandlers rather than centralised in
+framework.
+
 ## [6.2.5] - 2019-11-04
 ### Changed
 - Update json-schema-catalog to 1.7.6

diff --git a/...services/jmx/api/command/PingCommand.java → ...management/ping/commands/PingCommand.java b/...services/jmx/api/command/PingCommand.java → ...management/ping/commands/PingCommand.java
@@ -1,4 +1,6 @@
-package uk.gov.justice.services.jmx.api.command;
+package uk.gov.justice.services.management.ping.commands;
+
+import uk.gov.justice.services.jmx.api.command.BaseSystemCommand;
 
 public class PingCommand extends BaseSystemCommand {
 

diff --git a/...management/src/main/java/uk/gov/justice/services/management/ping/handler/PingHandler.java b/...management/src/main/java/uk/gov/justice/services/management/ping/handler/PingHandler.java
@@ -1,11 +1,11 @@
 package uk.gov.justice.services.management.ping.handler;
 
-import static uk.gov.justice.services.jmx.api.command.PingCommand.PING;
+import static uk.gov.justice.services.management.ping.commands.PingCommand.PING;
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_COMPLETE;
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_IN_PROGRESS;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.PingCommand;
+import uk.gov.justice.services.management.ping.commands.PingCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 

diff --git a/...t/src/main/java/uk/gov/justice/services/management/shuttering/api/ShutteringExecutor.java b/...t/src/main/java/uk/gov/justice/services/management/shuttering/api/ShutteringExecutor.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.management.shuttering.api;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 
 import java.util.UUID;
 

diff --git a/.../uk/gov/justice/services/management/shuttering/commands/ApplicationShutteringCommand.java b/.../uk/gov/justice/services/management/shuttering/commands/ApplicationShutteringCommand.java
@@ -0,0 +1,12 @@
+package uk.gov.justice.services.management.shuttering.commands;
+
+import static uk.gov.justice.services.management.shuttering.commands.UnshutterCommand.UNSHUTTER;
+
+import uk.gov.justice.services.jmx.api.command.SystemCommand;
+
+public interface ApplicationShutteringCommand extends SystemCommand {
+
+    default boolean isUnshuttering() {
+        return UNSHUTTER.equals(getName());
+    }
+}
diff --git a/...vices/jmx/api/command/ShutterCommand.java → ...t/shuttering/commands/ShutterCommand.java b/...vices/jmx/api/command/ShutterCommand.java → ...t/shuttering/commands/ShutterCommand.java
@@ -1,4 +1,6 @@
-package uk.gov.justice.services.jmx.api.command;
+package uk.gov.justice.services.management.shuttering.commands;
+
+import uk.gov.justice.services.jmx.api.command.BaseSystemCommand;
 
 public class ShutterCommand extends BaseSystemCommand implements ApplicationShutteringCommand {
 

diff --git a/...ces/jmx/api/command/UnshutterCommand.java → ...shuttering/commands/UnshutterCommand.java b/...ces/jmx/api/command/UnshutterCommand.java → ...shuttering/commands/UnshutterCommand.java
@@ -1,4 +1,6 @@
-package uk.gov.justice.services.jmx.api.command;
+package uk.gov.justice.services.management.shuttering.commands;
+
+import uk.gov.justice.services.jmx.api.command.BaseSystemCommand;
 
 public class UnshutterCommand extends BaseSystemCommand implements ApplicationShutteringCommand {
 

diff --git a/...uk/gov/justice/services/management/shuttering/executors/CommandApiShutteringExecutor.java b/...uk/gov/justice/services/management/shuttering/executors/CommandApiShutteringExecutor.java
@@ -2,7 +2,7 @@
 
 import static uk.gov.justice.services.management.shuttering.api.ShutteringResult.shutteringSucceeded;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/...rc/main/java/uk/gov/justice/services/management/shuttering/handler/RunShutteringBean.java b/...rc/main/java/uk/gov/justice/services/management/shuttering/handler/RunShutteringBean.java
@@ -5,7 +5,7 @@
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_IN_PROGRESS;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.jmx.logging.MdcLoggerInterceptor;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;

diff --git a/...uk/gov/justice/services/management/shuttering/handler/ShutteringSystemCommandHandler.java b/...uk/gov/justice/services/management/shuttering/handler/ShutteringSystemCommandHandler.java
@@ -1,12 +1,12 @@
 package uk.gov.justice.services.management.shuttering.handler;
 
 import static java.lang.String.format;
-import static uk.gov.justice.services.jmx.api.command.ShutterCommand.SHUTTER;
-import static uk.gov.justice.services.jmx.api.command.UnshutterCommand.UNSHUTTER;
+import static uk.gov.justice.services.management.shuttering.commands.ShutterCommand.SHUTTER;
+import static uk.gov.justice.services.management.shuttering.commands.UnshutterCommand.UNSHUTTER;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 import uk.gov.justice.services.jmx.command.HandlesSystemCommand;
 
 import java.util.UUID;

diff --git a/...nt/src/main/java/uk/gov/justice/services/management/shuttering/process/ShutterRunner.java b/...nt/src/main/java/uk/gov/justice/services/management/shuttering/process/ShutterRunner.java
@@ -3,7 +3,7 @@
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/...java/uk/gov/justice/services/management/shuttering/process/ShutteringExecutorsRunner.java b/...java/uk/gov/justice/services/management/shuttering/process/ShutteringExecutorsRunner.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.management.shuttering.process;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 
 import java.util.List;

diff --git a/...n/java/uk/gov/justice/services/management/shuttering/process/ShutteringFailedHandler.java b/...n/java/uk/gov/justice/services/management/shuttering/process/ShutteringFailedHandler.java
@@ -3,7 +3,7 @@
 import static java.lang.String.format;
 import static uk.gov.justice.services.management.shuttering.api.ShutteringResult.shutteringFailed;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/...ain/java/uk/gov/justice/services/management/shuttering/process/ShutteringPostProcess.java b/...ain/java/uk/gov/justice/services/management/shuttering/process/ShutteringPostProcess.java
@@ -5,7 +5,7 @@
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_FAILED;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/.../src/main/java/uk/gov/justice/services/management/shuttering/process/UnshutterRunner.java b/.../src/main/java/uk/gov/justice/services/management/shuttering/process/UnshutterRunner.java
@@ -3,7 +3,7 @@
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/...gement/src/test/java/uk/gov/justice/services/management/ping/handler/PingHandlerTest.java b/...gement/src/test/java/uk/gov/justice/services/management/ping/handler/PingHandlerTest.java
@@ -11,7 +11,7 @@
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_IN_PROGRESS;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.PingCommand;
+import uk.gov.justice.services.management.ping.commands.PingCommand;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 
 import java.time.ZonedDateTime;

diff --git a/...ervices/management/shuttering/api/ShutteringExecutorDefaultMethodImplementationsTest.java b/...ervices/management/shuttering/api/ShutteringExecutorDefaultMethodImplementationsTest.java
@@ -6,7 +6,7 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.process.ShutteringExecutorWithNoImplementations;
 
 import java.util.UUID;

diff --git a/...s/jmx/api/command/ShutterCommandTest.java → ...uttering/commands/ShutterCommandTest.java b/...s/jmx/api/command/ShutterCommandTest.java → ...uttering/commands/ShutterCommandTest.java
@@ -1,8 +1,10 @@
-package uk.gov.justice.services.jmx.api.command;
+package uk.gov.justice.services.management.shuttering.commands;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

diff --git a/...jmx/api/command/UnshutterCommandTest.java → ...tering/commands/UnshutterCommandTest.java b/...jmx/api/command/UnshutterCommandTest.java → ...tering/commands/UnshutterCommandTest.java
@@ -1,14 +1,15 @@
-package uk.gov.justice.services.jmx.api.command;
+package uk.gov.justice.services.management.shuttering.commands;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.runners.MockitoJUnitRunner;
 
-
 @RunWith(MockitoJUnitRunner.class)
 public class UnshutterCommandTest {
 

diff --git a/...ov/justice/services/management/shuttering/executors/CommandApiShutteringExecutorTest.java b/...ov/justice/services/management/shuttering/executors/CommandApiShutteringExecutorTest.java
@@ -8,7 +8,7 @@
 import static org.mockito.Mockito.mock;
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_COMPLETE;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 
 import java.util.UUID;

diff --git a/...est/java/uk/gov/justice/services/management/shuttering/handler/RunShutteringBeanTest.java b/...est/java/uk/gov/justice/services/management/shuttering/handler/RunShutteringBeanTest.java
@@ -8,7 +8,7 @@
 import static org.mockito.Mockito.when;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 import uk.gov.justice.services.management.shuttering.process.ShutteringExecutorsRunner;

diff --git a/...ov/justice/services/management/shuttering/handler/ShutteringSystemCommandHandlerTest.java b/...ov/justice/services/management/shuttering/handler/ShutteringSystemCommandHandlerTest.java
@@ -3,8 +3,8 @@
 import static java.util.UUID.randomUUID;
 import static org.mockito.Mockito.inOrder;
 
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 
 import java.util.UUID;
 

diff --git a/...rc/test/java/uk/gov/justice/services/management/shuttering/process/ShutterRunnerTest.java b/...rc/test/java/uk/gov/justice/services/management/shuttering/process/ShutterRunnerTest.java
@@ -10,8 +10,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/.../uk/gov/justice/services/management/shuttering/process/ShutteringExecutorsRunnerTest.java b/.../uk/gov/justice/services/management/shuttering/process/ShutteringExecutorsRunnerTest.java
@@ -3,8 +3,8 @@
 import static java.util.UUID.randomUUID;
 import static org.mockito.Mockito.verify;
 
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 
 import java.util.UUID;
 

diff --git a/...va/uk/gov/justice/services/management/shuttering/process/ShutteringFailedHandlerTest.java b/...va/uk/gov/justice/services/management/shuttering/process/ShutteringFailedHandlerTest.java
@@ -8,8 +8,8 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_FAILED;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/...java/uk/gov/justice/services/management/shuttering/process/ShutteringPostProcessTest.java b/...java/uk/gov/justice/services/management/shuttering/process/ShutteringPostProcessTest.java
@@ -12,9 +12,9 @@
 import static uk.gov.justice.services.jmx.api.domain.CommandState.COMMAND_FAILED;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
-import uk.gov.justice.services.jmx.api.command.UnshutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.UnshutterCommand;
 import uk.gov.justice.services.jmx.state.events.SystemCommandStateChangedEvent;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/.../test/java/uk/gov/justice/services/management/shuttering/process/UnshutterRunnerTest.java b/.../test/java/uk/gov/justice/services/management/shuttering/process/UnshutterRunnerTest.java
@@ -10,8 +10,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import uk.gov.justice.services.jmx.api.command.ApplicationShutteringCommand;
-import uk.gov.justice.services.jmx.api.command.ShutterCommand;
+import uk.gov.justice.services.management.shuttering.commands.ApplicationShutteringCommand;
+import uk.gov.justice.services.management.shuttering.commands.ShutterCommand;
 import uk.gov.justice.services.management.shuttering.api.ShutteringExecutor;
 import uk.gov.justice.services.management.shuttering.api.ShutteringResult;
 

diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/AddTriggerCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/AddTriggerCommand.java
diff --git a/...i/src/main/java/uk/gov/justice/services/jmx/api/command/ApplicationShutteringCommand.java b/...i/src/main/java/uk/gov/justice/services/jmx/api/command/ApplicationShutteringCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/CatchupCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/CatchupCommand.java
diff --git a/...x-api/src/main/java/uk/gov/justice/services/jmx/api/command/DisablePublishingCommand.java b/...x-api/src/main/java/uk/gov/justice/services/jmx/api/command/DisablePublishingCommand.java
diff --git a/...mx-api/src/main/java/uk/gov/justice/services/jmx/api/command/EnablePublishingCommand.java b/...mx-api/src/main/java/uk/gov/justice/services/jmx/api/command/EnablePublishingCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/EventCatchupCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/EventCatchupCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/IndexerCatchupCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/IndexerCatchupCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/PublishingCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/PublishingCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/RebuildCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/RebuildCommand.java
diff --git a/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/RemoveTriggerCommand.java b/jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/command/RemoveTriggerCommand.java