Remove dependency on framework-jmx-command-client (#115)

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
+- Break dependency on framework-command-client in test-utils-jmx library
 
 ## [17.4.5] - 2024-05-29
 ### Changed

framework-jmx-command-client/src/main/java/uk/gov/justice/framework/command/client/startup/ObjectFactory.java

@@ -1,10 +1,8 @@
 package uk.gov.justice.framework.command.client.startup;
 
-import uk.gov.justice.framework.command.client.CommandExecutor;
-import uk.gov.justice.framework.command.client.CommandRunModeSelector;
-import uk.gov.justice.framework.command.client.JmxParametersFactory;
-import uk.gov.justice.framework.command.client.MainApplication;
-import uk.gov.justice.framework.command.client.ReturnCodeFactory;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.HelpFormatter;
+import uk.gov.justice.framework.command.client.*;
 import uk.gov.justice.framework.command.client.cdi.producers.OptionsFactory;
 import uk.gov.justice.framework.command.client.io.CommandPrinter;
 import uk.gov.justice.framework.command.client.io.ToConsolePrinter;
@@ -14,21 +12,17 @@
 import uk.gov.justice.framework.command.client.jmx.SystemCommandInvoker;
 import uk.gov.justice.framework.command.client.util.Sleeper;
 import uk.gov.justice.framework.command.client.util.UtcClock;
-import uk.gov.justice.services.jmx.api.name.CommandMBeanNameProvider;
-import uk.gov.justice.services.jmx.api.name.ObjectNameFactory;
+import uk.gov.justice.services.jmx.system.command.client.ConnectorObjectFactory;
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClientFactory;
-import uk.gov.justice.services.jmx.system.command.client.connection.ConnectorWrapper;
-import uk.gov.justice.services.jmx.system.command.client.connection.EnvironmentFactory;
-import uk.gov.justice.services.jmx.system.command.client.connection.JMXConnectorFactory;
-import uk.gov.justice.services.jmx.system.command.client.connection.JmxUrlFactory;
-import uk.gov.justice.services.jmx.system.command.client.connection.MBeanConnector;
-import uk.gov.justice.services.jmx.system.command.client.connection.RemoteMBeanFactory;
-
-import org.apache.commons.cli.BasicParser;
-import org.apache.commons.cli.HelpFormatter;
 
 public class ObjectFactory {
 
+    private final ConnectorObjectFactory connectorObjectFactory;
+
+    public ObjectFactory() {
+        this.connectorObjectFactory = new ConnectorObjectFactory();
+    }
+
     public MainApplication mainApplication() {
 
         return new MainApplication(
@@ -77,8 +71,8 @@ public ToConsolePrinter toConsolePrinter() {
 
     public SystemCommanderClientFactory systemCommanderClientFactory() {
         return new SystemCommanderClientFactory(
-                mBeanConnector(),
-                jmxConnectorFactory()
+                connectorObjectFactory.mBeanConnector(),
+                connectorObjectFactory.jmxConnectorFactory()
         );
     }
 
@@ -118,40 +112,4 @@ public CommandRunModeSelector commandRunModeSelector() {
         return new CommandRunModeSelector();
     }
 
-    public MBeanConnector mBeanConnector() {
-        return new MBeanConnector(
-                commandMBeanNameProvider(),
-                remoteMBeanFactory());
-    }
-    public JMXConnectorFactory jmxConnectorFactory() {
-        return new JMXConnectorFactory(
-                jmxUrlFactory(),
-                connectorWrapper(),
-                environmentFactory()
-        );
-    }
-
-    public JmxUrlFactory jmxUrlFactory() {
-        return new JmxUrlFactory();
-    }
-
-    public ConnectorWrapper connectorWrapper() {
-        return new ConnectorWrapper();
-    }
-
-    public EnvironmentFactory environmentFactory() {
-        return new EnvironmentFactory();
-    }
-
-    public CommandMBeanNameProvider commandMBeanNameProvider() {
-        return new CommandMBeanNameProvider(objectNameFactory());
-    }
-
-    public ObjectNameFactory objectNameFactory() {
-        return new ObjectNameFactory();
-    }
-
-    public RemoteMBeanFactory remoteMBeanFactory() {
-        return new RemoteMBeanFactory();
-    }
 }

jmx/jmx-command-client/src/main/java/uk/gov/justice/services/jmx/system/command/client/ConnectorObjectFactory.java

@@ -0,0 +1,41 @@
+package uk.gov.justice.services.jmx.system.command.client;
+
+import uk.gov.justice.services.jmx.api.name.CommandMBeanNameProvider;
+import uk.gov.justice.services.jmx.api.name.ObjectNameFactory;
+import uk.gov.justice.services.jmx.system.command.client.connection.*;
+
+public class ConnectorObjectFactory {
+
+    public MBeanConnector mBeanConnector() {
+        return new MBeanConnector(
+                commandMBeanNameProvider(),
+                remoteMBeanFactory());
+    }
+    public JMXConnectorFactory jmxConnectorFactory() {
+        return new JMXConnectorFactory(
+                jmxUrlFactory(),
+                connectorWrapper(),
+                environmentFactory()
+        );
+    }
+
+    private JmxUrlFactory jmxUrlFactory() {
+        return new JmxUrlFactory();
+    }
+
+    private ConnectorWrapper connectorWrapper() {
+        return new ConnectorWrapper();
+    }
+
+    private EnvironmentFactory environmentFactory() {
+        return new EnvironmentFactory();
+    }
+
+    private CommandMBeanNameProvider commandMBeanNameProvider() {
+        return new CommandMBeanNameProvider(new ObjectNameFactory());
+    }
+
+    private RemoteMBeanFactory remoteMBeanFactory() {
+        return new RemoteMBeanFactory();
+    }
+}

test-utils/test-utils-jmx/pom.xml

@@ -26,11 +26,6 @@
             <artifactId>framework-management</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.services</groupId>
-            <artifactId>framework-jmx-command-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
 </project>

test-utils/test-utils-jmx/src/main/java/uk/gov/justice/services/jmx/system/command/client/TestSystemCommanderClientFactory.java

@@ -1,6 +1,5 @@
 package uk.gov.justice.services.jmx.system.command.client;
 
-import uk.gov.justice.framework.command.client.startup.ObjectFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JMXConnectorFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
 import uk.gov.justice.services.jmx.system.command.client.connection.MBeanConnector;
@@ -9,20 +8,20 @@
 
 public class TestSystemCommanderClientFactory {
 
-    private final ObjectFactory objectFactory;
+    private final ConnectorObjectFactory connectorObjectFactory;
 
     public TestSystemCommanderClientFactory() {
-        this(new ObjectFactory());
+        this(new ConnectorObjectFactory());
     }
 
-    public TestSystemCommanderClientFactory(final ObjectFactory objectFactory) {
-        this.objectFactory = objectFactory;
+    public TestSystemCommanderClientFactory(ConnectorObjectFactory connectorObjectFactory) {
+        this.connectorObjectFactory = connectorObjectFactory;
     }
 
     public SystemCommanderClient create(final JmxParameters jmxParameters) {
 
-        final JMXConnectorFactory jmxConnectorFactory = objectFactory.jmxConnectorFactory();
-        final MBeanConnector mBeanConnector = objectFactory.mBeanConnector();
+        final JMXConnectorFactory jmxConnectorFactory = connectorObjectFactory.jmxConnectorFactory();
+        final MBeanConnector mBeanConnector = connectorObjectFactory.mBeanConnector();
 
 
         final JMXConnector jmxConnector = jmxConnectorFactory.createJmxConnector(jmxParameters);

test-utils/test-utils-jmx/src/test/java/uk/gov/justice/services/jmx/system/command/client/TestSystemCommanderClientFactoryTest.java

@@ -1,29 +1,27 @@
 package uk.gov.justice.services.jmx.system.command.client;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.getValueOfField;
-
-import uk.gov.justice.framework.command.client.startup.ObjectFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.justice.services.jmx.system.command.client.connection.JMXConnectorFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
 import uk.gov.justice.services.jmx.system.command.client.connection.MBeanConnector;
 
 import javax.management.remote.JMXConnector;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.getValueOfField;
 
 @ExtendWith(MockitoExtension.class)
 public class TestSystemCommanderClientFactoryTest {
 
     @Mock
-    private ObjectFactory objectFactory;
+    private ConnectorObjectFactory connectorObjectFactory;
 
     @InjectMocks
     private TestSystemCommanderClientFactory testSystemCommanderClientFactory;
@@ -36,8 +34,8 @@ public void shouldCreateCorrectlyConfiguredInstanceOfSystemCommanderClient() thr
         final JmxParameters jmxParameters = mock(JmxParameters.class);
         final JMXConnector jmxConnector = mock(JMXConnector.class);
 
-        when(objectFactory.jmxConnectorFactory()).thenReturn(jmxConnectorFactory);
-        when(objectFactory.mBeanConnector()).thenReturn(mBeanConnector);
+        when(connectorObjectFactory.jmxConnectorFactory()).thenReturn(jmxConnectorFactory);
+        when(connectorObjectFactory.mBeanConnector()).thenReturn(mBeanConnector);
         when(jmxConnectorFactory.createJmxConnector(jmxParameters)).thenReturn(jmxConnector);
 
         final SystemCommanderClient systemCommanderClient = testSystemCommanderClientFactory.create(jmxParameters);