Add method to systemcommandmbean interface to invoke system command without supplying CommandRunMode (#116)

Co-authored-by: santhosh <santhosh.kotha@hmcts.net>

Author: santhosh-hmcts

CHANGELOG.md

@@ -4,6 +4,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 [Unreleased]
+### Changed
+- Add method to SystemCommanderMBean interface to invoke system command without supplying CommandRunMode (Used by FeatureStubber class)
 
 ## [17.4.6] - 2024-06-03
 ### Changed

jmx/jmx-api/src/main/java/uk/gov/justice/services/jmx/api/mbean/SystemCommanderMBean.java

@@ -11,6 +11,7 @@
 @MXBean
 public interface SystemCommanderMBean {
 
+    UUID call(final String systemCommandName);
     UUID call(final String systemCommandName, final CommandRunMode commandRunMode);
     UUID callWithRuntimeId(final String systemCommandName, final UUID commandRuntimeId, final CommandRunMode commandRunMode);
     List<SystemCommandDetails> listCommands();

jmx/jmx-command-handling/src/main/java/uk/gov/justice/services/jmx/api/mbean/SystemCommander.java

@@ -1,10 +1,6 @@
 package uk.gov.justice.services.jmx.api.mbean;
 
-import static java.lang.String.format;
-import static java.util.Optional.empty;
-import static java.util.Optional.of;
-import static java.util.stream.Collectors.toList;
-
+import org.slf4j.Logger;
 import uk.gov.justice.services.jmx.api.CommandNotFoundException;
 import uk.gov.justice.services.jmx.api.UnrunnableSystemCommandException;
 import uk.gov.justice.services.jmx.api.command.SystemCommand;
@@ -16,13 +12,15 @@
 import uk.gov.justice.services.jmx.runner.AsynchronousCommandRunner;
 import uk.gov.justice.services.jmx.state.observers.SystemCommandStateBean;
 
+import javax.inject.Inject;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
+import static java.lang.String.format;
+import static java.util.Optional.empty;
+import static java.util.Optional.of;
+import static java.util.stream.Collectors.toList;
 
 public class SystemCommander implements SystemCommanderMBean {
 
@@ -47,6 +45,14 @@ public class SystemCommander implements SystemCommanderMBean {
     @Inject
     private Logger logger;
 
+    @Override
+    public UUID call(final String systemCommandName) {
+        logger.info(format("Received System Command '%s'", systemCommandName));
+        logger.info(format("Running '%s' in '%s' mode", systemCommandName, CommandRunMode.FORCED));
+
+        return doCall(systemCommandName, empty(), CommandRunMode.FORCED);
+    }
+
     @Override
     public UUID call(final String systemCommandName, final CommandRunMode commandRunMode) {
         logger.info(format("Received System Command '%s'", systemCommandName));

jmx/jmx-command-handling/src/test/java/uk/gov/justice/services/jmx/api/mbean/SystemCommanderTest.java

@@ -68,6 +68,26 @@ public class SystemCommanderTest {
     @InjectMocks
     private SystemCommander systemCommander;
 
+    @Test
+    public void shouldRunTheSystemCommandInForcedModeWhenCommandRunModeNotSupplied() throws Exception {
+
+        final UUID commandId = randomUUID();
+        final TestCommand testCommand = new TestCommand();
+        final Optional<UUID> commandRuntimeId = empty();
+
+        when(systemCommandLocator.forName(testCommand.getName())).thenReturn(of(testCommand));
+        when(asynchronousCommandRunner.run(testCommand, commandRuntimeId)).thenReturn(commandId);
+
+        assertThat(systemCommander.call("TEST_COMMAND"), is(commandId));
+
+        final InOrder inOrder = inOrder(logger, systemCommandVerifier, asynchronousCommandRunner);
+
+        inOrder.verify(logger).info("Received System Command 'TEST_COMMAND'");
+        inOrder.verify(logger).info("Running 'TEST_COMMAND' in 'FORCED' mode");
+        inOrder.verify(systemCommandVerifier).verify(testCommand, commandRuntimeId);
+        inOrder.verify(asynchronousCommandRunner).run(testCommand, commandRuntimeId);
+    }
+
     @Test
     public void shouldRunTheSystemCommandIfSupported() throws Exception {