chore(citrus-rmi): review and code cleanup

pr: #1224 `citrus-rmi` module.
citrusframework · Oct 26, 2024 · bfa1315 · bfa1315
1 parent 601955a
commit bfa1315
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 47 deletions.
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java
@@ -16,14 +16,6 @@
 
 package org.citrusframework.rmi.client;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.Registry;
-import java.util.Arrays;
-
 import org.citrusframework.context.TestContext;
 import org.citrusframework.endpoint.AbstractEndpoint;
 import org.citrusframework.exceptions.CitrusRuntimeException;
@@ -46,6 +38,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.rmi.NotBoundException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.registry.Registry;
+import java.util.Arrays;
+
 /**
  * @since 2.5
  */
@@ -112,8 +112,8 @@ public void send(final Message message, TestContext context) {
             }
 
             if (logger.isDebugEnabled()) {
-                logger.debug("Sending message to RMI server: '" + binding + "'");
-                logger.debug("Message to send:\n" + message.getPayload(String.class));
+                logger.debug("Sending message to RMI server: '{}'", binding);
+                logger.debug("Message to send:\n{}", message.getPayload(String.class));
             }
             context.onOutboundMessage(message);
 
@@ -132,7 +132,7 @@ public void send(final Message message, TestContext context) {
             Message response = new DefaultMessage(payload.toString());
             correlationManager.store(correlationKey, response);
 
-            logger.info("Message was sent to RMI server: '" + binding + "'");
+            logger.info("Message was sent to RMI server: '{}'", binding);
             if (result != null) {
                 context.onInboundMessage(response);
             }
@@ -146,7 +146,7 @@ public void send(final Message message, TestContext context) {
             throw new CitrusRuntimeException("Failed to invoke method on remote target, because remote method not accessible", e);
         }
 
-        logger.info("Message was sent to RMI server: '" + binding + "'");
+        logger.info("Message was sent to RMI server: '{}'", binding);
     }
 
     @Override

diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java
@@ -16,6 +16,17 @@
 
 package org.citrusframework.rmi.server;
 
+import org.citrusframework.exceptions.CitrusRuntimeException;
+import org.citrusframework.message.Message;
+import org.citrusframework.rmi.endpoint.RmiEndpointConfiguration;
+import org.citrusframework.rmi.model.RmiServiceInvocation;
+import org.citrusframework.rmi.model.RmiServiceResult;
+import org.citrusframework.server.AbstractServer;
+import org.citrusframework.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.xml.transform.Source;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -26,17 +37,6 @@
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.List;
-import javax.xml.transform.Source;
-
-import org.citrusframework.exceptions.CitrusRuntimeException;
-import org.citrusframework.message.Message;
-import org.citrusframework.rmi.endpoint.RmiEndpointConfiguration;
-import org.citrusframework.rmi.model.RmiServiceInvocation;
-import org.citrusframework.rmi.model.RmiServiceResult;
-import org.citrusframework.server.AbstractServer;
-import org.citrusframework.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @since 2.5
@@ -78,7 +78,7 @@ public RmiServer(RmiEndpointConfiguration endpointConfiguration) {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (logger.isDebugEnabled()) {
-            logger.debug("Received message on RMI server: '" + endpointConfiguration.getBinding() + "'");
+            logger.debug("Received message on RMI server: '{}'", endpointConfiguration.getBinding());
         }
 
         Message response = getEndpointAdapter().handleMessage(endpointConfiguration.getMessageConverter()
@@ -153,15 +153,15 @@ protected void shutdown() {
             try {
                 registry.unbind(endpointConfiguration.getBinding());
             } catch (Exception e) {
-                logger.warn("Failed to unbind from registry:" + e.getMessage());
+                logger.warn("Failed to unbind from registry:{}", e.getMessage());
             }
         }
 
         if (proxy != null) {
             try {
                 UnicastRemoteObject.unexportObject(proxy, true);
             } catch (Exception e) {
-                logger.warn("Failed to unexport from remote object:" + e.getMessage());
+                logger.warn("Failed to unexport from remote object:{}", e.getMessage());
             }
         }
 

diff --git a/...ts/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java b/...ts/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java
@@ -19,14 +19,14 @@
 import org.citrusframework.annotations.CitrusTestSource;
 import org.citrusframework.common.TestLoader;
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 /**
  * @since 2.0
  */
 public class RmiDynamicEndpointIT extends TestNGCitrusSpringSupport {
 
+    @Test
     @CitrusTestSource(type = TestLoader.SPRING, name = "RmiDynamicEndpointIT")
     public void testDynamicEndpoint() {}
 }
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java
@@ -19,7 +19,6 @@
 import org.citrusframework.annotations.CitrusTestSource;
 import org.citrusframework.common.TestLoader;
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 /**

diff --git a/...oints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java b/...oints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java
@@ -25,7 +25,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;

diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java
@@ -16,15 +16,6 @@
 
 package org.citrusframework.rmi.server;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.reset;
-
-import java.io.IOException;
-import java.rmi.Remote;
-import java.rmi.registry.Registry;
-import java.util.List;
 import org.citrusframework.endpoint.EndpointAdapter;
 import org.citrusframework.message.DefaultMessage;
 import org.citrusframework.message.Message;
@@ -38,22 +29,41 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
+import java.rmi.Remote;
+import java.rmi.registry.Registry;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.reset;
+
 /**
  * @since 2.5
  */
 public class RmiServerTest extends AbstractTestNGUnitTest {
 
     @Mock
     private Registry registry;
+
     @Mock
     private EndpointAdapter endpointAdapter;
 
-    @BeforeClass
+    private AutoCloseable mockitoContext;
+
+    @BeforeMethod
     public void setup() {
-        MockitoAnnotations.openMocks(this);
+        mockitoContext = MockitoAnnotations.openMocks(this);
+    }
+
+    @AfterMethod
+    public void teardown() throws Exception {
+        mockitoContext.close();
     }
 
     @Test
@@ -82,8 +92,8 @@ public void testServiceInvocationWithArgument() throws Exception {
 
             try {
                 Assert.assertEquals(
-                    message.getPayload(String.class).replaceAll("\\s", ""),
-                    FileUtils.readToString(Resources.create("service-invocation.xml", RmiServer.class)).replaceAll("\\s", "")
+                        message.getPayload(String.class).replaceAll("\\s", ""),
+                        FileUtils.readToString(Resources.create("service-invocation.xml", RmiServer.class)).replaceAll("\\s", "")
                 );
             } catch (IOException e) {
                 Assert.fail(e.getMessage());
@@ -95,7 +105,7 @@ public void testServiceInvocationWithArgument() throws Exception {
         rmiServer.startup();
 
         try {
-            ((HelloService)remote[0]).sayHello("Hello RMI this is cool!");
+            ((HelloService) remote[0]).sayHello("Hello RMI this is cool!");
         } catch (Throwable throwable) {
             Assert.fail("Failed to invoke remote service", throwable);
         }
@@ -127,8 +137,8 @@ public void testServiceInvocationWithResult() throws Exception {
 
             try {
                 Assert.assertEquals(
-                    message.getPayload(String.class).replaceAll("\\s", ""),
-                    FileUtils.readToString(Resources.create("service-invocation-2.xml", RmiServer.class)).replaceAll("\\s", "")
+                        message.getPayload(String.class).replaceAll("\\s", ""),
+                        FileUtils.readToString(Resources.create("service-invocation-2.xml", RmiServer.class)).replaceAll("\\s", "")
                 );
             } catch (IOException e) {
                 Assert.fail(e.getMessage());
@@ -140,7 +150,7 @@ public void testServiceInvocationWithResult() throws Exception {
         rmiServer.startup();
 
         try {
-            Assert.assertEquals(((HelloService)remote[0]).getHelloCount(), 10);
+            Assert.assertEquals(((HelloService) remote[0]).getHelloCount(), 10);
         } catch (Throwable throwable) {
             Assert.fail("Failed to invoke remote service", throwable);
         }