ARTEMIS-5290 order JUnit assertEquals arguments properly

artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java

@@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java

@@ -94,7 +94,7 @@ public class DefaultSensitiveStringCodecTest {
          String decoded = codec.decode(maskedText);
          logger.debug("encoded value: {}", maskedText);
 
-         assertEquals(decoded, plainText, "decoded result not match: " + decoded);
+         assertEquals(plainText, decoded, "decoded result not match: " + decoded);
       }
 
       assertTrue(codec.verify(plainText.toCharArray(), maskedText));

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMapTest.java

@@ -52,21 +52,21 @@ public class ConcurrentLongHashMapTest {
       assertNull(map.put(2, "two"));
       assertNull(map.put(3, "three"));
 
-      assertEquals(map.size(), 3);
+      assertEquals(3, map.size());
 
-      assertEquals(map.get(1), "one");
-      assertEquals(map.size(), 3);
+      assertEquals("one", map.get(1));
+      assertEquals(3, map.size());
 
-      assertEquals(map.remove(1), "one");
-      assertEquals(map.size(), 2);
-      assertEquals(map.get(1), null);
-      assertEquals(map.get(5), null);
-      assertEquals(map.size(), 2);
+      assertEquals("one", map.remove(1));
+      assertEquals(2, map.size());
+      assertEquals(null, map.get(1));
+      assertEquals(null, map.get(5));
+      assertEquals(2, map.size());
 
       assertNull(map.put(1, "one"));
-      assertEquals(map.size(), 3);
-      assertEquals(map.put(1, "uno"), "one");
-      assertEquals(map.size(), 3);
+      assertEquals(3, map.size());
+      assertEquals("one", map.put(1, "uno"));
+      assertEquals(3, map.size());
    }
 
    @Test
@@ -103,23 +103,23 @@ public class ConcurrentLongHashMapTest {
    public void testRehashing() {
       int n = 16;
       ConcurrentLongHashMap<Integer> map = new ConcurrentLongHashMap<>(n / 2, 1);
-      assertEquals(map.capacity(), n);
-      assertEquals(map.size(), 0);
+      assertEquals(n, map.capacity());
+      assertEquals(0, map.size());
 
       for (int i = 0; i < n; i++) {
          map.put(i, i);
       }
 
-      assertEquals(map.capacity(), 2 * n);
-      assertEquals(map.size(), n);
+      assertEquals(2 * n, map.capacity());
+      assertEquals(n, map.size());
    }
 
    @Test
    public void testRehashingWithDeletes() {
       int n = 16;
       ConcurrentLongHashMap<Integer> map = new ConcurrentLongHashMap<>(n / 2, 1);
-      assertEquals(map.capacity(), n);
-      assertEquals(map.size(), 0);
+      assertEquals(n, map.capacity());
+      assertEquals(0, map.size());
 
       for (int i = 0; i < n / 2; i++) {
          map.put(i, i);
@@ -133,8 +133,8 @@ public class ConcurrentLongHashMapTest {
          map.put(i, i);
       }
 
-      assertEquals(map.capacity(), 2 * n);
-      assertEquals(map.size(), n);
+      assertEquals(2 * n, map.capacity());
+      assertEquals(n, map.size());
    }
 
    @Test
@@ -167,7 +167,7 @@ public class ConcurrentLongHashMapTest {
          future.get();
       }
 
-      assertEquals(map.size(), N * nThreads);
+      assertEquals(N * nThreads, map.size());
 
       executor.shutdown();
    }
@@ -202,7 +202,7 @@ public class ConcurrentLongHashMapTest {
          future.get();
       }
 
-      assertEquals(map.size(), N * nThreads);
+      assertEquals(N * nThreads, map.size());
 
       executor.shutdown();
    }
@@ -263,35 +263,35 @@ public class ConcurrentLongHashMapTest {
       int bucket2 = ConcurrentLongHashMap.signSafeMod(ConcurrentLongHashMap.hash(key2), Buckets);
       assertEquals(bucket1, bucket2);
 
-      assertEquals(map.put(key1, "value-1"), null);
-      assertEquals(map.put(key2, "value-2"), null);
-      assertEquals(map.size(), 2);
+      assertEquals(null, map.put(key1, "value-1"));
+      assertEquals(null, map.put(key2, "value-2"));
+      assertEquals(2, map.size());
 
-      assertEquals(map.remove(key1), "value-1");
-      assertEquals(map.size(), 1);
+      assertEquals("value-1", map.remove(key1));
+      assertEquals(1, map.size());
 
-      assertEquals(map.put(key1, "value-1-overwrite"), null);
-      assertEquals(map.size(), 2);
+      assertEquals(null, map.put(key1, "value-1-overwrite"));
+      assertEquals(2, map.size());
 
-      assertEquals(map.remove(key1), "value-1-overwrite");
-      assertEquals(map.size(), 1);
+      assertEquals("value-1-overwrite", map.remove(key1));
+      assertEquals(1, map.size());
 
-      assertEquals(map.put(key2, "value-2-overwrite"), "value-2");
-      assertEquals(map.get(key2), "value-2-overwrite");
+      assertEquals("value-2", map.put(key2, "value-2-overwrite"));
+      assertEquals("value-2-overwrite", map.get(key2));
 
-      assertEquals(map.size(), 1);
-      assertEquals(map.remove(key2), "value-2-overwrite");
+      assertEquals(1, map.size());
+      assertEquals("value-2-overwrite", map.remove(key2));
       assertTrue(map.isEmpty());
    }
 
    @Test
    public void testPutIfAbsent() {
       ConcurrentLongHashMap<String> map = new ConcurrentLongHashMap<>();
-      assertEquals(map.putIfAbsent(1, "one"), null);
-      assertEquals(map.get(1), "one");
+      assertEquals(null, map.putIfAbsent(1, "one"));
+      assertEquals("one", map.get(1));
 
-      assertEquals(map.putIfAbsent(1, "uno"), "one");
-      assertEquals(map.get(1), "one");
+      assertEquals("one", map.putIfAbsent(1, "uno"));
+      assertEquals("one", map.get(1));
    }
 
    @Test
@@ -300,17 +300,17 @@ public class ConcurrentLongHashMapTest {
       AtomicInteger counter = new AtomicInteger();
       LongFunction<Integer> provider = key -> counter.getAndIncrement();
 
-      assertEquals(map.computeIfAbsent(0, provider).intValue(), 0);
-      assertEquals(map.get(0).intValue(), 0);
+      assertEquals(0, map.computeIfAbsent(0, provider).intValue());
+      assertEquals(0, map.get(0).intValue());
 
-      assertEquals(map.computeIfAbsent(1, provider).intValue(), 1);
-      assertEquals(map.get(1).intValue(), 1);
+      assertEquals(1, map.computeIfAbsent(1, provider).intValue());
+      assertEquals(1, map.get(1).intValue());
 
-      assertEquals(map.computeIfAbsent(1, provider).intValue(), 1);
-      assertEquals(map.get(1).intValue(), 1);
+      assertEquals(1, map.computeIfAbsent(1, provider).intValue());
+      assertEquals(1, map.get(1).intValue());
 
-      assertEquals(map.computeIfAbsent(2, provider).intValue(), 2);
-      assertEquals(map.get(2).intValue(), 2);
+      assertEquals(2, map.computeIfAbsent(2, provider).intValue());
+      assertEquals(2, map.get(2).intValue());
    }
 
    int Iterations = 1;

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSetTest.java

@@ -45,21 +45,21 @@ public class ConcurrentLongHashSetTest {
       assertTrue(set.add(2));
       assertTrue(set.add(3));
 
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
 
       assertTrue(set.contains(1));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
 
       assertTrue(set.remove(1));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
       assertFalse(set.contains(1));
       assertFalse(set.contains(5));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
 
       assertTrue(set.add(1));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
       assertFalse(set.add(1));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
    }
 
    @Test
@@ -80,23 +80,23 @@ public class ConcurrentLongHashSetTest {
    public void testRehashing() {
       int n = 16;
       ConcurrentLongHashSet set = new ConcurrentLongHashSet(n / 2, 1);
-      assertEquals(set.capacity(), n);
-      assertEquals(set.size(), 0);
+      assertEquals(n, set.capacity());
+      assertEquals(0, set.size());
 
       for (int i = 0; i < n; i++) {
          set.add(i);
       }
 
-      assertEquals(set.capacity(), 2 * n);
-      assertEquals(set.size(), n);
+      assertEquals(2 * n, set.capacity());
+      assertEquals(n, set.size());
    }
 
    @Test
    public void testRehashingWithDeletes() {
       int n = 16;
       ConcurrentLongHashSet set = new ConcurrentLongHashSet(n / 2, 1);
-      assertEquals(set.capacity(), n);
-      assertEquals(set.size(), 0);
+      assertEquals(n, set.capacity());
+      assertEquals(0, set.size());
 
       for (int i = 0; i < n / 2; i++) {
          set.add(i);
@@ -110,8 +110,8 @@ public class ConcurrentLongHashSetTest {
          set.add(i);
       }
 
-      assertEquals(set.capacity(), 2 * n);
-      assertEquals(set.size(), n);
+      assertEquals(2 * n, set.capacity());
+      assertEquals(n, set.size());
    }
 
    @Test
@@ -143,7 +143,7 @@ public class ConcurrentLongHashSetTest {
          future.get();
       }
 
-      assertEquals(set.size(), N * nThreads);
+      assertEquals(N * nThreads, set.size());
 
       executor.shutdown();
    }
@@ -177,7 +177,7 @@ public class ConcurrentLongHashSetTest {
          future.get();
       }
 
-      assertEquals(map.size(), N * nThreads);
+      assertEquals(N * nThreads, map.size());
 
       executor.shutdown();
    }
@@ -223,21 +223,21 @@ public class ConcurrentLongHashSetTest {
 
       assertTrue(set.add(key1));
       assertTrue(set.add(key2));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
 
       assertTrue(set.remove(key1));
-      assertEquals(set.size(), 1);
+      assertEquals(1, set.size());
 
       assertTrue(set.add(key1));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
 
       assertTrue(set.remove(key1));
-      assertEquals(set.size(), 1);
+      assertEquals(1, set.size());
 
       assertFalse(set.add(key2));
       assertTrue(set.contains(key2));
 
-      assertEquals(set.size(), 1);
+      assertEquals(1, set.size());
       assertTrue(set.remove(key2));
       assertTrue(set.isEmpty());
    }

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java

@@ -290,7 +290,7 @@ public class LongHashSetTest {
    public void toArraySupportsEmptyCollection() {
       final Long[] result = testSet.toArray(new Long[testSet.size()]);
 
-      assertArrayEquals(result, new Long[]{});
+      assertArrayEquals(new Long[]{}, result);
    }
 
    // Test case from usage bug.
@@ -708,7 +708,7 @@ public class LongHashSetTest {
       }
 
       final String mapAsAString = "{1, 19, 11, 7, 3, 12, -2}";
-      assertEquals(testSet.toString(), mapAsAString);
+      assertEquals(mapAsAString, testSet.toString());
    }
 
    @Test

artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/PriorityCollectionTest.java

@@ -46,21 +46,21 @@ public class PriorityCollectionTest {
       assertTrue(set.add(new TestPriorityAware(2)));
       assertTrue(set.add(new TestPriorityAware(3)));
 
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
 
       assertTrue(set.contains(new TestPriorityAware(1)));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
 
       assertTrue(set.remove(new TestPriorityAware(1)));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
       assertFalse(set.contains(new TestPriorityAware(1)));
       assertFalse(set.contains(new TestPriorityAware(5)));
-      assertEquals(set.size(), 2);
+      assertEquals(2, set.size());
 
       assertTrue(set.add(new TestPriorityAware(1)));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
       assertFalse(set.add(new TestPriorityAware(1)));
-      assertEquals(set.size(), 3);
+      assertEquals(3, set.size());
    }
 
    @Test
@@ -106,7 +106,7 @@ public class PriorityCollectionTest {
          future.get();
       }
 
-      assertEquals(set.size(), N * nThreads);
+      assertEquals(N * nThreads, set.size());
 
       executor.shutdown();
    }
@@ -147,7 +147,7 @@ public class PriorityCollectionTest {
          future.get();
       }
 
-      assertEquals(set.size(), N * nThreads);
+      assertEquals(N * nThreads, set.size());
 
       executor.shutdown();
    }

artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryTest.java

@@ -375,7 +375,7 @@ public class JDBCSequentialFileFactoryTest extends ArtemisTestCase {
 
       void assertEmpty(int timeout) throws InterruptedException {
          countDownLatch.await(timeout, TimeUnit.SECONDS);
-         assertEquals(countDownLatch.getCount(), 0);
+         assertEquals(0, countDownLatch.getCount());
       }
    }
 }

artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java

@@ -222,8 +222,8 @@ public class ConnectionFactoryURITest {
       ActiveMQConnectionFactory factory = parser.newObject(new URI(sb.toString()), null);
 
       Map<String, Object> params = factory.getStaticConnectors()[0].getParams();
-      assertEquals(params.get("host"), "localhost");
-      assertEquals(params.get("port"), "3030");
+      assertEquals("localhost", params.get("host"));
+      assertEquals("3030", params.get("port"));
       for (Map.Entry<String, Object> entry : params.entrySet()) {
          if (!entry.getKey().equals("host") && !entry.getKey().equals("port")) {
             assertEquals(entry.getValue(), props.get(entry.getKey()));
@@ -405,8 +405,8 @@ public class ConnectionFactoryURITest {
 
       assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName()));
       JGroupsFileBroadcastEndpointFactory broadcastEndpointFactory = (JGroupsFileBroadcastEndpointFactory) factory.getDiscoveryGroupConfiguration().getBroadcastEndpointFactory();
-      assertEquals(broadcastEndpointFactory.getFile(), "/path/to/some/file/channel-file.xml");
-      assertEquals(broadcastEndpointFactory.getChannelName(), "channel-name");
+      assertEquals("/path/to/some/file/channel-file.xml", broadcastEndpointFactory.getFile());
+      assertEquals("channel-name", broadcastEndpointFactory.getChannelName());
    }
 
    @Test
@@ -458,12 +458,12 @@ public class ConnectionFactoryURITest {
       BroadcastEndpointFactory befc = dgc.getBroadcastEndpointFactory();
       assertNotNull(befc);
       assertTrue(befc instanceof JGroupsFileBroadcastEndpointFactory);
-      assertEquals(dgc.getName(), "foo");
-      assertEquals(dgc.getDiscoveryInitialWaitTimeout(), 5678);
-      assertEquals(dgc.getRefreshTimeout(), 12345);
+      assertEquals("foo", dgc.getName());
+      assertEquals(5678, dgc.getDiscoveryInitialWaitTimeout());
+      assertEquals(12345, dgc.getRefreshTimeout());
       JGroupsFileBroadcastEndpointFactory fileBroadcastEndpointFactory = (JGroupsFileBroadcastEndpointFactory) befc;
-      assertEquals(fileBroadcastEndpointFactory.getFile(), "channel-file.xml");
-      assertEquals(fileBroadcastEndpointFactory.getChannelName(), "channel-name");
+      assertEquals("channel-file.xml", fileBroadcastEndpointFactory.getFile());
+      assertEquals("channel-name", fileBroadcastEndpointFactory.getChannelName());
 
       BeanUtilsBean bean = new BeanUtilsBean();
       checkEquals(bean, connectionFactoryWithHA, factory);

artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java

@@ -331,7 +331,7 @@ public class AMQPMessageTest {
          decodedWithApplicationPropertiesUnmarshalled.setPaged();
       }
 
-      assertEquals(decodedWithApplicationPropertiesUnmarshalled.getStringProperty(TEST_APPLICATION_PROPERTY_KEY), TEST_APPLICATION_PROPERTY_VALUE);
+      assertEquals(TEST_APPLICATION_PROPERTY_VALUE, decodedWithApplicationPropertiesUnmarshalled.getStringProperty(TEST_APPLICATION_PROPERTY_KEY));
 
       if (paged) {
          assertEquals(decodedWithApplicationPropertiesUnmarshalled.getMemoryEstimate(), decoded.getMemoryEstimate());
@@ -1604,8 +1604,8 @@ public class AMQPMessageTest {
 
       assertProtonMessageNotEquals(protonMessage, decoded.getProtonMessage());
 
-      assertEquals(decoded.getStringProperty(TEST_APPLICATION_PROPERTY_KEY), TEST_APPLICATION_PROPERTY_VALUE);
-      assertEquals(decoded.getStringProperty("key-2"), "value-2");
+      assertEquals(TEST_APPLICATION_PROPERTY_VALUE, decoded.getStringProperty(TEST_APPLICATION_PROPERTY_KEY));
+      assertEquals("value-2", decoded.getStringProperty("key-2"));
    }
 
    @Test
@@ -1622,7 +1622,7 @@ public class AMQPMessageTest {
 
       assertProtonMessageNotEquals(protonMessage, decoded.getProtonMessage());
 
-      assertEquals(decoded.getAnnotation(TEST_ANNOTATION), "value-2");
+      assertEquals("value-2", decoded.getAnnotation(TEST_ANNOTATION));
    }
 
    //----- Test handling of message extra properties -------------------------//
@@ -2594,8 +2594,8 @@ public class AMQPMessageTest {
       Map<String, Object> map = decoded.toPropertyMap(-1);
 
       assertEquals(2, map.size());
-      assertEquals(map.get("firstString"), "firstValue");
-      assertEquals(map.get("secondLong"), 1234567L);
+      assertEquals("firstValue", map.get("firstString"));
+      assertEquals(1234567L, map.get("secondLong"));
    }
 
    @Test

artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/util/NettyReadableTest.java

@@ -381,7 +381,7 @@ public class NettyReadableTest {
       ByteBuf byteBuffer = Unpooled.wrappedBuffer(data);
       NettyReadable buffer = new NettyReadable(byteBuffer);
 
-      assertEquals(buffer.position(), 0);
+      assertEquals(0, buffer.position());
       for (int i = 0; i < data.length; i++) {
          assertEquals(buffer.position(), i);
          assertEquals(data[i], buffer.get());

artemis-server/src/test/java/org/apache/activemq/artemis/core/config/BridgeConfigurationTest.java

@@ -129,7 +129,7 @@ public class BridgeConfigurationTest {
       assertNotNull(deserializedConfiguration);
 
       // the deserialized object should return the same default values as a newly instantiated object
-      assertEquals(deserializedConfiguration, new BridgeConfiguration("name"));
+      assertEquals(new BridgeConfiguration("name"), deserializedConfiguration);
    }
 
    @Test

artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java

@@ -1880,22 +1880,22 @@ public class ConfigurationImplTest extends AbstractConfigurationTestBase {
 
       assertTrue(configuration.getStoreConfiguration() instanceof DatabaseStorageConfiguration);
       DatabaseStorageConfiguration dsc = (DatabaseStorageConfiguration) configuration.getStoreConfiguration();
-      assertEquals(dsc.getLargeMessageTableName(), "lmtn");
-      assertEquals(dsc.getMessageTableName(), "mtn");
-      assertEquals(dsc.getBindingsTableName(), "btn");
-      assertEquals(dsc.getDataSourceClassName(), "dscn");
-      assertEquals(dsc.getJdbcAllowedTimeDiff(), 123);
-      assertEquals(dsc.getJdbcConnectionUrl(), "url");
-      assertEquals(dsc.getJdbcDriverClassName(), "dcn");
-      assertEquals(dsc.getJdbcJournalSyncPeriodMillis(), 456);
-      assertEquals(dsc.getJdbcLockAcquisitionTimeoutMillis(), 789);
-      assertEquals(dsc.getJdbcLockExpirationMillis(), 321);
-      assertEquals(dsc.getJdbcLockRenewPeriodMillis(), 654);
-      assertEquals(dsc.getJdbcNetworkTimeout(), 987);
-      assertEquals(dsc.getDataSourceProperties().get("password"), "pass");
-      assertEquals(dsc.getJdbcUser(), "user");
-      assertEquals(dsc.getNodeManagerStoreTableName(), "nmtn");
-      assertEquals(dsc.getPageStoreTableName(), "pstn");
+      assertEquals("lmtn", dsc.getLargeMessageTableName());
+      assertEquals("mtn", dsc.getMessageTableName());
+      assertEquals("btn", dsc.getBindingsTableName());
+      assertEquals("dscn", dsc.getDataSourceClassName());
+      assertEquals(123, dsc.getJdbcAllowedTimeDiff());
+      assertEquals("url", dsc.getJdbcConnectionUrl());
+      assertEquals("dcn", dsc.getJdbcDriverClassName());
+      assertEquals(456, dsc.getJdbcJournalSyncPeriodMillis());
+      assertEquals(789, dsc.getJdbcLockAcquisitionTimeoutMillis());
+      assertEquals(321, dsc.getJdbcLockExpirationMillis());
+      assertEquals(654, dsc.getJdbcLockRenewPeriodMillis());
+      assertEquals(987, dsc.getJdbcNetworkTimeout());
+      assertEquals("pass", dsc.getDataSourceProperties().get("password"));
+      assertEquals("user", dsc.getJdbcUser());
+      assertEquals("nmtn", dsc.getNodeManagerStoreTableName());
+      assertEquals("pstn", dsc.getPageStoreTableName());
    }
 
    @Test

artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java

@@ -350,46 +350,46 @@ public class FileConfigurationTest extends AbstractConfigurationTestBase {
       assertEquals(6, conf.getConnectionRouters().size());
       for (ConnectionRouterConfiguration bc : conf.getConnectionRouters()) {
          if (bc.getName().equals("simple-local")) {
-            assertEquals(bc.getKeyType(), KeyType.CLIENT_ID);
+            assertEquals(KeyType.CLIENT_ID, bc.getKeyType());
             assertNotNull(bc.getLocalTargetFilter());
             assertNotNull(bc.getKeyFilter());
             assertNull(bc.getPolicyConfiguration());
          } else if (bc.getName().equals("simple-local-with-transformer")) {
-            assertEquals(bc.getKeyType(), KeyType.CLIENT_ID);
+            assertEquals(KeyType.CLIENT_ID, bc.getKeyType());
             assertNotNull(bc.getLocalTargetFilter());
             assertNotNull(bc.getKeyFilter());
             assertNotNull(bc.getPolicyConfiguration());
             assertNotNull(bc.getPolicyConfiguration().getProperties().get(ConsistentHashModuloPolicy.MODULO));
          } else if (bc.getName().equals("simple-router")) {
-            assertEquals(bc.getKeyType(), KeyType.USER_NAME);
+            assertEquals(KeyType.USER_NAME, bc.getKeyType());
             assertNull(bc.getLocalTargetFilter());
-            assertEquals(bc.getPolicyConfiguration().getName(), FirstElementPolicy.NAME);
+            assertEquals(FirstElementPolicy.NAME, bc.getPolicyConfiguration().getName());
             assertFalse(bc.getPoolConfiguration().isLocalTargetEnabled());
             assertEquals("connector1", bc.getPoolConfiguration().getStaticConnectors().get(0));
             assertNull(bc.getPoolConfiguration().getDiscoveryGroupName());
          } else if (bc.getName().equals("simple-router-connector2")) {
-            assertEquals(bc.getKeyType(), KeyType.USER_NAME);
+            assertEquals(KeyType.USER_NAME, bc.getKeyType());
             assertNull(bc.getLocalTargetFilter());
-            assertEquals(bc.getPolicyConfiguration().getName(), FirstElementPolicy.NAME);
+            assertEquals(FirstElementPolicy.NAME, bc.getPolicyConfiguration().getName());
             assertFalse(bc.getPoolConfiguration().isLocalTargetEnabled());
             assertEquals("connector2", bc.getPoolConfiguration().getStaticConnectors().get(0));
             assertNull(bc.getPoolConfiguration().getDiscoveryGroupName());
          } else if (bc.getName().equals("consistent-hash-router")) {
-            assertEquals(bc.getKeyType(), KeyType.SNI_HOST);
-            assertEquals(bc.getKeyFilter(), "^[^.]+");
-            assertEquals(bc.getLocalTargetFilter(), "DEFAULT");
-            assertEquals(bc.getPolicyConfiguration().getName(), ConsistentHashPolicy.NAME);
+            assertEquals(KeyType.SNI_HOST, bc.getKeyType());
+            assertEquals("^[^.]+", bc.getKeyFilter());
+            assertEquals("DEFAULT", bc.getLocalTargetFilter());
+            assertEquals(ConsistentHashPolicy.NAME, bc.getPolicyConfiguration().getName());
             assertEquals(1000, bc.getPoolConfiguration().getCheckPeriod());
             assertTrue(bc.getPoolConfiguration().isLocalTargetEnabled());
             assertNull(bc.getPoolConfiguration().getStaticConnectors());
             assertEquals("dg1", bc.getPoolConfiguration().getDiscoveryGroupName());
          } else {
-            assertEquals(bc.getKeyType(), KeyType.SOURCE_IP);
+            assertEquals(KeyType.SOURCE_IP, bc.getKeyType());
             assertEquals("least-connections-router", bc.getName());
             assertNotNull(bc.getCacheConfiguration());
             assertTrue(bc.getCacheConfiguration().isPersisted());
             assertEquals(60000, bc.getCacheConfiguration().getTimeout());
-            assertEquals(bc.getPolicyConfiguration().getName(), LeastConnectionsPolicy.NAME);
+            assertEquals(LeastConnectionsPolicy.NAME, bc.getPolicyConfiguration().getName());
             assertEquals(3000, bc.getPoolConfiguration().getCheckPeriod());
             assertEquals(2, bc.getPoolConfiguration().getQuorumSize());
             assertEquals(1000, bc.getPoolConfiguration().getQuorumTimeout());
@@ -448,8 +448,8 @@ public class FileConfigurationTest extends AbstractConfigurationTestBase {
       assertTrue(pc instanceof PrimaryOnlyPolicyConfiguration);
       PrimaryOnlyPolicyConfiguration lopc = (PrimaryOnlyPolicyConfiguration) pc;
       assertNotNull(lopc.getScaleDownConfiguration());
-      assertEquals(lopc.getScaleDownConfiguration().getGroupName(), "boo!");
-      assertEquals(lopc.getScaleDownConfiguration().getDiscoveryGroup(), "dg1");
+      assertEquals("boo!", lopc.getScaleDownConfiguration().getGroupName());
+      assertEquals("dg1", lopc.getScaleDownConfiguration().getDiscoveryGroup());
 
       for (ClusterConnectionConfiguration ccc : conf.getClusterConfigurations()) {
          if (ccc.getName().equals("cluster-connection3")) {
@@ -763,19 +763,19 @@ public class FileConfigurationTest extends AbstractConfigurationTestBase {
       SecuritySettingPlugin securitySettingPlugin = securitySettingPlugins.get(0);
       assertTrue(securitySettingPlugin instanceof LegacyLDAPSecuritySettingPlugin);
       LegacyLDAPSecuritySettingPlugin legacyLDAPSecuritySettingPlugin = (LegacyLDAPSecuritySettingPlugin) securitySettingPlugin;
-      assertEquals(legacyLDAPSecuritySettingPlugin.getInitialContextFactory(), "testInitialContextFactory");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getConnectionURL(), "testConnectionURL");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getConnectionUsername(), "testConnectionUsername");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getConnectionPassword(), "testConnectionPassword");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getConnectionProtocol(), "testConnectionProtocol");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getAuthentication(), "testAuthentication");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getDestinationBase(), "testDestinationBase");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getFilter(), "testFilter");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getRoleAttribute(), "testRoleAttribute");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getAdminPermissionValue(), "testAdminPermissionValue");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getReadPermissionValue(), "testReadPermissionValue");
-      assertEquals(legacyLDAPSecuritySettingPlugin.getWritePermissionValue(), "testWritePermissionValue");
-      assertEquals(legacyLDAPSecuritySettingPlugin.isEnableListener(), false);
+      assertEquals("testInitialContextFactory", legacyLDAPSecuritySettingPlugin.getInitialContextFactory());
+      assertEquals("testConnectionURL", legacyLDAPSecuritySettingPlugin.getConnectionURL());
+      assertEquals("testConnectionUsername", legacyLDAPSecuritySettingPlugin.getConnectionUsername());
+      assertEquals("testConnectionPassword", legacyLDAPSecuritySettingPlugin.getConnectionPassword());
+      assertEquals("testConnectionProtocol", legacyLDAPSecuritySettingPlugin.getConnectionProtocol());
+      assertEquals("testAuthentication", legacyLDAPSecuritySettingPlugin.getAuthentication());
+      assertEquals("testDestinationBase", legacyLDAPSecuritySettingPlugin.getDestinationBase());
+      assertEquals("testFilter", legacyLDAPSecuritySettingPlugin.getFilter());
+      assertEquals("testRoleAttribute", legacyLDAPSecuritySettingPlugin.getRoleAttribute());
+      assertEquals("testAdminPermissionValue", legacyLDAPSecuritySettingPlugin.getAdminPermissionValue());
+      assertEquals("testReadPermissionValue", legacyLDAPSecuritySettingPlugin.getReadPermissionValue());
+      assertEquals("testWritePermissionValue", legacyLDAPSecuritySettingPlugin.getWritePermissionValue());
+      assertEquals(false, legacyLDAPSecuritySettingPlugin.isEnableListener());
    }
 
    @TestTemplate

artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java

@@ -99,11 +99,11 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          PrimaryOnlyPolicy primaryOnlyPolicy = (PrimaryOnlyPolicy) haPolicy;
          ScaleDownPolicy scaleDownPolicy = primaryOnlyPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), "wahey");
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals("wahey", scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 0);
+         assertEquals(0, connectors.size());
       } finally {
          server.stop();
       }
@@ -123,11 +123,11 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          ScaleDownPolicy scaleDownPolicy = primaryOnlyPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
          assertFalse(scaleDownPolicy.isEnabled());
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), null);
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals(null, scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 2);
+         assertEquals(2, connectors.size());
          assertTrue(connectors.contains("sd-connector1"));
          assertTrue(connectors.contains("sd-connector2"));
       } finally {
@@ -435,12 +435,12 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          HAPolicy haPolicy = server.getHAPolicy();
          assertTrue(haPolicy instanceof ReplicatedPolicy);
          ReplicatedPolicy replicatedPolicy = (ReplicatedPolicy) haPolicy;
-         assertEquals(replicatedPolicy.getGroupName(), "purple");
+         assertEquals("purple", replicatedPolicy.getGroupName());
          assertTrue(replicatedPolicy.isCheckForPrimaryServer());
-         assertEquals(replicatedPolicy.getClusterName(), "abcdefg");
-         assertEquals(replicatedPolicy.getInitialReplicationSyncTimeout(), 9876);
-         assertEquals(replicatedPolicy.getRetryReplicationWait(), 12345);
-         assertEquals(replicatedPolicy.getMaxSavedReplicatedJournalsSize(), 73);
+         assertEquals("abcdefg", replicatedPolicy.getClusterName());
+         assertEquals(9876, replicatedPolicy.getInitialReplicationSyncTimeout());
+         assertEquals(12345, replicatedPolicy.getRetryReplicationWait());
+         assertEquals(73, replicatedPolicy.getMaxSavedReplicatedJournalsSize());
       } finally {
          server.stop();
       }
@@ -457,20 +457,20 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          HAPolicy haPolicy = server.getHAPolicy();
          assertTrue(haPolicy instanceof ReplicaPolicy);
          ReplicaPolicy replicaPolicy = (ReplicaPolicy) haPolicy;
-         assertEquals(replicaPolicy.getGroupName(), "tiddles");
-         assertEquals(replicaPolicy.getMaxSavedReplicatedJournalsSize(), 22);
-         assertEquals(replicaPolicy.getClusterName(), "33rrrrr");
+         assertEquals("tiddles", replicaPolicy.getGroupName());
+         assertEquals(22, replicaPolicy.getMaxSavedReplicatedJournalsSize());
+         assertEquals("33rrrrr", replicaPolicy.getClusterName());
          assertFalse(replicaPolicy.isRestartBackup());
          assertTrue(replicaPolicy.isAllowFailback());
-         assertEquals(replicaPolicy.getInitialReplicationSyncTimeout(), 9876);
-         assertEquals(replicaPolicy.getRetryReplicationWait(), 12345);
+         assertEquals(9876, replicaPolicy.getInitialReplicationSyncTimeout());
+         assertEquals(12345, replicaPolicy.getRetryReplicationWait());
          ScaleDownPolicy scaleDownPolicy = replicaPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), "wahey");
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals("wahey", scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 0);
+         assertEquals(0, connectors.size());
       } finally {
          server.stop();
       }
@@ -487,17 +487,17 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          HAPolicy haPolicy = server.getHAPolicy();
          assertTrue(haPolicy instanceof ReplicaPolicy);
          ReplicaPolicy replicaPolicy = (ReplicaPolicy) haPolicy;
-         assertEquals(replicaPolicy.getGroupName(), "tiddles");
-         assertEquals(replicaPolicy.getMaxSavedReplicatedJournalsSize(), 22);
-         assertEquals(replicaPolicy.getClusterName(), "33rrrrr");
+         assertEquals("tiddles", replicaPolicy.getGroupName());
+         assertEquals(22, replicaPolicy.getMaxSavedReplicatedJournalsSize());
+         assertEquals("33rrrrr", replicaPolicy.getClusterName());
          assertFalse(replicaPolicy.isRestartBackup());
          ScaleDownPolicy scaleDownPolicy = replicaPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), null);
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals(null, scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 2);
+         assertEquals(2, connectors.size());
          assertTrue(connectors.contains("sd-connector1"));
          assertTrue(connectors.contains("sd-connector2"));
       } finally {
@@ -516,9 +516,9 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          HAPolicy haPolicy = server.getHAPolicy();
          assertTrue(haPolicy instanceof ReplicaPolicy);
          ReplicaPolicy replicaPolicy = (ReplicaPolicy) haPolicy;
-         assertEquals(replicaPolicy.getGroupName(), "tiddles");
-         assertEquals(replicaPolicy.getMaxSavedReplicatedJournalsSize(), 22);
-         assertEquals(replicaPolicy.getClusterName(), "33rrrrr");
+         assertEquals("tiddles", replicaPolicy.getGroupName());
+         assertEquals(22, replicaPolicy.getMaxSavedReplicatedJournalsSize());
+         assertEquals("33rrrrr", replicaPolicy.getClusterName());
          assertFalse(replicaPolicy.isRestartBackup());
          ScaleDownPolicy scaleDownPolicy = replicaPolicy.getScaleDownPolicy();
          assertNull(scaleDownPolicy);
@@ -559,11 +559,11 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          assertFalse(sharedStoreBackupPolicy.isRestartBackup());
          ScaleDownPolicy scaleDownPolicy = sharedStoreBackupPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), "wahey");
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals("wahey", scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 0);
+         assertEquals(0, connectors.size());
       } finally {
          server.stop();
       }
@@ -584,11 +584,11 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          assertTrue(sharedStoreBackupPolicy.isRestartBackup());
          ScaleDownPolicy scaleDownPolicy = sharedStoreBackupPolicy.getScaleDownPolicy();
          assertNotNull(scaleDownPolicy);
-         assertEquals(scaleDownPolicy.getGroupName(), "boo!");
-         assertEquals(scaleDownPolicy.getDiscoveryGroup(), null);
+         assertEquals("boo!", scaleDownPolicy.getGroupName());
+         assertEquals(null, scaleDownPolicy.getDiscoveryGroup());
          List<String> connectors = scaleDownPolicy.getConnectors();
          assertNotNull(connectors);
-         assertEquals(connectors.size(), 2);
+         assertEquals(2, connectors.size());
          assertTrue(connectors.contains("sd-connector1"));
          assertTrue(connectors.contains("sd-connector2"));
       } finally {
@@ -630,14 +630,14 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          ReplicatedPolicy primaryPolicy = (ReplicatedPolicy) colocatedPolicy.getPrimaryPolicy();
          assertNotNull(primaryPolicy);
 
-         assertEquals(primaryPolicy.getGroupName(), "purple");
+         assertEquals("purple", primaryPolicy.getGroupName());
          assertTrue(primaryPolicy.isCheckForPrimaryServer());
-         assertEquals(primaryPolicy.getClusterName(), "abcdefg");
+         assertEquals("abcdefg", primaryPolicy.getClusterName());
          ReplicaPolicy backupPolicy = (ReplicaPolicy) colocatedPolicy.getBackupPolicy();
          assertNotNull(backupPolicy);
-         assertEquals(backupPolicy.getGroupName(), "tiddles");
-         assertEquals(backupPolicy.getMaxSavedReplicatedJournalsSize(), 22);
-         assertEquals(backupPolicy.getClusterName(), "33rrrrr");
+         assertEquals("tiddles", backupPolicy.getGroupName());
+         assertEquals(22, backupPolicy.getMaxSavedReplicatedJournalsSize());
+         assertEquals("33rrrrr", backupPolicy.getClusterName());
          assertFalse(backupPolicy.isRestartBackup());
       } finally {
          server.stop();
@@ -658,11 +658,11 @@ public class HAPolicyConfigurationTest extends ServerTestBase {
          ReplicatedPolicy primaryPolicy = (ReplicatedPolicy) colocatedPolicy.getPrimaryPolicy();
          assertNotNull(primaryPolicy);
 
-         assertEquals(primaryPolicy.getGroupName(), "purple");
+         assertEquals("purple", primaryPolicy.getGroupName());
          assertEquals(primaryPolicy.getGroupName(), primaryPolicy.getBackupGroupName());
          assertEquals(primaryPolicy.getBackupGroupName(), haPolicy.getBackupGroupName());
          assertTrue(primaryPolicy.isCheckForPrimaryServer());
-         assertEquals(primaryPolicy.getClusterName(), "abcdefg");
+         assertEquals("abcdefg", primaryPolicy.getClusterName());
          ReplicaPolicy backupPolicy = (ReplicaPolicy) colocatedPolicy.getBackupPolicy();
          assertNotNull(backupPolicy);
       } finally {

artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPLoginModuleMaskPasswordTest.java

@@ -90,7 +90,7 @@ public class LDAPLoginModuleMaskPasswordTest extends AbstractLdapTestUnit {
       try {
          context.login();
       } catch (FailedLoginException le) {
-         assertEquals(le.getMessage(), "Password does not match for user: first");
+         assertEquals("Password does not match for user: first", le.getMessage());
          return;
       }
       fail("Should have failed authenticating");
@@ -148,7 +148,7 @@ public class LDAPLoginModuleMaskPasswordTest extends AbstractLdapTestUnit {
       try {
          context.login();
       } catch (FailedLoginException le) {
-         assertEquals(le.getMessage(), "Password does not match for user: first");
+         assertEquals("Password does not match for user: first", le.getMessage());
          return;
       }
       fail("Should have failed authenticating");

artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/JMXAccessControlListTest.java

@@ -94,7 +94,7 @@ public class JMXAccessControlListTest {
       JMXAccessControlList controlList = new JMXAccessControlList();
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "admin");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:*"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -103,7 +103,7 @@ public class JMXAccessControlListTest {
       controlList.addToRoleAccess("org.myDomain", "type=foo", "listSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:type=foo"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -112,7 +112,7 @@ public class JMXAccessControlListTest {
       controlList.addToRoleAccess("org.myDomain", "type=foo", "listSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:type=\"foo\""), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -121,7 +121,7 @@ public class JMXAccessControlListTest {
       controlList.addToRoleAccess("org.myDomain", "type=*", "listSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:type=foo"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -131,10 +131,10 @@ public class JMXAccessControlListTest {
       controlList.addToRoleAccess("org.myDomain", "type=bar*", "listSomething", "browse");
       controlList.addToRoleAccess("org.myDomain", "type=foo.bar*", "listSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "view");
-      assertArrayEquals(controlList.getRolesForObject(new ObjectName("org.myDomain:type=foo.bar.test"),
-         "listSomething").toArray(), new String[]{"admin"});
-      assertArrayEquals(controlList.getRolesForObject(new ObjectName("org.myDomain:type=bar.test"),
-         "listSomething").toArray(), new String[]{"browse"});
+      assertArrayEquals(new String[]{"admin"}, controlList.getRolesForObject(new ObjectName("org.myDomain:type=foo.bar.test"),
+                                                                             "listSomething").toArray());
+      assertArrayEquals(new String[]{"browse"}, controlList.getRolesForObject(new ObjectName("org.myDomain:type=bar.test"),
+                                                                              "listSomething").toArray());
    }
 
    @Test
@@ -142,7 +142,7 @@ public class JMXAccessControlListTest {
       JMXAccessControlList controlList = new JMXAccessControlList();
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "admin", "view", "update");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:*"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin", "view", "update"});
+      assertArrayEquals(new String[]{"admin", "view", "update"}, roles.toArray());
    }
 
    @Test
@@ -150,7 +150,7 @@ public class JMXAccessControlListTest {
       JMXAccessControlList controlList = new JMXAccessControlList();
       controlList.addToRoleAccess("org.myDomain", null, "list*", "admin");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:*"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -159,9 +159,9 @@ public class JMXAccessControlListTest {
       controlList.addToRoleAccess("org.myDomain", null, "listSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "list*", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain:*"), "listSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
       roles = controlList.getRolesForObject(new ObjectName("org.myDomain:*"), "listSomethingMore");
-      assertArrayEquals(roles.toArray(), new String[]{"view"});
+      assertArrayEquals(new String[]{"view"}, roles.toArray());
    }
 
    @Test
@@ -170,7 +170,7 @@ public class JMXAccessControlListTest {
       controlList.addToDefaultAccess("setSomething", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "list*", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:*"), "setSomething");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -180,7 +180,7 @@ public class JMXAccessControlListTest {
       controlList.addToDefaultAccess("set*", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "list*", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:*"), "setSomethingMore");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -190,7 +190,7 @@ public class JMXAccessControlListTest {
       controlList.addToDefaultAccess("*", "admin");
       controlList.addToRoleAccess("org.myDomain", null, "list*", "view");
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:*"), "setSomethingMore");
-      assertArrayEquals(roles.toArray(), new String[]{"admin"});
+      assertArrayEquals(new String[]{"admin"}, roles.toArray());
    }
 
    @Test
@@ -204,31 +204,31 @@ public class JMXAccessControlListTest {
 
       List<String> roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:foo=bar"), "listFoo");
       assertNotNull(roles);
-      assertEquals(roles.size(), 2);
-      assertEquals(roles.get(0), "amq");
-      assertEquals(roles.get(1), "monitor");
+      assertEquals(2, roles.size());
+      assertEquals("amq", roles.get(0));
+      assertEquals("monitor", roles.get(1));
 
       roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:foo=bar"), "getFoo");
       assertNotNull(roles);
-      assertEquals(roles.size(), 2);
-      assertEquals(roles.get(0), "amq");
-      assertEquals(roles.get(1), "monitor");
+      assertEquals(2, roles.size());
+      assertEquals("amq", roles.get(0));
+      assertEquals("monitor", roles.get(1));
 
       roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:foo=bar"), "isFoo");
       assertNotNull(roles);
-      assertEquals(roles.size(), 2);
-      assertEquals(roles.get(0), "amq");
-      assertEquals(roles.get(1), "monitor");
+      assertEquals(2, roles.size());
+      assertEquals("amq", roles.get(0));
+      assertEquals("monitor", roles.get(1));
 
       roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:foo=bar"), "setFoo");
       assertNotNull(roles);
-      assertEquals(roles.size(), 1);
-      assertEquals(roles.get(0), "amq");
+      assertEquals(1, roles.size());
+      assertEquals("amq", roles.get(0));
 
       roles = controlList.getRolesForObject(new ObjectName("org.myDomain.foo:foo=bar"), "createFoo");
       assertNotNull(roles);
-      assertEquals(roles.size(), 1);
-      assertEquals(roles.get(0), "amq");
+      assertEquals(1, roles.size());
+      assertEquals("amq", roles.get(0));
 
    }
 }

artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java

@@ -42,7 +42,7 @@ public class AddressSettingsTest extends ServerTestBase {
       assertNull(addressSettings.getDeadLetterAddress());
       assertNull(addressSettings.getExpiryAddress());
       assertEquals(AddressSettings.DEFAULT_MAX_DELIVERY_ATTEMPTS, addressSettings.getMaxDeliveryAttempts());
-      assertEquals(addressSettings.getMaxSizeBytes(), AddressSettings.DEFAULT_MAX_SIZE_BYTES);
+      assertEquals(AddressSettings.DEFAULT_MAX_SIZE_BYTES, addressSettings.getMaxSizeBytes());
       assertEquals(AddressSettings.DEFAULT_PAGE_SIZE, addressSettings.getPageSizeBytes());
       assertEquals(AddressSettings.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT, addressSettings.getMessageCounterHistoryDayLimit());
       assertEquals(AddressSettings.DEFAULT_REDELIVER_DELAY, addressSettings.getRedeliveryDelay());
@@ -104,14 +104,14 @@ public class AddressSettingsTest extends ServerTestBase {
       }
       assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
       assertEquals(addressSettings.getExpiryAddress(), exp);
-      assertEquals(addressSettings.getMaxDeliveryAttempts(), 1000);
-      assertEquals(addressSettings.getMaxSizeBytes(), 1001);
-      assertEquals(addressSettings.getMaxSizeMessages(), 101);
-      assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 1002);
-      assertEquals(addressSettings.getRedeliveryDelay(), 1003);
-      assertEquals(addressSettings.getPageSizeBytes(), 1004);
+      assertEquals(1000, addressSettings.getMaxDeliveryAttempts());
+      assertEquals(1001, addressSettings.getMaxSizeBytes());
+      assertEquals(101, addressSettings.getMaxSizeMessages());
+      assertEquals(1002, addressSettings.getMessageCounterHistoryDayLimit());
+      assertEquals(1003, addressSettings.getRedeliveryDelay());
+      assertEquals(1004, addressSettings.getPageSizeBytes());
       assertEquals(AddressFullMessagePolicy.DROP, addressSettings.getAddressFullMessagePolicy());
-      assertEquals(addressSettings.getMaxSizeBytesRejectThreshold(), 10 * 1024);
+      assertEquals(10 * 1024, addressSettings.getMaxSizeBytesRejectThreshold());
       assertEquals(DeletionPolicy.FORCE, addressSettings.getConfigDeleteDiverts());
       assertEquals(Long.valueOf(999), addressSettings.getExpiryDelay());
       assertEquals(Long.valueOf(888), addressSettings.getMinExpiryDelay());
@@ -164,13 +164,13 @@ public class AddressSettingsTest extends ServerTestBase {
 
       assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
       assertEquals(addressSettings.getExpiryAddress(), exp);
-      assertEquals(addressSettings.getMaxDeliveryAttempts(), 1000);
-      assertEquals(addressSettings.getMaxSizeBytes(), 1001);
-      assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 1002);
-      assertEquals(addressSettings.getRedeliveryDelay(), 2003);
-      assertEquals(addressSettings.getRedeliveryMultiplier(), 2.5, 0.000001);
+      assertEquals(1000, addressSettings.getMaxDeliveryAttempts());
+      assertEquals(1001, addressSettings.getMaxSizeBytes());
+      assertEquals(1002, addressSettings.getMessageCounterHistoryDayLimit());
+      assertEquals(2003, addressSettings.getRedeliveryDelay());
+      assertEquals(2.5, addressSettings.getRedeliveryMultiplier(), 0.000001);
       assertEquals(AddressFullMessagePolicy.DROP, addressSettings.getAddressFullMessagePolicy());
-      assertEquals(addressSettings.getMaxSizeBytesRejectThreshold(), 10 * 1024);
+      assertEquals(10 * 1024, addressSettings.getMaxSizeBytesRejectThreshold());
       assertTrue(addressSettings.isNoExpiry());
    }
 
@@ -221,12 +221,12 @@ public class AddressSettingsTest extends ServerTestBase {
 
       assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
       assertEquals(addressSettings.getExpiryAddress(), exp);
-      assertEquals(addressSettings.getMaxDeliveryAttempts(), 2000);
-      assertEquals(addressSettings.getMaxSizeBytes(), 1001);
-      assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 2002);
-      assertEquals(addressSettings.getRedeliveryDelay(), 1003);
-      assertEquals(addressSettings.getRedeliveryMultiplier(), 1.0, 0.000001);
-      assertEquals(addressSettings.getMaxRedeliveryDelay(), 5000);
+      assertEquals(2000, addressSettings.getMaxDeliveryAttempts());
+      assertEquals(1001, addressSettings.getMaxSizeBytes());
+      assertEquals(2002, addressSettings.getMessageCounterHistoryDayLimit());
+      assertEquals(1003, addressSettings.getRedeliveryDelay());
+      assertEquals(1.0, addressSettings.getRedeliveryMultiplier(), 0.000001);
+      assertEquals(5000, addressSettings.getMaxRedeliveryDelay());
       assertEquals(AddressFullMessagePolicy.DROP, addressSettings.getAddressFullMessagePolicy());
    }
 

artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java

@@ -53,7 +53,7 @@ public class RepositoryTest extends ServerTestBase {
       securityRepository.setDefault(new HashSet<>());
       Set<Role> roles = securityRepository.getMatch("queues.something");
 
-      assertEquals(roles.size(), 0);
+      assertEquals(0, roles.size());
    }
 
    @Test
@@ -178,7 +178,7 @@ public class RepositoryTest extends ServerTestBase {
    public void testSingleMatch() {
       securityRepository.addMatch("queues.*", new HashSet<>());
       Set<Role> hashSet = securityRepository.getMatch("queues.something");
-      assertEquals(hashSet.size(), 0);
+      assertEquals(0, hashSet.size());
    }
 
    @Test
@@ -195,7 +195,7 @@ public class RepositoryTest extends ServerTestBase {
       securityRepository.addMatch("queues.another.andanother", roles2);
 
       Set<Role> hashSet = securityRepository.getMatch("queues.another.andanother");
-      assertEquals(hashSet.size(), 3);
+      assertEquals(3, hashSet.size());
    }
 
    @Test
@@ -206,7 +206,7 @@ public class RepositoryTest extends ServerTestBase {
       roles.add(new Role("test2", true, true, true, true, true, true, true, true, true, true, false, false));
       securityRepository.addMatch("queues.2.aq", roles);
       Set<Role> hashSet = securityRepository.getMatch("queues.2.aq");
-      assertEquals(hashSet.size(), 2);
+      assertEquals(2, hashSet.size());
    }
 
    @Test

artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java

@@ -161,7 +161,7 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
       try {
          context.login();
       } catch (LoginException le) {
-         assertEquals(le.getCause().getMessage(), "Empty password is not allowed");
+         assertEquals("Empty password is not allowed", le.getCause().getMessage());
          return;
       }
       fail("Should have failed authenticating");

artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java

@@ -273,7 +273,7 @@ public class SimpleStringTest {
       SimpleString s = createSimpleString("abcdefghi");
       SimpleString[] strings = s.split('.');
       assertNotNull(strings);
-      assertEquals(strings.length, 1);
+      assertEquals(1, strings.length);
       assertEquals(strings[0], s);
    }
 
@@ -282,7 +282,7 @@ public class SimpleStringTest {
       SimpleString s = createSimpleString("abcd.efghi");
       SimpleString[] strings = s.split('.');
       assertNotNull(strings);
-      assertEquals(strings.length, 2);
+      assertEquals(2, strings.length);
       assertEquals(strings[0], createSimpleString("abcd"));
       assertEquals(strings[1], createSimpleString("efghi"));
    }
@@ -292,7 +292,7 @@ public class SimpleStringTest {
       SimpleString s = createSimpleString("abcd.efghi.jklmn.opqrs.tuvw.xyz");
       SimpleString[] strings = s.split('.');
       assertNotNull(strings);
-      assertEquals(strings.length, 6);
+      assertEquals(6, strings.length);
       assertEquals(strings[0], createSimpleString("abcd"));
       assertEquals(strings[1], createSimpleString("efghi"));
       assertEquals(strings[2], createSimpleString("jklmn"));

artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java

@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.artemis.service.extensions.tests.transactions;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import org.apache.activemq.artemis.service.extensions.ServiceUtils;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class TransactionManagerLocatorTest {
 
    @Test

artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java

@@ -185,7 +185,7 @@ public class WebServerComponentTest extends ArtemisTestCase {
       if (useCustomizer) {
          assertEquals(1, TestCustomizer.count);
       }
-      assertEquals(clientHandler.body.toString(), "12345");
+      assertEquals("12345", clientHandler.body.toString());
       assertNull(clientHandler.serverHeader);
       // Wait for the server to close the connection.
       ch.close();
@@ -832,7 +832,7 @@ public class WebServerComponentTest extends ArtemisTestCase {
 
       File tmpDir = ctxt.getTempDirectory();
       assertTrue(tmpDir.getParentFile().listFiles().length == 1);
-      assertEquals(tmpDir.getName(), warName);
+      assertEquals(warName, tmpDir.getName());
       assertTrue(webServerComponent.isStarted());
 
       webServerComponent.stop(true);

tests/db-tests/src/test/java/org/apache/activemq/artemis/tests/db/paging/PagingTest.java

@@ -6480,7 +6480,7 @@ public class PagingTest extends ParameterDBTestBase {
       if (rollbackBeforeDelivery) {
          sendMessages(session, producer, numberOfMessages);
          session.rollback();
-         assertEquals(server.getPagingManager().getTransactions().size(), 1);
+         assertEquals(1, server.getPagingManager().getTransactions().size());
          PageTransactionInfo pageTransactionInfo = server.getPagingManager().getTransactions().values().iterator().next();
          // Make sure rollback happens before delivering messages
          Wait.assertTrue(() -> pageTransactionInfo.isRollback(), 1000, 100);
@@ -6493,7 +6493,7 @@ public class PagingTest extends ParameterDBTestBase {
          session.start();
          sendMessages(session, producer, numberOfMessages);
          assertNull(consumer.receiveImmediate());
-         assertEquals(server.getPagingManager().getTransactions().size(), 1);
+         assertEquals(1, server.getPagingManager().getTransactions().size());
          PageTransactionInfo pageTransactionInfo = server.getPagingManager().getTransactions().values().iterator().next();
          session.rollback();
          Wait.assertTrue(() -> pageTransactionInfo.isRollback(), 1000, 100);

tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/web/WebServerComponentTest.java

@@ -121,7 +121,7 @@ public class WebServerComponentTest {
       ch.writeAndFlush(request);
       assertTrue(latch.await(5, TimeUnit.SECONDS));
       assertEquals("12345", clientHandler.body.toString());
-      assertEquals(clientHandler.body.toString(), "12345");
+      assertEquals("12345", clientHandler.body.toString());
       assertNull(clientHandler.serverHeader);
       // Wait for the server to close the connection.
       ch.close();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpManagementTest.java

@@ -97,22 +97,22 @@ public class AmqpManagementTest extends AmqpClientTestSupport {
       Map<String, Object> map = new LinkedHashMap<>();
       map.put("sequence", new UnsignedInteger(sequence));
       CoreMapMessageWrapper msg = createMapMessage(1, map, null);
-      assertEquals(msg.getInt("sequence"), sequence);
+      assertEquals(sequence, msg.getInt("sequence"));
 
       map.clear();
       map.put("sequence", new UnsignedLong(sequence));
       msg = createMapMessage(1, map, null);
-      assertEquals(msg.getLong("sequence"), sequence);
+      assertEquals(sequence, msg.getLong("sequence"));
 
       map.clear();
       map.put("sequence", new UnsignedShort((short)sequence));
       msg = createMapMessage(1, map, null);
-      assertEquals(msg.getShort("sequence"), sequence);
+      assertEquals(sequence, msg.getShort("sequence"));
 
       map.clear();
       map.put("sequence", new UnsignedByte((byte) sequence));
       msg = createMapMessage(1, map, null);
-      assertEquals(msg.getByte("sequence"), sequence);
+      assertEquals(sequence, msg.getByte("sequence"));
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveInterceptorTest.java

@@ -86,7 +86,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
       receiver.flow(2);
       AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(amqpMessage);
-      assertEquals(latch2.getCount(), 0);
+      assertEquals(0, latch2.getCount());
       sender.close();
       receiver.close();
       connection.close();
@@ -155,7 +155,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
       receiver.flow(2);
       AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNull(amqpMessage);
-      assertEquals(latch.getCount(), 0);
+      assertEquals(0, latch.getCount());
       sender.close();
       receiver.close();
       connection.close();
@@ -252,7 +252,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
       receiver.flow(2);
       AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(amqpMessage);
-      assertEquals(latch2.getCount(), 0);
+      assertEquals(0, latch2.getCount());
       sender.close();
       receiver.close();
       connection.close();
@@ -298,7 +298,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
       receiver.flow(2);
       AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(amqpMessage);
-      assertEquals(latch2.getCount(), 0);
+      assertEquals(0, latch2.getCount());
       assertTrue(passed[0], "connection not set");
       sender.close();
       receiver.close();
@@ -367,7 +367,7 @@ public class AmqpSendReceiveInterceptorTest extends AmqpClientTestSupport {
 
       final AmqpMessage amqpMessage = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(amqpMessage);
-      assertEquals(departed.getCount(), 0);
+      assertEquals(0, departed.getCount());
       assertTrue(propertyFoundOnDispatch.get());
       assertNotNull(amqpMessage.getApplicationProperty(BYTE_PROPERTY_KEY));
       assertTrue(amqpMessage.getApplicationProperty(BYTE_PROPERTY_KEY) instanceof Binary);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java

@@ -99,7 +99,7 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport {
          TextMessage m = (TextMessage) messageConsumer.receive(5000);
          assertNotNull(m);
          assertEquals("msg:1", m.getText());
-         assertEquals(m.getStringProperty("color"), "RED");
+         assertEquals("RED", m.getStringProperty("color"));
       } finally {
          connection.close();
       }
@@ -450,10 +450,10 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport {
       MessageConsumer consumer2 = session.createConsumer(queue);
       TextMessage answer = (TextMessage) consumer1.receive(5000);
       assertNotNull(answer);
-      assertEquals(answer.getText(), "Msg1", "Should have received a message!");
+      assertEquals("Msg1", answer.getText(), "Should have received a message!");
       answer = (TextMessage) consumer2.receive(5000);
       assertNotNull(answer);
-      assertEquals(answer.getText(), "Msg2", "Should have received a message!");
+      assertEquals("Msg2", answer.getText(), "Should have received a message!");
 
       answer = (TextMessage) consumer2.receiveNoWait();
       assertNull(answer, "Should have not received a message!");

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java

@@ -149,9 +149,9 @@ public class AutogroupIdTest extends ActiveMQTestBase {
 
       session.close();
 
-      assertEquals(myMessageHandler.messagesReceived, 100);
-      assertEquals(myMessageHandler2.messagesReceived, 100);
-      assertEquals(myMessageHandler3.messagesReceived, 0);
+      assertEquals(100, myMessageHandler.messagesReceived);
+      assertEquals(100, myMessageHandler2.messagesReceived);
+      assertEquals(0, myMessageHandler3.messagesReceived);
    }
 
    /*

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java

@@ -75,7 +75,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       m = clientConsumer.receiveImmediate();
@@ -86,7 +86,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       assertNotNull(m);
       assertEquals("q1", m.getStringProperty(Message.HDR_ORIGINAL_QUEUE));
       assertEquals("ad1", m.getStringProperty(Message.HDR_ORIGINAL_ADDRESS));
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -144,7 +144,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       m = clientConsumer.receiveImmediate();
@@ -170,14 +170,14 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(5000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       clientSession.start();
       m = clientConsumer.receive(5000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       m = clientConsumer.receiveImmediate();
@@ -186,7 +186,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(dlq);
       m = clientConsumer.receive(5000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -206,11 +206,11 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       clientConsumer.setMessageHandler(handler);
       clientSession.start();
       assertTrue(latch.await(5, TimeUnit.SECONDS));
-      assertEquals(handler.count, 2);
+      assertEquals(2, handler.count);
       clientConsumer = clientSession.createConsumer(dlq);
       Message m = clientConsumer.receive(5000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    class TestHandler implements MessageHandler {
@@ -256,7 +256,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       m = clientConsumer.receiveImmediate();
@@ -266,13 +266,13 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       m = clientConsumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       clientConsumer.close();
       clientConsumer = clientSession.createConsumer(dlq2);
       m = clientConsumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       clientConsumer.close();
    }
 
@@ -289,7 +289,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       // force a cancel
       clientSession.rollback();
       m = clientConsumer.receiveImmediate();
@@ -408,7 +408,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(deadLetterQueue);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -445,7 +445,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(deadLetterQueue);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java

@@ -79,7 +79,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       assertEquals(qName.toString(), m.getStringProperty(Message.HDR_ORIGINAL_QUEUE));
       assertEquals(adSend.toString(), m.getStringProperty(Message.HDR_ORIGINAL_ADDRESS));
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 
@@ -125,7 +125,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       assertEquals(qName.toString(), m.getStringProperty(Message.HDR_ORIGINAL_QUEUE));
       assertEquals(adSend.toString(), m.getStringProperty(Message.HDR_ORIGINAL_ADDRESS));
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 
@@ -175,7 +175,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(expiryQueue2);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 
@@ -215,7 +215,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
 
       m.acknowledge();
 
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
 
       clientConsumer.close();
 
@@ -230,7 +230,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
 
       m.acknowledge();
 
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
 
       clientConsumer.close();
 
@@ -333,7 +333,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(eq);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 
@@ -361,7 +361,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(eq);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 
@@ -402,7 +402,7 @@ public class ExpiryAddressTest extends ActiveMQTestBase {
       clientConsumer = clientSession.createConsumer(specificExpiryQueue);
       m = clientConsumer.receive(500);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
       m.acknowledge();
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java

@@ -124,9 +124,9 @@ public class LargeMessageCompressTest extends LargeMessageTestBase {
 
       assertNotNull(browse);
 
-      assertEquals(browse.length, 1);
+      assertEquals(1, browse.length);
 
-      assertEquals(browse[0].get("text"), "[compressed]");
+      assertEquals("[compressed]", browse[0].get("text"));
 
       //clean up
       session = addClientSession(sf.createSession(false, false, false));

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java

@@ -239,7 +239,7 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       DummyMessageHandler dummyMessageHandler = new DummyMessageHandler(latch, true);
       consumer.setMessageHandler(dummyMessageHandler);
       assertTrue(latch.await(10, TimeUnit.SECONDS));
-      assertEquals(dummyMessageHandler.list.size(), 100);
+      assertEquals(100, dummyMessageHandler.list.size());
       int i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -281,13 +281,13 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       consumer2.setMessageHandler(dummyMessageHandler2);
       assertTrue(latch.await(10, TimeUnit.SECONDS));
       clientSession.commit();
-      assertEquals(dummyMessageHandler.list.size(), 50);
+      assertEquals(50, dummyMessageHandler.list.size());
       int i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -339,7 +339,7 @@ public class MessageGroupingTest extends ActiveMQTestBase {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -350,13 +350,13 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       dummyMessageHandler2.reset(latch);
       clientSession.rollback();
       assertTrue(latch.await(10, TimeUnit.SECONDS));
-      assertEquals(dummyMessageHandler.list.size(), 50);
+      assertEquals(50, dummyMessageHandler.list.size());
       i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -401,13 +401,13 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
       clientSession.commit(xid, false);
-      assertEquals(dummyMessageHandler.list.size(), 50);
+      assertEquals(50, dummyMessageHandler.list.size());
       int i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -454,13 +454,13 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       consumer2.setMessageHandler(dummyMessageHandler2);
       assertTrue(latch.await(10, TimeUnit.SECONDS));
       clientSession.end(xid, XAResource.TMSUCCESS);
-      assertEquals(dummyMessageHandler.list.size(), 50);
+      assertEquals(50, dummyMessageHandler.list.size());
       int i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
@@ -475,13 +475,13 @@ public class MessageGroupingTest extends ActiveMQTestBase {
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
       clientSession.commit(xid, false);
-      assertEquals(dummyMessageHandler.list.size(), 50);
+      assertEquals(50, dummyMessageHandler.list.size());
       i = 0;
       for (ClientMessage message : dummyMessageHandler.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);
          i += 2;
       }
-      assertEquals(dummyMessageHandler2.list.size(), 50);
+      assertEquals(50, dummyMessageHandler2.list.size());
       i = 1;
       for (ClientMessage message : dummyMessageHandler2.list) {
          assertEquals(message.getBodyBuffer().readString(), "m" + i);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java

@@ -59,7 +59,7 @@ public class NewDeadLetterAddressTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "heyho!");
+      assertEquals("heyho!", m.getBodyBuffer().readString());
    }
 
    @Override

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java

@@ -166,7 +166,7 @@ public class ServerLocatorConnectTest extends ActiveMQTestBase {
       ServerLocatorInternal locator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithoutHA(createTransportConfiguration(isNetty(), false, generateParams(0, isNetty())));
       ClientSessionFactoryInternal csf = locator.connect();
       assertNotNull(csf);
-      assertEquals(csf.numConnections(), 1);
+      assertEquals(1, csf.numConnections());
       locator.close();
    }
 
@@ -176,7 +176,7 @@ public class ServerLocatorConnectTest extends ActiveMQTestBase {
       ServerLocatorInternal locator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithoutHA(createTransportConfiguration(isNetty(), false, generateParams(0, isNetty())), createTransportConfiguration(isNetty(), false, generateParams(1, isNetty())), createTransportConfiguration(isNetty(), false, generateParams(2, isNetty())), createTransportConfiguration(isNetty(), false, generateParams(3, isNetty())), createTransportConfiguration(isNetty(), false, generateParams(4, isNetty())));
       ClientSessionFactoryInternal csf = locator.connect();
       assertNotNull(csf);
-      assertEquals(csf.numConnections(), 1);
+      assertEquals(1, csf.numConnections());
       locator.close();
    }
 
@@ -187,7 +187,7 @@ public class ServerLocatorConnectTest extends ActiveMQTestBase {
       locator.setReconnectAttempts(15);
       ClientSessionFactoryInternal csf = locator.connect();
       assertNotNull(csf);
-      assertEquals(csf.numConnections(), 1);
+      assertEquals(1, csf.numConnections());
       locator.close();
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java

@@ -210,12 +210,12 @@ public class SessionTest extends ActiveMQTestBase {
       assertTrue(queues.isEmpty());
       resp = clientSession.addressQuery(SimpleString.of("a1"));
       queues = resp.getQueueNames();
-      assertEquals(queues.size(), 2);
+      assertEquals(2, queues.size());
       assertTrue(queues.contains(SimpleString.of("q1")));
       assertTrue(queues.contains(SimpleString.of("q2")));
       resp = clientSession.addressQuery(SimpleString.of("a2"));
       queues = resp.getQueueNames();
-      assertEquals(queues.size(), 3);
+      assertEquals(3, queues.size());
       assertTrue(queues.contains(SimpleString.of("q3")));
       assertTrue(queues.contains(SimpleString.of("q4")));
       assertTrue(queues.contains(SimpleString.of("q5")));

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java

@@ -161,7 +161,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
          consumer.receiveImmediate();
          fail();
       } catch (ActiveMQObjectClosedException e) {
-         assertEquals(e.getType(), ActiveMQExceptionType.OBJECT_CLOSED);
+         assertEquals(ActiveMQExceptionType.OBJECT_CLOSED, e.getType());
       }
    }
 
@@ -192,7 +192,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
          consumer.receiveImmediate();
          fail();
       } catch (ActiveMQObjectClosedException e) {
-         assertEquals(e.getType(), ActiveMQExceptionType.OBJECT_CLOSED);
+         assertEquals(ActiveMQExceptionType.OBJECT_CLOSED, e.getType());
       }
    }
 
@@ -412,7 +412,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
          consumer.receiveImmediate();
          fail();
       } catch (ActiveMQObjectClosedException e) {
-         assertEquals(e.getType(), ActiveMQExceptionType.OBJECT_CLOSED);
+         assertEquals(ActiveMQExceptionType.OBJECT_CLOSED, e.getType());
       }
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java

@@ -89,9 +89,9 @@ public class TransactionalSendTest extends ActiveMQTestBase {
          cp.send(session.createMessage(false));
       }
       Queue q = (Queue) server.getPostOffice().getBinding(queueA).getBindable();
-      assertEquals(getMessageCount(q), 0);
+      assertEquals(0, getMessageCount(q));
       session.rollback();
-      assertEquals(getMessageCount(q), 0);
+      assertEquals(0, getMessageCount(q));
       // now send some more
       for (int i = 0; i < numMessages; i++) {
          cp.send(session.createMessage(false));

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java

@@ -216,7 +216,7 @@ public class WildCardRoutingTest extends ActiveMQTestBase {
       clientSession.start();
       clientSession.deleteQueue(queueName1);
       // the wildcard binding should still exist
-      assertEquals(server.getPostOffice().getBindingsForAddress(addressAB).getBindings().size(), 1);
+      assertEquals(1, server.getPostOffice().getBindingsForAddress(addressAB).getBindings().size());
       producer.send(createTextMessage(clientSession, "m1"));
       producer2.send(createTextMessage(clientSession, "m2"));
       ClientMessage m = clientConsumer.receive(500);
@@ -229,7 +229,7 @@ public class WildCardRoutingTest extends ActiveMQTestBase {
       m.acknowledge();
       clientConsumer.close();
       clientSession.deleteQueue(queueName);
-      assertEquals(server.getPostOffice().getBindingsForAddress(addressAB).getBindings().size(), 0);
+      assertEquals(0, server.getPostOffice().getBindingsForAddress(addressAB).getBindings().size());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OneWayChainClusterTest.java

@@ -363,7 +363,7 @@ public class OneWayChainClusterTest extends ClusterTestBase {
          }
       }
       assertNotNull(records);
-      assertEquals(records.size(), 1);
+      assertEquals(1, records.size());
       getServer(1).getClusterManager().getClusterConnections();
       assertNotNull(connectionSet);
       assertEquals(1, connectionSet.size());
@@ -371,7 +371,7 @@ public class OneWayChainClusterTest extends ClusterTestBase {
 
       records = ccon.getRecords();
       assertNotNull(records);
-      assertEquals(records.size(), 1);
+      assertEquals(1, records.size());
       getServer(2).getClusterManager().getClusterConnections();
       assertNotNull(connectionSet);
       assertEquals(1, connectionSet.size());
@@ -379,7 +379,7 @@ public class OneWayChainClusterTest extends ClusterTestBase {
 
       records = ccon.getRecords();
       assertNotNull(records);
-      assertEquals(records.size(), 1);
+      assertEquals(1, records.size());
       getServer(3).getClusterManager().getClusterConnections();
       assertNotNull(connectionSet);
       assertEquals(1, connectionSet.size());
@@ -387,7 +387,7 @@ public class OneWayChainClusterTest extends ClusterTestBase {
 
       records = ccon.getRecords();
       assertNotNull(records);
-      assertEquals(records.size(), 1);
+      assertEquals(1, records.size());
 
       getServer(4).getClusterManager().getClusterConnections();
       assertNotNull(connectionSet);
@@ -396,6 +396,6 @@ public class OneWayChainClusterTest extends ClusterTestBase {
 
       records = ccon.getRecords();
       assertNotNull(records);
-      assertEquals(records.size(), 1);
+      assertEquals(1, records.size());
    }
 }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java

@@ -82,11 +82,11 @@ public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase {
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection<TopologyMemberImpl> members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         assertEquals(2, members.size());
          Map<String, ActiveMQServer> backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         assertEquals(1, backupServers0.size());
          Map<String, ActiveMQServer> backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         assertEquals(1, backupServers1.size());
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
@@ -155,11 +155,11 @@ public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase {
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection<TopologyMemberImpl> members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         assertEquals(2, members.size());
          Map<String, ActiveMQServer> backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         assertEquals(1, backupServers0.size());
          Map<String, ActiveMQServer> backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         assertEquals(1, backupServers1.size());
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
@@ -230,11 +230,11 @@ public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase {
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection<TopologyMemberImpl> members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         assertEquals(2, members.size());
          Map<String, ActiveMQServer> backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         assertEquals(1, backupServers0.size());
          Map<String, ActiveMQServer> backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         assertEquals(1, backupServers1.size());
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
@@ -248,11 +248,11 @@ public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase {
          ClientSessionFactory sessionFactory3 = serverLocator.createSessionFactory(primaryConnector3);
          waitForRemoteBackup(sessionFactory2, 10);
          waitForRemoteBackup(sessionFactory3, 10);
-         assertEquals(members.size(), 2);
+         assertEquals(2, members.size());
          Map<String, ActiveMQServer> backupServers2 = server2.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers2.size(), 1);
+         assertEquals(1, backupServers2.size());
          Map<String, ActiveMQServer> backupServers3 = server3.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers3.size(), 1);
+         assertEquals(1, backupServers3.size());
          ActiveMQServer backupServer2 = backupServers2.values().iterator().next();
          ActiveMQServer backupServer3 = backupServers3.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer2);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java

@@ -1854,9 +1854,9 @@ public class NettyReplicatedFailoverTest extends NettyFailoverInVMTest {
 
       assertNotNull(sender.e.getCause());
 
-      assertEquals(sender.e.getType(), ActiveMQExceptionType.UNBLOCKED);
+      assertEquals(ActiveMQExceptionType.UNBLOCKED, sender.e.getType());
 
-      assertEquals(((ActiveMQException) sender.e.getCause()).getType(), ActiveMQExceptionType.DISCONNECTED);
+      assertEquals(ActiveMQExceptionType.DISCONNECTED, ((ActiveMQException) sender.e.getCause()).getType());
 
       session.close();
    }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java

@@ -112,7 +112,7 @@ public class AMQPToOpenwireTest extends ActiveMQTestBase {
          ObjectMessage receive = (ObjectMessage) consumer.receive(5000);
          assertNotNull(receive);
          list = (ArrayList)receive.getObject();
-         assertEquals(list.get(0), "aString");
+         assertEquals("aString", list.get(0));
          connection.close();
       } finally {
          if (connection != null) {

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java

@@ -116,7 +116,7 @@ public class OpenWireToAMQPTest extends ActiveMQTestBase {
          ObjectMessage receive = (ObjectMessage) consumer.receive(5000);
          assertNotNull(receive);
          List<String> list = (ArrayList<String>) receive.getObject();
-         assertEquals(list.get(0), "aString");
+         assertEquals("aString", list.get(0));
          connection.close();
       } catch (Exception e) {
          e.printStackTrace();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedAddressTest.java

@@ -155,7 +155,7 @@ public class FederatedAddressTest extends FederatedTestBase {
          producer1.send(session1.createTextMessage("hello"));
          Message message = consumer0.receive(1000);
          assertNotNull(message);
-         assertEquals(message.getBooleanProperty(FederatedQueueTest.TestTransformer.TEST_PROPERTY), true);
+         assertEquals(true, message.getBooleanProperty(FederatedQueueTest.TestTransformer.TEST_PROPERTY));
       }
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java

@@ -213,7 +213,7 @@ public class FederatedQueueTest extends FederatedTestBase {
 
          Message message = consumer0.receive(1000);
          assertNotNull(message);
-         assertEquals(message.getBooleanProperty(TestTransformer.TEST_PROPERTY), true);
+         assertEquals(true, message.getBooleanProperty(TestTransformer.TEST_PROPERTY));
       }
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java

@@ -202,7 +202,7 @@ public class JDBCJournalTest extends ActiveMQTestBase {
       journal.sync();
 
       done.await(5, TimeUnit.SECONDS);
-      assertEquals(done.getCount(), 0);
+      assertEquals(0, done.getCount());
    }
 
    @TestTemplate

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java

@@ -1365,8 +1365,8 @@ public class RedeployTest extends ActiveMQTestBase {
       try {
          latch.await(10, TimeUnit.SECONDS);
 
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1);
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "b");
+         assertEquals(1, getSecurityRoles(embeddedActiveMQ, "security_address").size());
+         assertEquals("b", getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName());
 
          assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.of("OriginalDLQ"));
          assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getExpiryAddress(), SimpleString.of("OriginalExpiryQueue"));
@@ -1393,8 +1393,8 @@ public class RedeployTest extends ActiveMQTestBase {
          latch.await(10, TimeUnit.SECONDS);
 
          //Assert that the security settings change applied
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1);
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "c");
+         assertEquals(1, getSecurityRoles(embeddedActiveMQ, "security_address").size());
+         assertEquals("c", getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName());
 
          //Assert that the address settings change applied
          assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.of("NewDLQ"));
@@ -1425,8 +1425,8 @@ public class RedeployTest extends ActiveMQTestBase {
          embeddedActiveMQ.start();
 
          //Assert that the security settings changes persist a stop and start server (e.g. like what occurs if network health check stops the node), but JVM remains up.
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1);
-         assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "c");
+         assertEquals(1, getSecurityRoles(embeddedActiveMQ, "security_address").size());
+         assertEquals("c", getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName());
 
          //Assert that the address settings changes persist a stop and start server (e.g. like what occurs if network health check stops the node), but JVM remains up.
          assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.of("NewDLQ"));

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java

@@ -364,37 +364,37 @@ public class SimpleJNDIClientTest extends ActiveMQTestBase {
 
       Map<String, Object> parametersFromJNDI = cf.getServerLocator().getStaticTransportConfigurations()[0].getParams();
 
-      assertEquals(parametersFromJNDI.get(TransportConstants.SSL_ENABLED_PROP_NAME), "mySSLEnabledPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_ENABLED_PROP_NAME), "myHTTPEnabledPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME), "myHTTPClientIdlePropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD), "myHTTPClientIdleScanPeriodValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_REQUIRES_SESSION_ID), "myHTTPRequiresSessionIDValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME), "myHTTPUpgradeEnabledPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME), "myHTTPUpgradeEndpointPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.USE_SERVLET_PROP_NAME), "myUseServletPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.SERVLET_PATH), "myServletPathValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.USE_NIO_PROP_NAME), "myUseNIOPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.USE_NIO_GLOBAL_WORKER_POOL_PROP_NAME), "myUseNIOGlobalWorkerPoolPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.LOCAL_ADDRESS_PROP_NAME), "myLocalAddressPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.LOCAL_PORT_PROP_NAME), "myLocalPortPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.KEYSTORE_PROVIDER_PROP_NAME), "myKeystoreProviderPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.KEYSTORE_TYPE_PROP_NAME), "myKeystoreTypePropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.KEYSTORE_PATH_PROP_NAME), "myKeystorePathPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME), "myKeystorePasswordPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME), "myTruststoreProviderPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TRUSTSTORE_TYPE_PROP_NAME), "myTruststoreTypePropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PATH_PROP_NAME), "myTruststorePathPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME), "myTruststorePasswordPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME), "myEnabledCipherSuitesPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.ENABLED_PROTOCOLS_PROP_NAME), "myEnabledProtocolsPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TCP_NODELAY_PROPNAME), "myTCPNoDelayPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TCP_SENDBUFFER_SIZE_PROPNAME), "myTCPSendbufferSizePropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME), "myTCPReceivebufferSizePropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.NIO_REMOTING_THREADS_PROPNAME), "myNIORemotingThreadsPropValue");
-      assertEquals(parametersFromJNDI.get(TransportConstants.BATCH_DELAY), "myBatchDelay");
-      assertEquals(parametersFromJNDI.get(ActiveMQDefaultConfiguration.getPropMaskPassword()), "myPropMaskPassword");
-      assertEquals(parametersFromJNDI.get(ActiveMQDefaultConfiguration.getPropPasswordCodec()), "myPropPasswordCodec");
-      assertEquals(parametersFromJNDI.get(TransportConstants.NETTY_CONNECT_TIMEOUT), "myNettyConnectTimeout");
+      assertEquals("mySSLEnabledPropValue", parametersFromJNDI.get(TransportConstants.SSL_ENABLED_PROP_NAME));
+      assertEquals("myHTTPEnabledPropValue", parametersFromJNDI.get(TransportConstants.HTTP_ENABLED_PROP_NAME));
+      assertEquals("myHTTPClientIdlePropValue", parametersFromJNDI.get(TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME));
+      assertEquals("myHTTPClientIdleScanPeriodValue", parametersFromJNDI.get(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD));
+      assertEquals("myHTTPRequiresSessionIDValue", parametersFromJNDI.get(TransportConstants.HTTP_REQUIRES_SESSION_ID));
+      assertEquals("myHTTPUpgradeEnabledPropValue", parametersFromJNDI.get(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME));
+      assertEquals("myHTTPUpgradeEndpointPropValue", parametersFromJNDI.get(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME));
+      assertEquals("myUseServletPropValue", parametersFromJNDI.get(TransportConstants.USE_SERVLET_PROP_NAME));
+      assertEquals("myServletPathValue", parametersFromJNDI.get(TransportConstants.SERVLET_PATH));
+      assertEquals("myUseNIOPropValue", parametersFromJNDI.get(TransportConstants.USE_NIO_PROP_NAME));
+      assertEquals("myUseNIOGlobalWorkerPoolPropValue", parametersFromJNDI.get(TransportConstants.USE_NIO_GLOBAL_WORKER_POOL_PROP_NAME));
+      assertEquals("myLocalAddressPropValue", parametersFromJNDI.get(TransportConstants.LOCAL_ADDRESS_PROP_NAME));
+      assertEquals("myLocalPortPropValue", parametersFromJNDI.get(TransportConstants.LOCAL_PORT_PROP_NAME));
+      assertEquals("myKeystoreProviderPropValue", parametersFromJNDI.get(TransportConstants.KEYSTORE_PROVIDER_PROP_NAME));
+      assertEquals("myKeystoreTypePropValue", parametersFromJNDI.get(TransportConstants.KEYSTORE_TYPE_PROP_NAME));
+      assertEquals("myKeystorePathPropValue", parametersFromJNDI.get(TransportConstants.KEYSTORE_PATH_PROP_NAME));
+      assertEquals("myKeystorePasswordPropValue", parametersFromJNDI.get(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME));
+      assertEquals("myTruststoreProviderPropValue", parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME));
+      assertEquals("myTruststoreTypePropValue", parametersFromJNDI.get(TransportConstants.TRUSTSTORE_TYPE_PROP_NAME));
+      assertEquals("myTruststorePathPropValue", parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PATH_PROP_NAME));
+      assertEquals("myTruststorePasswordPropValue", parametersFromJNDI.get(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME));
+      assertEquals("myEnabledCipherSuitesPropValue", parametersFromJNDI.get(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME));
+      assertEquals("myEnabledProtocolsPropValue", parametersFromJNDI.get(TransportConstants.ENABLED_PROTOCOLS_PROP_NAME));
+      assertEquals("myTCPNoDelayPropValue", parametersFromJNDI.get(TransportConstants.TCP_NODELAY_PROPNAME));
+      assertEquals("myTCPSendbufferSizePropValue", parametersFromJNDI.get(TransportConstants.TCP_SENDBUFFER_SIZE_PROPNAME));
+      assertEquals("myTCPReceivebufferSizePropValue", parametersFromJNDI.get(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME));
+      assertEquals("myNIORemotingThreadsPropValue", parametersFromJNDI.get(TransportConstants.NIO_REMOTING_THREADS_PROPNAME));
+      assertEquals("myBatchDelay", parametersFromJNDI.get(TransportConstants.BATCH_DELAY));
+      assertEquals("myPropMaskPassword", parametersFromJNDI.get(ActiveMQDefaultConfiguration.getPropMaskPassword()));
+      assertEquals("myPropPasswordCodec", parametersFromJNDI.get(ActiveMQDefaultConfiguration.getPropPasswordCodec()));
+      assertEquals("myNettyConnectTimeout", parametersFromJNDI.get(TransportConstants.NETTY_CONNECT_TIMEOUT));
       ctx.close();
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java

@@ -366,13 +366,13 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
 
          tm = (TextMessage) consumer2.receive(10000);
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + (j + 10), tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
 
          assertNull(consumer3.receiveNoWait());
       }
@@ -383,7 +383,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
 
          assertNull(consumer2.receiveNoWait());
          assertNull(consumer3.receiveNoWait());
@@ -442,7 +442,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Second set of msgs should go to the second consumers only
@@ -455,7 +455,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Third set of msgs should go to the first consumer only
@@ -468,7 +468,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
       }
       ctx.commit();
 
@@ -492,7 +492,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Second set of msgs should go to the second consumers only
@@ -505,7 +505,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Third set of msgs should now go to the third consumer now
@@ -518,7 +518,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
       }
 
       ctx.commit();
@@ -579,7 +579,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
       }
       ctx.commit();
 
@@ -594,7 +594,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
       }
       ctx.commit();
 
@@ -628,7 +628,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
       }
       ctx.commit();
 
@@ -640,7 +640,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Second set of msgs should go to the second consumers only
@@ -653,7 +653,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
       }
 
       //Third set of msgs should now go to the third consumer now
@@ -666,7 +666,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
       }
 
       ctx.commit();
@@ -723,7 +723,7 @@ public class GroupingTest extends JMSTestBase {
          assertNotNull(tm);
          tm.acknowledge();
          assertEquals("Message" + j, tm.getText());
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID1);
+         assertEquals(groupID1, tm.getStringProperty("JMSXGroupID"));
          if (j == 0) {
             assertTrue(tm.getBooleanProperty(customFirstGroupKey));
          } else {
@@ -741,7 +741,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID2);
+         assertEquals(groupID2, tm.getStringProperty("JMSXGroupID"));
 
          if (j == 10) {
             assertTrue(tm.getBooleanProperty(customFirstGroupKey));
@@ -760,7 +760,7 @@ public class GroupingTest extends JMSTestBase {
 
          assertEquals("Message" + j, tm.getText());
 
-         assertEquals(tm.getStringProperty("JMSXGroupID"), groupID3);
+         assertEquals(groupID3, tm.getStringProperty("JMSXGroupID"));
 
          if (j == 20) {
             assertTrue(tm.getBooleanProperty(customFirstGroupKey));

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java

@@ -74,9 +74,9 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
       checkEquals(cf, y);
       DiscoveryGroupConfiguration dgc = y.getDiscoveryGroupConfiguration();
-      assertEquals(dgc.getName(), "dg1");
-      assertEquals(dgc.getDiscoveryInitialWaitTimeout(), 5000);
-      assertEquals(dgc.getRefreshTimeout(), 5000);
+      assertEquals("dg1", dgc.getName());
+      assertEquals(5000, dgc.getDiscoveryInitialWaitTimeout());
+      assertEquals(5000, dgc.getRefreshTimeout());
       assertTrue(dgc.getBroadcastEndpointFactory() instanceof UDPBroadcastEndpointFactory);
       UDPBroadcastEndpointFactory befc = (UDPBroadcastEndpointFactory) dgc.getBroadcastEndpointFactory();
       assertEquals(Integer.parseInt(System.getProperty("org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindPort", "-1")), befc.getLocalBindPort());
@@ -96,9 +96,9 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
       checkEquals(cf, y);
       DiscoveryGroupConfiguration dgc = y.getDiscoveryGroupConfiguration();
-      assertEquals(dgc.getName(), "dg1");
-      assertEquals(dgc.getDiscoveryInitialWaitTimeout(), 5000);
-      assertEquals(dgc.getRefreshTimeout(), 5000);
+      assertEquals("dg1", dgc.getName());
+      assertEquals(5000, dgc.getDiscoveryInitialWaitTimeout());
+      assertEquals(5000, dgc.getRefreshTimeout());
       assertTrue(dgc.getBroadcastEndpointFactory() instanceof JGroupsFileBroadcastEndpointFactory);
       JGroupsFileBroadcastEndpointFactory befc = (JGroupsFileBroadcastEndpointFactory) dgc.getBroadcastEndpointFactory();
       assertEquals("myChannel", befc.getChannelName());
@@ -117,7 +117,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       checkEquals(cf, y);
       assertEquals(cf.isHA(), y.isHA());
       TransportConfiguration[] staticConnectors = y.getStaticConnectors();
-      assertEquals(staticConnectors.length, 2);
+      assertEquals(2, staticConnectors.length);
       TransportConfiguration tc0 = cf.getStaticConnectors()[0];
       TransportConfiguration y0 = y.getStaticConnectors()[0];
       Map<String, Object> ctParams = tc0.getParams();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/InvalidConnectorTest.java

@@ -56,7 +56,7 @@ public class InvalidConnectorTest extends JMSTestBase {
 
       TransportConfiguration tc = tcs[0];
 
-      assertNotSame(tc.getParams().get(TransportConstants.HOST_PROP_NAME), "0.0.0.0");
+      assertNotSame("0.0.0.0", tc.getParams().get(TransportConstants.HOST_PROP_NAME));
       assertEquals(tc.getParams().get(TransportConstants.HOST_PROP_NAME), InetAddress.getLocalHost().getHostName());
    }
 }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsContextTest.java

@@ -579,8 +579,8 @@ public class JmsContextTest extends JMSTestBase {
          producer.setAsync(listener);
          producer.send(queue1, bMsg);
          assertTrue(latch.await(5, TimeUnit.SECONDS));
-         assertEquals(listener.message.readByte(), (byte) 1);
-         assertEquals(listener.message.readInt(), 22);
+         assertEquals((byte) 1, listener.message.readByte());
+         assertEquals(22, listener.message.readInt());
       } finally {
          context.close();
       }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSMessageTypesTest.java

@@ -400,7 +400,7 @@ public class JMSMessageTypesTest extends MultiprotocolJMSClientTestSupport {
       assertNotNull(objectMessage);
       @SuppressWarnings("unchecked")
       List<String> received = (ArrayList<String>) objectMessage.getObject();
-      assertEquals(received.get(0), "aString");
+      assertEquals("aString", received.get(0));
 
       consumerConnection.close();
    }
@@ -509,13 +509,13 @@ public class JMSMessageTypesTest extends MultiprotocolJMSClientTestSupport {
       TextMessage received = (TextMessage) messageConsumer.receive(5000);
       assertNotNull(received);
       assertEquals("msg:0", received.getText());
-      assertEquals(received.getBooleanProperty("true"), true);
-      assertEquals(received.getBooleanProperty("false"), false);
-      assertEquals(received.getStringProperty("foo"), "bar");
-      assertEquals(received.getDoubleProperty("double"), 66.6, 0.0001);
-      assertEquals(received.getFloatProperty("float"), 56.789f, 0.0001);
-      assertEquals(received.getIntProperty("int"), 8);
-      assertEquals(received.getByteProperty("byte"), (byte) 10);
+      assertEquals(true, received.getBooleanProperty("true"));
+      assertEquals(false, received.getBooleanProperty("false"));
+      assertEquals("bar", received.getStringProperty("foo"));
+      assertEquals(66.6, received.getDoubleProperty("double"), 0.0001);
+      assertEquals(56.789f, received.getFloatProperty("float"), 0.0001);
+      assertEquals(8, received.getIntProperty("int"));
+      assertEquals((byte) 10, received.getByteProperty("byte"));
 
       received = (TextMessage) messageConsumer.receive(5000);
       assertNotNull(received);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java

@@ -133,7 +133,7 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
 
          assertNotNull(msg);
 
-         assertEquals(msg.getBodySize(), 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
+         assertEquals(2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, msg.getBodySize());
 
          for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) {
             assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte());

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java

@@ -1235,7 +1235,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       AddressSettings info = AddressSettings.fromJSON(returnedSettings);
       assertEquals(addressSettings.getDeadLetterAddress(), info.getDeadLetterAddress());
       assertNull(info.getExpiryAddress());
-      assertEquals(addressSettings.getRedeliveryDelay(), 0);
+      assertEquals(0, addressSettings.getRedeliveryDelay());
 
 
       addressSettings.setExpiryAddress(SimpleString.of("EA"));
@@ -3548,8 +3548,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       assertEquals("myUser", second.getString("principal"));
       assertTrue(second.getJsonNumber("creationTime").longValue() > 0);
       assertEquals(1, second.getJsonNumber("consumerCount").longValue());
-      assertEquals(second.getJsonObject("metadata").getJsonString("foo").getString(), "bar");
-      assertEquals(second.getJsonObject("metadata").getJsonString("bar").getString(), "baz");
+      assertEquals("bar", second.getJsonObject("metadata").getJsonString("foo").getString());
+      assertEquals("baz", second.getJsonObject("metadata").getJsonString("bar").getString());
    }
 
    @TestTemplate

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java

@@ -170,7 +170,7 @@ public class QueueControlTest extends ManagementTestBase {
       String queueControlResourceName = ResourceNames.QUEUE + "testQueue";
       Object resource = server.getManagementService().getResource(queueControlResourceName);
       QueueControl queueControl = (QueueControl) resource;
-      assertEquals(queueControl.getMessageCount(), TOTAL_MESSAGES);
+      assertEquals(TOTAL_MESSAGES, queueControl.getMessageCount());
 
       // move messages to DLQ
       int count = queueControl.moveMessages(5, "", DLA, false, 10);
@@ -1969,7 +1969,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientMessage.acknowledge();
       assertNotNull(clientMessage);
 
-      assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
 
       // force a rollback to DLQ
       session.rollback();
@@ -2024,7 +2024,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientMessage.acknowledge();
       assertNotNull(clientMessage);
 
-      assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
 
       // force a rollback to DLQ
       session.rollback();
@@ -2138,7 +2138,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientMessage.acknowledge();
       assertNotNull(clientMessage);
 
-      assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
 
       // force a rollback to DLQ
       session.rollback();
@@ -2207,7 +2207,7 @@ public class QueueControlTest extends ManagementTestBase {
          ClientMessage clientMessage = clientConsumer.receive(500);
          clientMessage.acknowledge();
          assertNotNull(clientMessage);
-         assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+         assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
          session.rollback();
       }
 
@@ -2235,7 +2235,7 @@ public class QueueControlTest extends ManagementTestBase {
          ClientMessage clientMessage = clientConsumer.receive(500);
          clientMessage.acknowledge();
          assertNotNull(clientMessage);
-         assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+         assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
       }
 
       clientConsumer.close();
@@ -4437,13 +4437,13 @@ public class QueueControlTest extends ManagementTestBase {
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
 
       body = (byte[]) browse[1].get(BODY);
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
    }
 
 
@@ -4602,7 +4602,7 @@ public class QueueControlTest extends ManagementTestBase {
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
 
       body = (byte[]) browse[1].get(BODY);
 
@@ -4612,7 +4612,7 @@ public class QueueControlTest extends ManagementTestBase {
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
    }
 
    @TestTemplate
@@ -4662,13 +4662,13 @@ public class QueueControlTest extends ManagementTestBase {
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
 
       body = (byte[]) browse[1].get(BODY);
 
       assertNotNull(body);
 
-      assertEquals(new String(body), "theBody");
+      assertEquals("theBody", new String(body));
    }
 
    @TestTemplate
@@ -4845,7 +4845,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientMessage.acknowledge();
       assertNotNull(clientMessage);
 
-      assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
 
       // force a rollback to DLQ
       session.rollback();
@@ -4901,7 +4901,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientMessage.acknowledge();
       assertNotNull(clientMessage);
 
-      assertEquals(clientMessage.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, clientMessage.getBodyBuffer().readString());
 
       // force a rollback to DLQ
       session.rollback();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java

@@ -493,7 +493,7 @@ public class ConnAckTests  extends MQTT5TestSupport {
       boolean found = false;
       // make sure the keep-alive set by the client is used by the server (multiplied by 1500 because the client uses milliseconds instead of seconds and the value is modified by 1.5 per the spec)
       for (ConnectionEntry entry : ((RemotingServiceImpl)getServer().getRemotingService()).getConnectionEntries()) {
-         assertEquals(entry.ttl, KEEP_ALIVE * MQTTUtil.KEEP_ALIVE_ADJUSTMENT);
+         assertEquals(KEEP_ALIVE * MQTTUtil.KEEP_ALIVE_ADJUSTMENT, entry.ttl);
          found = true;
       }
       assertTrue(found);
@@ -519,7 +519,7 @@ public class ConnAckTests  extends MQTT5TestSupport {
       assertEquals(SERVER_KEEP_ALIVE, (long) result.getResponseProperties().getServerKeepAlive());
       boolean found = false;
       for (ConnectionEntry entry : ((RemotingServiceImpl)getServer().getRemotingService()).getConnectionEntries()) {
-         assertEquals(entry.ttl, -1);
+         assertEquals(-1, entry.ttl);
          found = true;
       }
       assertTrue(found);
@@ -543,7 +543,7 @@ public class ConnAckTests  extends MQTT5TestSupport {
       assertEquals(SERVER_KEEP_ALIVE, (long) result.getResponseProperties().getServerKeepAlive());
       boolean found = false;
       for (ConnectionEntry entry : ((RemotingServiceImpl)getServer().getRemotingService()).getConnectionEntries()) {
-         assertEquals(entry.ttl, SERVER_KEEP_ALIVE * MQTTUtil.KEEP_ALIVE_ADJUSTMENT);
+         assertEquals(SERVER_KEEP_ALIVE * MQTTUtil.KEEP_ALIVE_ADJUSTMENT, entry.ttl);
          found = true;
       }
       assertTrue(found);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java

@@ -58,7 +58,7 @@ public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest {
       String unackId = unackMessage.getJMSMessageID();
       assertEquals(((TextMessage) unackMessage).getText(), text);
       assertFalse(unackMessage.getJMSRedelivered());
-      assertEquals(unackMessage.getIntProperty("JMSXDeliveryCount"), 1);
+      assertEquals(1, unackMessage.getIntProperty("JMSXDeliveryCount"));
       consumeSession.close();
       consumer.close();
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java

@@ -83,9 +83,9 @@ public class JmsDurableTopicSendReceiveTest extends JmsTopicSendReceiveTest {
       consumer2 = consumeSession2.createDurableSubscriber((Topic) consumerDestination2, getName());
       Message msg = consumer2.receive(1000);
       assertNotNull(msg);
-      assertEquals(((TextMessage) msg).getText(), "test");
-      assertEquals(msg.getJMSType(), "test");
-      assertEquals(msg.getStringProperty("test"), "test");
+      assertEquals("test", ((TextMessage) msg).getText());
+      assertEquals("test", msg.getJMSType());
+      assertEquals("test", msg.getStringProperty("test"));
       connection2.stop();
       connection2.close();
    }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRedeliverTest.java

@@ -96,7 +96,7 @@ public class JmsTopicRedeliverTest extends BasicOpenWireTest {
       Message unackMessage = consumer.receive(initRedeliveryDelay + 1000);
       assertNotNull(unackMessage);
       String unackId = unackMessage.getJMSMessageID();
-      assertEquals(((TextMessage) unackMessage).getText(), text);
+      assertEquals(text, ((TextMessage) unackMessage).getText());
       assertFalse(unackMessage.getJMSRedelivered());
       // assertEquals(unackMessage.getIntProperty("JMSXDeliveryCount"),1);
 
@@ -106,7 +106,7 @@ public class JmsTopicRedeliverTest extends BasicOpenWireTest {
       assertNotNull(ackMessage);
       ackMessage.acknowledge();
       String ackId = ackMessage.getJMSMessageID();
-      assertEquals(((TextMessage) ackMessage).getText(), text);
+      assertEquals(text, ((TextMessage) ackMessage).getText());
       assertTrue(ackMessage.getJMSRedelivered());
       // assertEquals(ackMessage.getIntProperty("JMSXDeliveryCount"),2);
       assertEquals(unackId, ackId);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSelectorTest.java

@@ -145,7 +145,7 @@ public class JmsTopicSelectorTest extends BasicOpenWireTest {
 
          remaining--;
       }
-      assertEquals(remaining, 0);
+      assertEquals(0, remaining);
       consumer.close();
       consumeMessages(remaining);
    }
@@ -167,7 +167,7 @@ public class JmsTopicSelectorTest extends BasicOpenWireTest {
          }
          remaining--;
       }
-      assertEquals(remaining, 3);
+      assertEquals(3, remaining);
       consumer.close();
       consumeMessages(remaining);
 
@@ -190,7 +190,7 @@ public class JmsTopicSelectorTest extends BasicOpenWireTest {
          }
          remaining--;
       }
-      assertEquals(remaining, 2);
+      assertEquals(2, remaining);
       consumer.close();
       consumeMessages(remaining);
    }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java

@@ -586,10 +586,10 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
       consumer.setMessageListener(this);
       // wait receive
       waitReceiveUnack();
-      assertEquals(unackMessages.size(), MESSAGE_COUNT);
+      assertEquals(MESSAGE_COUNT, unackMessages.size());
       // resend phase
       waitReceiveAck();
-      assertEquals(ackMessages.size(), MESSAGE_COUNT);
+      assertEquals(MESSAGE_COUNT, ackMessages.size());
       // should no longer re-receive
       consumer.setMessageListener(null);
       assertNull(consumer.receiveNoWait());

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java

@@ -411,7 +411,7 @@ public class PagingSendTest extends ActiveMQTestBase {
 
          // the messages reach the limit
          PageCursorProvider cursorProvider = queuePagingStore.getCursorProvider();
-         assertEquals(PageCursorProviderTestAccessor.getNumberOfMessagesOnSubscriptions(cursorProvider), maxMessages);
+         assertEquals(maxMessages, PageCursorProviderTestAccessor.getNumberOfMessagesOnSubscriptions(cursorProvider));
 
          // but pages still under limit
          assertEquals(initPageLimitBytes, queuePagingStore.getPageLimitBytes());
@@ -601,7 +601,7 @@ public class PagingSendTest extends ActiveMQTestBase {
             // however messages reaches limit messages
             cursorProvider = queuePagingStore.getCursorProvider();
             assertEquals(maxMessages, queuePagingStore.getPageLimitMessages());
-            assertEquals(PageCursorProviderTestAccessor.getNumberOfMessagesOnSubscriptions(cursorProvider), maxMessages);
+            assertEquals(maxMessages, PageCursorProviderTestAccessor.getNumberOfMessagesOnSubscriptions(cursorProvider));
          } finally {
             server.stop(true);
          }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java

@@ -170,7 +170,7 @@ public class XmlImportExportTest extends ActiveMQTestBase {
          byte[] body = new byte[msg.getBodySize()];
          msg.getBodyBuffer().readBytes(body);
          assertTrue(new String(body).contains("Bob the giant pig " + i));
-         assertEquals(msg.getBooleanProperty("myBooleanProperty"), Boolean.TRUE);
+         assertEquals(Boolean.TRUE, msg.getBooleanProperty("myBooleanProperty"));
          assertEquals(msg.getByteProperty("myByteProperty"), Byte.valueOf("0"));
          byte[] bytes = msg.getBytesProperty("myBytesProperty");
          for (int j = 0; j < 5; j++) {
@@ -1227,8 +1227,8 @@ public class XmlImportExportTest extends ActiveMQTestBase {
       m.acknowledge();
 
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), payload);
-      assertEquals(m.getRoutingType(), RoutingType.ANYCAST);
+      assertEquals(payload, m.getBodyBuffer().readString());
+      assertEquals(RoutingType.ANYCAST, m.getRoutingType());
 
       // Rollback to place ANYCAST message on DLA (MULTICAST)
       session.rollback();
@@ -1268,8 +1268,8 @@ public class XmlImportExportTest extends ActiveMQTestBase {
       m = consumer.receive(5000);
 
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), payload);
-      assertEquals(m.getRoutingType(), null);
+      assertEquals(payload, m.getBodyBuffer().readString());
+      assertEquals(null, m.getRoutingType());
 
       consumer.close();
       session.close();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java

@@ -73,7 +73,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
       DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
       qResourceAdapter.endpointActivation(endpointFactory, spec);
       //make sure that activation didn't start, i.e. no MDB consumers
-      assertEquals(((Queue) server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE).getBindable()).getConsumerCount(), 0);
+      assertEquals(0, ((Queue) server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE).getBindable()).getConsumerCount());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
       qResourceAdapter.stop();
@@ -117,7 +117,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "test");
+      assertEquals("test", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
@@ -226,7 +226,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "test");
+      assertEquals("test", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       try {
          for (int i = 0; i < 10; i++) {

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java

@@ -90,7 +90,7 @@ public class ActiveMQMessageHandlerSecurityTest extends ActiveMQRATestBase {
       DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
       qResourceAdapter.endpointActivation(endpointFactory, spec);
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
-      assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 15);
+      assertEquals(15, ((LocalQueueBinding) binding).getQueue().getConsumerCount());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java

@@ -90,7 +90,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -163,7 +163,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -426,7 +426,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       server.stop();
 
@@ -484,7 +484,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
@@ -520,7 +520,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "red");
+      assertEquals("red", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
@@ -542,9 +542,9 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
       qResourceAdapter.endpointActivation(endpointFactory, spec);
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
-      assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 15);
+      assertEquals(15, ((LocalQueueBinding) binding).getQueue().getConsumerCount());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
-      assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 0);
+      assertEquals(0, ((LocalQueueBinding) binding).getQueue().getConsumerCount());
       assertTrue(endpoint.released);
       qResourceAdapter.stop();
    }
@@ -566,7 +566,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
       qResourceAdapter.endpointActivation(endpointFactory, spec);
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
-      assertEquals(((LocalQueueBinding) binding).getQueue().getConsumerCount(), 1);
+      assertEquals(1, ((LocalQueueBinding) binding).getQueue().getConsumerCount());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }
@@ -595,7 +595,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "test");
+      assertEquals("test", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
@@ -628,7 +628,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "1");
+      assertEquals("1", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -643,7 +643,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "2");
+      assertEquals("2", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       latch = new CountDownLatch(1);
       endpoint.reset(latch);
       message = session.createMessage(true);
@@ -652,7 +652,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
+      assertEquals("3", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }
@@ -681,7 +681,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "1");
+      assertEquals("1", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -699,7 +699,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
+      assertEquals("3", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }
@@ -730,7 +730,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "1");
+      assertEquals("1", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       ActiveMQActivation activation = lookupActivation(qResourceAdapter);
 
@@ -783,7 +783,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "1");
+      assertEquals("1", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -805,7 +805,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "3");
+      assertEquals("3", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }
@@ -956,7 +956,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "1");
+      assertEquals("1", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
 
@@ -972,7 +972,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "2");
+      assertEquals("2", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java

@@ -76,7 +76,7 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       endpoint.prepare();
       endpoint.commit();
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
@@ -145,7 +145,7 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
 
       assertFalse(endpoint.interrupted);
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
 
       Binding binding = server.getPostOffice().getBinding(MDBQUEUEPREFIXEDSIMPLE);
       long messageCount = getMessageCount((Queue) binding.getBindable());
@@ -184,7 +184,7 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
       qResourceAdapter.stop();
       assertTrue(endpoint.interrupted);
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
    }
 
    @Test
@@ -214,14 +214,14 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       latch = new CountDownLatch(1);
       endpoint.reset(latch);
       endpoint.rollback();
       latch.await(5, TimeUnit.SECONDS);
 
       assertNotNull(endpoint.lastMessage);
-      assertEquals(endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString(), "teststring");
+      assertEquals("teststring", endpoint.lastMessage.getCoreMessage().getBodyBuffer().readString());
       qResourceAdapter.endpointDeactivation(endpointFactory, spec);
       qResourceAdapter.stop();
    }

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/IgnoreJTATest.java

@@ -118,11 +118,11 @@ public class IgnoreJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.rollback();
       textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.commit();
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java

@@ -128,7 +128,7 @@ public class JMSContextTest extends ActiveMQRATestBase {
    public void sessionTransactedTestNoActiveJTATx() throws Exception {
       tsr.setStatus(Status.STATUS_ACTIVE);
       JMSContext context = qraConnectionFactory.createContext(JMSContext.SESSION_TRANSACTED);
-      assertEquals(context.getSessionMode(), JMSContext.AUTO_ACKNOWLEDGE);
+      assertEquals(JMSContext.AUTO_ACKNOWLEDGE, context.getSessionMode());
    }
 
    @Test
@@ -145,7 +145,7 @@ public class JMSContextTest extends ActiveMQRATestBase {
    public void clientAckTestNoActiveJTATx() throws Exception {
       tsr.setStatus(Status.STATUS_ACTIVE);
       JMSContext context = qraConnectionFactory.createContext(JMSContext.CLIENT_ACKNOWLEDGE);
-      assertEquals(context.getSessionMode(), JMSContext.AUTO_ACKNOWLEDGE);
+      assertEquals(JMSContext.AUTO_ACKNOWLEDGE, context.getSessionMode());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionJTATest.java

@@ -122,11 +122,11 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.rollback();
       textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.commit();
    }
 
@@ -157,7 +157,7 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
       try {
          s = queueConnection.createSession(false, Session.SESSION_TRANSACTED);
          if (inTx) {
-            assertEquals(s.getAcknowledgeMode(), Session.SESSION_TRANSACTED);
+            assertEquals(Session.SESSION_TRANSACTED, s.getAcknowledgeMode());
          } else {
             fail("didn't get expected exception creating session with SESSION_TRANSACTED mode ");
          }
@@ -171,7 +171,7 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
       try {
          s = queueConnection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
          if (inTx) {
-            assertEquals(s.getAcknowledgeMode(), Session.SESSION_TRANSACTED);
+            assertEquals(Session.SESSION_TRANSACTED, s.getAcknowledgeMode());
          } else {
             fail("didn't get expected exception creating session with CLIENT_ACKNOWLEDGE mode");
          }
@@ -227,7 +227,7 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionNoJTATest.java

@@ -125,11 +125,11 @@ public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.rollback();
       textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.commit();
       textMessage = (TextMessage) consumer.receiveNoWait();
       assertNull(textMessage);
@@ -156,11 +156,11 @@ public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.rollback();
       textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.commit();
       textMessage = (TextMessage) consumer.receiveNoWait();
       assertNull(textMessage);
@@ -187,11 +187,11 @@ public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.rollback();
       textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
       s.commit();
       textMessage = (TextMessage) consumer.receiveNoWait();
       assertNull(textMessage);
@@ -200,7 +200,7 @@ public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
    @Test
    public void sessionNotTransactedTestNoActiveJTATx() throws Exception {
       JMSContext context = qraConnectionFactory.createContext(JMSContext.AUTO_ACKNOWLEDGE);
-      assertEquals(context.getSessionMode(), JMSContext.AUTO_ACKNOWLEDGE);
+      assertEquals(JMSContext.AUTO_ACKNOWLEDGE, context.getSessionMode());
    }
 
    @Test
@@ -258,7 +258,7 @@ public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
       queueConnection.start();
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java

@@ -138,7 +138,7 @@ public class OutgoingConnectionTest extends ActiveMQRATestBase {
       resource.end(xid, XAResource.TMSUCCESS);
       resource.commit(xid, true);
       assertNotNull(textMessage);
-      assertEquals(textMessage.getText(), "test");
+      assertEquals("test", textMessage.getText());
 
       // When I wrote this call, this method was doing an infinite loop.
       // this is just to avoid such thing again

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java

@@ -519,10 +519,10 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
       ActiveMQConnectionFactory fac = qResourceAdapter.getConnectionFactory(spec);
       DiscoveryGroupConfiguration dc = fac.getServerLocator().getDiscoveryGroupConfiguration();
       UDPBroadcastEndpointFactory udpDg = (UDPBroadcastEndpointFactory) dc.getBroadcastEndpointFactory();
-      assertEquals(udpDg.getGroupAddress(), "231.6.6.6");
-      assertEquals(udpDg.getGroupPort(), 1234);
-      assertEquals(dc.getRefreshTimeout(), 1L);
-      assertEquals(dc.getDiscoveryInitialWaitTimeout(), 1L);
+      assertEquals("231.6.6.6", udpDg.getGroupAddress());
+      assertEquals(1234, udpDg.getGroupPort());
+      assertEquals(1L, dc.getRefreshTimeout());
+      assertEquals(1L, dc.getDiscoveryInitialWaitTimeout());
       qResourceAdapter.stop();
    }
 
@@ -547,10 +547,10 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
       ActiveMQConnectionFactory fac = qResourceAdapter.getConnectionFactory(spec);
       DiscoveryGroupConfiguration dc = fac.getServerLocator().getDiscoveryGroupConfiguration();
       UDPBroadcastEndpointFactory udpDg = (UDPBroadcastEndpointFactory) dc.getBroadcastEndpointFactory();
-      assertEquals(udpDg.getGroupAddress(), "231.6.6.6");
-      assertEquals(udpDg.getGroupPort(), 1234);
-      assertEquals(dc.getRefreshTimeout(), 1L);
-      assertEquals(dc.getDiscoveryInitialWaitTimeout(), 1L);
+      assertEquals("231.6.6.6", udpDg.getGroupAddress());
+      assertEquals(1234, udpDg.getGroupPort());
+      assertEquals(1L, dc.getRefreshTimeout());
+      assertEquals(1L, dc.getDiscoveryInitialWaitTimeout());
       qResourceAdapter.stop();
    }
 
@@ -848,10 +848,10 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
    public void testConnectionParameterStringParsing() throws Exception {
       ActiveMQResourceAdapter resourceAdapter = new ActiveMQResourceAdapter();
       resourceAdapter.setConnectionParameters("enabledProtocols=TLS1\\,TLS1.2;sslEnabled=true");
-      assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"), "TLS1,TLS1.2");
+      assertEquals("TLS1,TLS1.2", resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"));
       resourceAdapter.setConnectionParameters("enabledProtocols=TLS1\\,TLS1.2;sslEnabled=true,enabledProtocols=TLS1.3\\,TLS1.4\\,TLS1.5;sslEnabled=true");
-      assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"), "TLS1,TLS1.2");
-      assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(1).get("enabledProtocols"), "TLS1.3,TLS1.4,TLS1.5");
+      assertEquals("TLS1,TLS1.2", resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"));
+      assertEquals("TLS1.3,TLS1.4,TLS1.5", resourceAdapter.getProperties().getParsedConnectionParameters().get(1).get("enabledProtocols"));
 
       try {
          resourceAdapter.setConnectionParameters("enabledProtocols=TLS1,TLS1.2;sslEnabled=true,enabledProtocols=TLS1,TLS1.2;sslEnabled=true");

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/JMSXUserIDPluginTest.java

@@ -77,7 +77,7 @@ public class JMSXUserIDPluginTest extends ActiveMQTestBase {
       session.start();
       ClientMessage clientMessage = consumer.receiveImmediate();
       assertNotNull(clientMessage);
-      assertEquals(clientMessage.getValidatedUserID(), "testuser");
+      assertEquals("testuser", clientMessage.getValidatedUserID());
    }
 
    @Test
@@ -99,7 +99,7 @@ public class JMSXUserIDPluginTest extends ActiveMQTestBase {
       MessageConsumer consumer = session.createConsumer(queue);
       Message message = consumer.receive(5000);
       assertNotNull(message);
-      assertEquals(message.getStringProperty("_AMQ_VALIDATED_USER"), "testuser");
+      assertEquals("testuser", message.getStringProperty("_AMQ_VALIDATED_USER"));
       connection.close();
    }
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConfigurationTest.java

@@ -47,9 +47,9 @@ public class ConfigurationTest extends ActiveMQTestBase {
       try {
          server.start();
          Bindings mytopic_1 = server.getPostOffice().getBindingsForAddress(SimpleString.of("mytopic_1"));
-         assertEquals(mytopic_1.getBindings().size(), 0);
+         assertEquals(0, mytopic_1.getBindings().size());
          Bindings mytopic_2 = server.getPostOffice().getBindingsForAddress(SimpleString.of("mytopic_2"));
-         assertEquals(mytopic_2.getBindings().size(), 3);
+         assertEquals(3, mytopic_2.getBindings().size());
       } finally {
          try {
             server.stop();
@@ -104,12 +104,12 @@ public class ConfigurationTest extends ActiveMQTestBase {
 
          server.start();
          Bindings mytopic_1 = server.getPostOffice().getBindingsForAddress(SimpleString.of("mytopic_1"));
-         assertEquals(mytopic_1.getBindings().size(), 0);
+         assertEquals(0, mytopic_1.getBindings().size());
          Bindings mytopic_2 = server.getPostOffice().getBindingsForAddress(SimpleString.of("mytopic_2"));
-         assertEquals(mytopic_2.getBindings().size(), 3);
+         assertEquals(3, mytopic_2.getBindings().size());
 
          Bindings mytopic_3 = server.getPostOffice().getBindingsForAddress(SimpleString.of("mytopic_3"));
-         assertEquals(mytopic_3.getBindings().size(), 2);
+         assertEquals(2, mytopic_3.getBindings().size());
 
 
          // add new binding from props update

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java

@@ -81,7 +81,7 @@ public class GracefulShutdownTest extends ActiveMQTestBase {
       } catch (Exception e) {
          assertTrue(e instanceof ActiveMQSessionCreationException);
          ActiveMQSessionCreationException activeMQSessionCreationException = (ActiveMQSessionCreationException) e;
-         assertEquals(activeMQSessionCreationException.getType(), ActiveMQExceptionType.SESSION_CREATION_REJECTED);
+         assertEquals(ActiveMQExceptionType.SESSION_CREATION_REJECTED, activeMQSessionCreationException.getType());
       }
 
       // close the connection to allow broker shutdown to complete
@@ -139,7 +139,7 @@ public class GracefulShutdownTest extends ActiveMQTestBase {
       } catch (Exception e) {
          assertTrue(e instanceof ActiveMQSessionCreationException);
          ActiveMQSessionCreationException activeMQSessionCreationException = (ActiveMQSessionCreationException) e;
-         assertEquals(activeMQSessionCreationException.getType(), ActiveMQExceptionType.SESSION_CREATION_REJECTED);
+         assertEquals(ActiveMQExceptionType.SESSION_CREATION_REJECTED, activeMQSessionCreationException.getType());
       }
 
       Thread.sleep(timeout / 2);

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java

@@ -89,11 +89,11 @@ public class LVQRecoveryTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -126,27 +126,27 @@ public class LVQRecoveryTest extends ActiveMQTestBase {
       producer.send(m1);
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       producer.send(m3);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       producer.send(m4);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       producer.send(m5);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       producer.send(m6);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       clientSessionXa.end(xid, XAResource.TMSUCCESS);
       clientSessionXa.prepare(xid);
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java

@@ -92,7 +92,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -116,7 +116,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -180,11 +180,11 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       assertNull(consumer.receiveImmediate());
    }
 
@@ -237,7 +237,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       assertNull(consumer.receiveImmediate());
       clientSessionTxReceives.commit();
    }
@@ -257,11 +257,11 @@ public class LVQTest extends ActiveMQTestBase {
       assertNotNull(m);
       producer.send(m2);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -277,7 +277,7 @@ public class LVQTest extends ActiveMQTestBase {
       clientSession.start();
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       consumer.close();
       consumer = clientSession.createConsumer(qName1);
@@ -311,33 +311,33 @@ public class LVQTest extends ActiveMQTestBase {
       producer.send(m1);
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       producer.send(m3);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       producer.send(m4);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       producer.send(m5);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       producer.send(m6);
       m = consumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       consumer.close();
       consumer = clientSession.createConsumer(qName1);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = consumer.receiveImmediate();
       assertNull(m);
    }
@@ -358,7 +358,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -383,11 +383,11 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSessionTxReceives.commit();
       m = consumer.receiveImmediate();
       assertNull(m);
@@ -413,30 +413,30 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       producer.send(m3);
       producer.send(m4);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSessionTxReceives.rollback();
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    @Test
@@ -455,7 +455,7 @@ public class LVQTest extends ActiveMQTestBase {
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       assertNull(consumer.receiveImmediate());
    }
 
@@ -531,7 +531,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = consumer.receiveImmediate();
       assertNull(m);
    }
@@ -570,7 +570,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = consumer.receiveImmediate();
       assertNull(m);
    }
@@ -605,32 +605,32 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       producer.send(m3);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       producer.send(m4);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       producer.send(m5);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       producer.send(m6);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
 
       assertEquals(0, queue.getDeliveringCount());
    }
@@ -655,7 +655,7 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
 
       assertEquals(0, queue.getDeliveringCount());
    }
@@ -691,7 +691,7 @@ public class LVQTest extends ActiveMQTestBase {
       clientSession.start();
       ClientMessage m = consumer.receive(5000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m" + (MESSAGE_COUNT - 1));
+      assertEquals("m" + (MESSAGE_COUNT - 1), m.getBodyBuffer().readString());
       assertEquals(0, queue.getScheduledCount());
    }
 
@@ -713,12 +713,12 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
 
       assertEquals(0, queue.getDeliveringCount());
    }
@@ -751,32 +751,32 @@ public class LVQTest extends ActiveMQTestBase {
       ClientMessage m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       producer.send(m2);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       producer.send(m3);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       producer.send(m4);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       producer.send(m5);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       producer.send(m6);
       m = consumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       clientSessionTxReceives.commit();
    }
 
@@ -844,13 +844,13 @@ public class LVQTest extends ActiveMQTestBase {
       queue.deleteReference(messageId);
       // Wait for delete tx's afterCommit called
       Wait.assertEquals(0L, () -> queue.getDeliveringSize(), 10_000, 2);
-      assertEquals(queue.getPersistentSize(), 0);
+      assertEquals(0, queue.getPersistentSize());
       assertTrue(((LastValueQueue)queue).getLastValueKeys().isEmpty());
 
       producer.send(m2);
       // Wait for message delivered to queue
       Wait.assertTrue(() -> queue.getPersistentSize() > 10 * 1024, 10_000, 2);
-      assertEquals(queue.getDeliveringSize(), 0);
+      assertEquals(0, queue.getDeliveringSize());
    }
 
    @Test
@@ -873,7 +873,7 @@ public class LVQTest extends ActiveMQTestBase {
       assertTrue(queue.changeReferencePriority(messageId, (byte) 1));
       // Wait for message delivered to queue
       Wait.assertEquals(oldSize, () -> queue.getPersistentSize(), 10_000, 2);
-      assertEquals(queue.getDeliveringSize(), 0);
+      assertEquals(0, queue.getDeliveringSize());
    }
 
    @Test

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java

@@ -407,7 +407,7 @@ public class ScaleDownTest extends ClusterTestBase {
       // trigger scaleDown from node 0 to node 1
       servers[0].stop();
 
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName))).getBindable()).getRoutingType(), RoutingType.ANYCAST);
+      assertEquals(RoutingType.ANYCAST, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName))).getBindable()).getRoutingType());
       // get the 1 message from queue 2
       addConsumer(0, 1, queueName, null);
       ClientMessage clientMessage = consumers[0].getConsumer().receive(250);
@@ -448,7 +448,7 @@ public class ScaleDownTest extends ClusterTestBase {
       // trigger scaleDown from node 0 to node 1
       servers[0].stop();
 
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName))).getBindable()).getRoutingType(), RoutingType.ANYCAST);
+      assertEquals(RoutingType.ANYCAST, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName))).getBindable()).getRoutingType());
       // get the 1 message from queue 2
       addConsumer(0, 1, queueName, null);
       ClientMessage clientMessage = consumers[0].getConsumer().receive(250);
@@ -471,17 +471,17 @@ public class ScaleDownTest extends ClusterTestBase {
       // send messages to node 0
       sendAMQPMessages(addressName, TEST_SIZE, false);
 
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[0].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getMessageCount(), 2);
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[0].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getMessageCount(), 2);
+      assertEquals(2, ((QueueImpl)((LocalQueueBinding) servers[0].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getMessageCount());
+      assertEquals(2, ((QueueImpl)((LocalQueueBinding) servers[0].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getMessageCount());
 
       // trigger scaleDown from node 0 to node 1
       servers[0].stop();
 
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getRoutingType(), RoutingType.MULTICAST);
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getRoutingType(), RoutingType.MULTICAST);
+      assertEquals(RoutingType.MULTICAST, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getRoutingType());
+      assertEquals(RoutingType.MULTICAST, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getRoutingType());
 
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getMessageCount(), 2);
-      assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getMessageCount(), 2);
+      assertEquals(2, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName1))).getBindable()).getMessageCount());
+      assertEquals(2, ((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(SimpleString.of(queueName2))).getBindable()).getMessageCount());
 
       // get the 1 message from queue 1
       addConsumer(0, 1, queueName1, null);
@@ -547,7 +547,7 @@ public class ScaleDownTest extends ClusterTestBase {
          byte[] body = new byte[msg.getBodySize()];
          msg.getBodyBuffer().readBytes(body);
          assertTrue(new String(body).contains("Bob the giant pig " + i));
-         assertEquals(msg.getBooleanProperty("myBooleanProperty"), Boolean.TRUE);
+         assertEquals(Boolean.TRUE, msg.getBooleanProperty("myBooleanProperty"));
          assertEquals(msg.getByteProperty("myByteProperty"), Byte.valueOf("0"));
          byte[] bytes = msg.getBytesProperty("myBytesProperty");
          for (int j = 0; j < 5; j++) {
@@ -767,7 +767,7 @@ public class ScaleDownTest extends ClusterTestBase {
       ClientConsumer consumer = session.createConsumer(queueName);
       ClientMessage message = consumer.receive(1000);
       assertNotNull(message);
-      assertEquals(message.getBodyBuffer().readString(), sampleText);
+      assertEquals(sampleText, message.getBodyBuffer().readString());
       assertTrue(message.getRoutingType() == RoutingType.ANYCAST);
       message.acknowledge();
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java

@@ -40,7 +40,7 @@ public class SpringIntegrationTest extends ActiveMQTestBase {
          sender.send("Hello world");
          ExampleListener.latch.await(10, TimeUnit.SECONDS);
          Thread.sleep(500);
-         assertEquals(ExampleListener.lastMessage, "Hello world");
+         assertEquals("Hello world", ExampleListener.lastMessage);
          ((ActiveMQConnectionFactory) sender.getConnectionFactory()).close();
       } finally {
          try {

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java

@@ -287,7 +287,7 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       }
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
@@ -403,12 +403,12 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       if (commit) {
          clientSession.commit(xid, false);
       } else {
@@ -416,7 +416,7 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       }
 
       xids = clientSession.recover(XAResource.TMSTARTRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
    }
 
    @TestTemplate
@@ -475,28 +475,28 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       }
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
 
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
 
       clientSession.commit(xid, false);
       clientSession.start();
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    public void testBasicSendWithRollback(final boolean stopServer) throws Exception {
@@ -527,12 +527,12 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.rollback(xid);
       clientSession.start();
       ClientMessage m = clientConsumer.receiveImmediate();
@@ -572,26 +572,26 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.commit(xid, false);
       clientSession.start();
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
    }
 
    public void testMultipleTxSendWithCommit(final boolean stopServer) throws Exception {
@@ -631,37 +631,37 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 2);
+      assertEquals(2, xids.length);
       assertEqualXids(xids, xid, xid2);
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.commit(xid, false);
       clientSession.commit(xid2, false);
       clientSession.start();
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    public void testMultipleTxSendWithRollback(final boolean stopServer) throws Exception {
@@ -701,10 +701,10 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 2);
+      assertEquals(2, xids.length);
       assertEqualXids(xids, xid, xid2);
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.rollback(xid);
       clientSession.rollback(xid2);
       clientSession.start();
@@ -749,25 +749,25 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 2);
+      assertEquals(2, xids.length);
       assertEqualXids(xids, xid, xid2);
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.rollback(xid);
       clientSession.commit(xid2, false);
       clientSession.start();
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       m = clientConsumer.receiveImmediate();
       assertNull(m);
    }
@@ -807,38 +807,38 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.commit(xid, false);
       clientSession.start();
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
    }
 
    public void testBasicReceiveWithCommit(final boolean stopServer) throws Exception {
@@ -859,19 +859,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       assertEquals(XAResource.XA_OK, clientSession.prepare(xid), "Expected XA_OK");
 
@@ -883,12 +883,12 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
 
-      assertEquals(xids.length, 1);
+      assertEquals(1, xids.length);
       assertEquals(xids[0].getFormatId(), xid.getFormatId());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.commit(xid, false);
       clientSession.start();
       m = clientConsumer.receiveImmediate();
@@ -924,19 +924,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
 
@@ -957,21 +957,21 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier());
       ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId());
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.rollback(xid);
       clientSession.start();
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    public void testMultipleTxReceiveWithCommit(final boolean stopServer) throws Exception {
@@ -1006,19 +1006,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
       clientSession2.end(xid2, XAResource.TMSUCCESS);
       clientSession2.prepare(xid2);
       clientSession2.close();
@@ -1028,19 +1028,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
 
@@ -1053,7 +1053,7 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
       assertEqualXids(xids, xid, xid2);
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.commit(xid, false);
       clientSession.start();
       m = clientConsumer.receiveImmediate();
@@ -1092,19 +1092,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = clientConsumer2.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
       clientSession2.end(xid2, XAResource.TMSUCCESS);
       clientSession2.prepare(xid2);
       clientSession2.close();
@@ -1114,19 +1114,19 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
 
@@ -1139,25 +1139,25 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
       Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN);
       assertEqualXids(xids, xid, xid2);
       xids = clientSession.recover(XAResource.TMENDRSCAN);
-      assertEquals(xids.length, 0);
+      assertEquals(0, xids.length);
       clientSession.rollback(xid);
       clientSession.start();
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    protected void stopAndRestartServer() throws Exception {

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java

@@ -325,16 +325,16 @@ public class BasicXaTest extends ActiveMQTestBase {
       ClientConsumer clientConsumer = clientSession.createConsumer(atestq);
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
    }
 
    @TestTemplate
@@ -358,19 +358,19 @@ public class BasicXaTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
 
@@ -409,19 +409,19 @@ public class BasicXaTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
 
       StorageManager journalStorageManager = messagingService.getStorageManager();
@@ -459,19 +459,19 @@ public class BasicXaTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
 
       StorageManager journalStorageManager = messagingService.getStorageManager();

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/SessionFailureXATest.java

@@ -148,19 +148,19 @@ public class SessionFailureXATest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(1000);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       if (xaEnd) {
          // We are validating both cases, where xaEnd succeeded and didn't succeed
          // so this tests is parameterized to validate both cases.

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java

@@ -179,19 +179,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       CountDownLatch latch = new CountDownLatch(1);
       server.getResourceManager().getTransaction(xid).addOperation(new RollbackCompleteOperation(latch));
@@ -209,19 +209,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession2.close();
    }
 
@@ -254,19 +254,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       CountDownLatch latch = new CountDownLatch(1);
       server.getResourceManager().getTransaction(xid).addOperation(new RollbackCompleteOperation(latch));
@@ -284,19 +284,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       m = consumer.receiveImmediate();
       assertNull(m);
       clientSession2.close();
@@ -331,19 +331,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       ClientMessage m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m1");
+      assertEquals("m1", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m2");
+      assertEquals("m2", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m3");
+      assertEquals("m3", m.getBodyBuffer().readString());
       m = clientConsumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m4");
+      assertEquals("m4", m.getBodyBuffer().readString());
       clientSession.end(xid, XAResource.TMSUCCESS);
       clientSession.prepare(xid);
       CountDownLatch latch = new CountDownLatch(1);
@@ -359,19 +359,19 @@ public class XaTimeoutTest extends ActiveMQTestBase {
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m5");
+      assertEquals("m5", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       assertNotNull(m);
       m.acknowledge();
-      assertEquals(m.getBodyBuffer().readString(), "m6");
+      assertEquals("m6", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m7");
+      assertEquals("m7", m.getBodyBuffer().readString());
       m = consumer.receive(500);
       m.acknowledge();
       assertNotNull(m);
-      assertEquals(m.getBodyBuffer().readString(), "m8");
+      assertEquals("m8", m.getBodyBuffer().readString());
       m = consumer.receiveImmediate();
       assertNull(m);
       clientSession2.close();

tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java

@@ -617,7 +617,7 @@ public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
 
       queueProducer.send(m1);
       Message m2 = queueConsumer.receive(1000);
-      assertEquals(m2.getObjectProperty("key"), Boolean.TRUE, "key should be true");
+      assertEquals(Boolean.TRUE, m2.getObjectProperty("key"), "key should be true");
       assertNull(m2.getObjectProperty("key2"), "key2 should be null");
       assertNull(m2.getObjectProperty("key3"), "key3 should be null");
    }

tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java

@@ -156,7 +156,7 @@ public class StompStressTest extends ActiveMQTestBase {
                byte[] ba = inputBuffer.toByteArray();
                System.out.println(new String(ba, StandardCharsets.UTF_8));
             }
-            assertEquals(c, '\n', "Expecting stomp frame to terminate with \0\n");
+            assertEquals('\n', c, "Expecting stomp frame to terminate with \0\n");
             byte[] ba = inputBuffer.toByteArray();
             inputBuffer.reset();
             return new String(ba, StandardCharsets.UTF_8);

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessagePropertyTest.java

@@ -109,7 +109,7 @@ public class MessagePropertyTest extends ActiveMQTestBase {
             assertNull(message.getIngressTimestamp());
 
             assertTrue(message.containsProperty("null-value"));
-            assertEquals(message.getObjectProperty("null-value"), null);
+            assertEquals(null, message.getObjectProperty("null-value"));
 
             message.acknowledge();
          }

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java

@@ -254,7 +254,7 @@ public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase {
 
       // / The max of an unsigned short
       // (http://en.wikipedia.org/wiki/Unsigned_short)
-      assertEquals(s2, 65535);
+      assertEquals(65535, s2);
    }
 
    @Test

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/SocksProxyTest.java

@@ -241,7 +241,7 @@ public class SocksProxyTest extends ActiveMQTestBase {
       connector.getBootStrap().register().await().channel().pipeline();
 
       AddressResolverGroup<?> resolver = connector.getBootStrap().config().resolver();
-      assertSame(resolver, NoopAddressResolverGroup.INSTANCE);
+      assertSame(NoopAddressResolverGroup.INSTANCE, resolver);
 
       Connection connection = connector.createConnection(future -> {
          future.awaitUninterruptibly();

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java

@@ -1215,7 +1215,7 @@ public class QueueImplTest extends ActiveMQTestBase {
       queue.addTail(messageReference);
       queue.addTail(messageReference2);
       queue.addTail(messageReference3);
-      assertEquals(getMessagesAdded(queue), 3);
+      assertEquals(3, getMessagesAdded(queue));
    }
 
    /**

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQActivationsSpecTest.java

@@ -62,10 +62,10 @@ public class ActiveMQActivationsSpecTest {
    @Test
    public void validateAcknowledgeMode() {
       assertThrows(IllegalArgumentException.class, () -> {
-         assertEquals(ActiveMQActivationValidationUtils.validateAcknowledgeMode("DUPS_OK_ACKNOWLEDGE"), Session.DUPS_OK_ACKNOWLEDGE);
-         assertEquals(ActiveMQActivationValidationUtils.validateAcknowledgeMode("Dups-ok-acknowledge"), Session.DUPS_OK_ACKNOWLEDGE);
-         assertEquals(ActiveMQActivationValidationUtils.validateAcknowledgeMode("AUTO_ACKNOWLEDGE"), Session.AUTO_ACKNOWLEDGE);
-         assertEquals(ActiveMQActivationValidationUtils.validateAcknowledgeMode("Auto-acknowledge"), Session.AUTO_ACKNOWLEDGE);
+         assertEquals(Session.DUPS_OK_ACKNOWLEDGE, ActiveMQActivationValidationUtils.validateAcknowledgeMode("DUPS_OK_ACKNOWLEDGE"));
+         assertEquals(Session.DUPS_OK_ACKNOWLEDGE, ActiveMQActivationValidationUtils.validateAcknowledgeMode("Dups-ok-acknowledge"));
+         assertEquals(Session.AUTO_ACKNOWLEDGE, ActiveMQActivationValidationUtils.validateAcknowledgeMode("AUTO_ACKNOWLEDGE"));
+         assertEquals(Session.AUTO_ACKNOWLEDGE, ActiveMQActivationValidationUtils.validateAcknowledgeMode("Auto-acknowledge"));
          ActiveMQActivationValidationUtils.validateAcknowledgeMode("Invalid Acknowledge Mode");
       });
    }

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java

@@ -477,14 +477,14 @@ public class ActiveMQResourceAdapterConfigTest extends ActiveMQTestBase {
       for (int i = 0; i < nl.getLength(); i++) {
          Element el = (Element) nl.item(i);
          NodeList elementsByTagName = el.getElementsByTagName("config-property-name");
-         assertEquals(elementsByTagName.getLength(), 1, el.toString());
+         assertEquals(1, elementsByTagName.getLength(), el.toString());
          Node configPropertyNameNode = elementsByTagName.item(0);
          String configPropertyName = configPropertyNameNode.getTextContent();
          Method setter = methodList.remove("set" + configPropertyName);
          assertNotNull(setter, "setter " + configPropertyName + " does not exist");
          Class c = lookupType(setter);
          elementsByTagName = el.getElementsByTagName("config-property-type");
-         assertEquals(elementsByTagName.getLength(), 1, "setter " + configPropertyName + " has no type set");
+         assertEquals(1, elementsByTagName.getLength(), "setter " + configPropertyName + " has no type set");
          Node configPropertyTypeNode = elementsByTagName.item(0);
          String configPropertyTypeName = configPropertyTypeNode.getTextContent();
          assertEquals(configPropertyTypeName, c.getName());

tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java

@@ -57,30 +57,30 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
       ActiveMQResourceAdapter ra = new ActiveMQResourceAdapter();
       ra.setConnectorClassName(InVMConnectorFactory.class.getName());
       ActiveMQConnectionFactory factory = ra.getDefaultActiveMQConnectionFactory();
-      assertEquals(factory.getCallTimeout(), ActiveMQClient.DEFAULT_CALL_TIMEOUT);
-      assertEquals(factory.getClientFailureCheckPeriod(), ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD);
-      assertEquals(factory.getClientID(), null);
-      assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME);
-      assertEquals(factory.getConnectionTTL(), ActiveMQClient.DEFAULT_CONNECTION_TTL);
-      assertEquals(factory.getConsumerMaxRate(), ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE);
-      assertEquals(factory.getConsumerWindowSize(), ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE);
-      assertEquals(factory.getDupsOKBatchSize(), ActiveMQClient.DEFAULT_ACK_BATCH_SIZE);
-      assertEquals(factory.getMinLargeMessageSize(), ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
-      assertEquals(factory.getProducerMaxRate(), ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE);
-      assertEquals(factory.getConfirmationWindowSize(), ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE);
+      assertEquals(ActiveMQClient.DEFAULT_CALL_TIMEOUT, factory.getCallTimeout());
+      assertEquals(ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, factory.getClientFailureCheckPeriod());
+      assertEquals(null, factory.getClientID());
+      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, factory.getConnectionLoadBalancingPolicyClassName());
+      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_TTL, factory.getConnectionTTL());
+      assertEquals(ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE, factory.getConsumerMaxRate());
+      assertEquals(ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE, factory.getConsumerWindowSize());
+      assertEquals(ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, factory.getDupsOKBatchSize());
+      assertEquals(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, factory.getMinLargeMessageSize());
+      assertEquals(ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE, factory.getProducerMaxRate());
+      assertEquals(ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, factory.getConfirmationWindowSize());
       // by default, reconnect attempts is set to -1
       assertEquals(-1, factory.getReconnectAttempts());
-      assertEquals(factory.getRetryInterval(), ActiveMQClient.DEFAULT_RETRY_INTERVAL);
-      assertEquals(factory.getRetryIntervalMultiplier(), ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, 0.00001);
-      assertEquals(factory.getScheduledThreadPoolMaxSize(), ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE);
-      assertEquals(factory.getThreadPoolMaxSize(), ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE);
-      assertEquals(factory.getTransactionBatchSize(), ActiveMQClient.DEFAULT_ACK_BATCH_SIZE);
-      assertEquals(factory.isAutoGroup(), ActiveMQClient.DEFAULT_AUTO_GROUP);
-      assertEquals(factory.isBlockOnAcknowledge(), ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
-      assertEquals(factory.isBlockOnNonDurableSend(), ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
-      assertEquals(factory.isBlockOnDurableSend(), ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
-      assertEquals(factory.isPreAcknowledge(), ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE);
-      assertEquals(factory.isUseGlobalPools(), ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
+      assertEquals(ActiveMQClient.DEFAULT_RETRY_INTERVAL, factory.getRetryInterval());
+      assertEquals(ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, factory.getRetryIntervalMultiplier(), 0.00001);
+      assertEquals(ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, factory.getScheduledThreadPoolMaxSize());
+      assertEquals(ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE, factory.getThreadPoolMaxSize());
+      assertEquals(ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, factory.getTransactionBatchSize());
+      assertEquals(ActiveMQClient.DEFAULT_AUTO_GROUP, factory.isAutoGroup());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, factory.isBlockOnAcknowledge());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, factory.isBlockOnNonDurableSend());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, factory.isBlockOnDurableSend());
+      assertEquals(ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE, factory.isPreAcknowledge());
+      assertEquals(ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, factory.isUseGlobalPools());
    }
 
    @Test
@@ -97,30 +97,30 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
       ActiveMQResourceAdapter ra = new ActiveMQResourceAdapter();
       ra.setConnectorClassName(InVMConnectorFactory.class.getName());
       ActiveMQConnectionFactory factory = ra.getConnectionFactory(new ConnectionFactoryProperties());
-      assertEquals(factory.getCallTimeout(), ActiveMQClient.DEFAULT_CALL_TIMEOUT);
-      assertEquals(factory.getClientFailureCheckPeriod(), ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD);
-      assertEquals(factory.getClientID(), null);
-      assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME);
-      assertEquals(factory.getConnectionTTL(), ActiveMQClient.DEFAULT_CONNECTION_TTL);
-      assertEquals(factory.getConsumerMaxRate(), ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE);
-      assertEquals(factory.getConsumerWindowSize(), ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE);
-      assertEquals(factory.getDupsOKBatchSize(), ActiveMQClient.DEFAULT_ACK_BATCH_SIZE);
-      assertEquals(factory.getMinLargeMessageSize(), ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
-      assertEquals(factory.getProducerMaxRate(), ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE);
-      assertEquals(factory.getConfirmationWindowSize(), ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE);
+      assertEquals(ActiveMQClient.DEFAULT_CALL_TIMEOUT, factory.getCallTimeout());
+      assertEquals(ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, factory.getClientFailureCheckPeriod());
+      assertEquals(null, factory.getClientID());
+      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, factory.getConnectionLoadBalancingPolicyClassName());
+      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_TTL, factory.getConnectionTTL());
+      assertEquals(ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE, factory.getConsumerMaxRate());
+      assertEquals(ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE, factory.getConsumerWindowSize());
+      assertEquals(ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, factory.getDupsOKBatchSize());
+      assertEquals(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, factory.getMinLargeMessageSize());
+      assertEquals(ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE, factory.getProducerMaxRate());
+      assertEquals(ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, factory.getConfirmationWindowSize());
       // by default, reconnect attempts is set to -1
       assertEquals(-1, factory.getReconnectAttempts());
-      assertEquals(factory.getRetryInterval(), ActiveMQClient.DEFAULT_RETRY_INTERVAL);
-      assertEquals(factory.getRetryIntervalMultiplier(), ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, 0.000001);
-      assertEquals(factory.getScheduledThreadPoolMaxSize(), ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE);
-      assertEquals(factory.getThreadPoolMaxSize(), ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE);
-      assertEquals(factory.getTransactionBatchSize(), ActiveMQClient.DEFAULT_ACK_BATCH_SIZE);
-      assertEquals(factory.isAutoGroup(), ActiveMQClient.DEFAULT_AUTO_GROUP);
-      assertEquals(factory.isBlockOnAcknowledge(), ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
-      assertEquals(factory.isBlockOnNonDurableSend(), ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
-      assertEquals(factory.isBlockOnDurableSend(), ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
-      assertEquals(factory.isPreAcknowledge(), ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE);
-      assertEquals(factory.isUseGlobalPools(), ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
+      assertEquals(ActiveMQClient.DEFAULT_RETRY_INTERVAL, factory.getRetryInterval());
+      assertEquals(ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, factory.getRetryIntervalMultiplier(), 0.000001);
+      assertEquals(ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, factory.getScheduledThreadPoolMaxSize());
+      assertEquals(ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE, factory.getThreadPoolMaxSize());
+      assertEquals(ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, factory.getTransactionBatchSize());
+      assertEquals(ActiveMQClient.DEFAULT_AUTO_GROUP, factory.isAutoGroup());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, factory.isBlockOnAcknowledge());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, factory.isBlockOnNonDurableSend());
+      assertEquals(ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, factory.isBlockOnDurableSend());
+      assertEquals(ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE, factory.isPreAcknowledge());
+      assertEquals(ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, factory.isUseGlobalPools());
    }
 
    @Test
@@ -153,29 +153,29 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
       ra.setTransactionBatchSize(18);
       ra.setUseGlobalPools(!ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
       ActiveMQConnectionFactory factory = ra.getDefaultActiveMQConnectionFactory();
-      assertEquals(factory.getCallTimeout(), 1);
-      assertEquals(factory.getClientFailureCheckPeriod(), 2);
-      assertEquals(factory.getClientID(), "myid");
-      assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), "mlbcn");
-      assertEquals(factory.getConnectionTTL(), 3);
-      assertEquals(factory.getConsumerMaxRate(), 4);
-      assertEquals(factory.getConsumerWindowSize(), 5);
-      assertEquals(factory.getDupsOKBatchSize(), 8);
-      assertEquals(factory.getMinLargeMessageSize(), 10);
-      assertEquals(factory.getProducerMaxRate(), 11);
-      assertEquals(factory.getConfirmationWindowSize(), 12);
-      assertEquals(factory.getReconnectAttempts(), 13);
-      assertEquals(factory.getRetryInterval(), 14);
-      assertEquals(factory.getRetryIntervalMultiplier(), 15d, 0.00001);
-      assertEquals(factory.getScheduledThreadPoolMaxSize(), 16);
-      assertEquals(factory.getThreadPoolMaxSize(), 17);
-      assertEquals(factory.getTransactionBatchSize(), 18);
-      assertEquals(factory.isAutoGroup(), !ActiveMQClient.DEFAULT_AUTO_GROUP);
-      assertEquals(factory.isBlockOnAcknowledge(), !ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
-      assertEquals(factory.isBlockOnNonDurableSend(), !ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
-      assertEquals(factory.isBlockOnDurableSend(), !ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
-      assertEquals(factory.isPreAcknowledge(), !ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE);
-      assertEquals(factory.isUseGlobalPools(), !ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
+      assertEquals(1, factory.getCallTimeout());
+      assertEquals(2, factory.getClientFailureCheckPeriod());
+      assertEquals("myid", factory.getClientID());
+      assertEquals("mlbcn", factory.getConnectionLoadBalancingPolicyClassName());
+      assertEquals(3, factory.getConnectionTTL());
+      assertEquals(4, factory.getConsumerMaxRate());
+      assertEquals(5, factory.getConsumerWindowSize());
+      assertEquals(8, factory.getDupsOKBatchSize());
+      assertEquals(10, factory.getMinLargeMessageSize());
+      assertEquals(11, factory.getProducerMaxRate());
+      assertEquals(12, factory.getConfirmationWindowSize());
+      assertEquals(13, factory.getReconnectAttempts());
+      assertEquals(14, factory.getRetryInterval());
+      assertEquals(15d, factory.getRetryIntervalMultiplier(), 0.00001);
+      assertEquals(16, factory.getScheduledThreadPoolMaxSize());
+      assertEquals(17, factory.getThreadPoolMaxSize());
+      assertEquals(18, factory.getTransactionBatchSize());
+      assertEquals(!ActiveMQClient.DEFAULT_AUTO_GROUP, factory.isAutoGroup());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, factory.isBlockOnAcknowledge());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, factory.isBlockOnNonDurableSend());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, factory.isBlockOnDurableSend());
+      assertEquals(!ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE, factory.isPreAcknowledge());
+      assertEquals(!ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, factory.isUseGlobalPools());
    }
 
    @Test
@@ -209,29 +209,29 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
       connectionFactoryProperties.setTransactionBatchSize(18);
       connectionFactoryProperties.setUseGlobalPools(!ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
       ActiveMQConnectionFactory factory = ra.getConnectionFactory(connectionFactoryProperties);
-      assertEquals(factory.getCallTimeout(), 1);
-      assertEquals(factory.getClientFailureCheckPeriod(), 2);
-      assertEquals(factory.getClientID(), "myid");
-      assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), "mlbcn");
-      assertEquals(factory.getConnectionTTL(), 3);
-      assertEquals(factory.getConsumerMaxRate(), 4);
-      assertEquals(factory.getConsumerWindowSize(), 5);
-      assertEquals(factory.getDupsOKBatchSize(), 8);
-      assertEquals(factory.getMinLargeMessageSize(), 10);
-      assertEquals(factory.getProducerMaxRate(), 11);
-      assertEquals(factory.getConfirmationWindowSize(), 12);
-      assertEquals(factory.getReconnectAttempts(), 13);
-      assertEquals(factory.getRetryInterval(), 14);
-      assertEquals(factory.getRetryIntervalMultiplier(), 15d, 0.000001);
-      assertEquals(factory.getScheduledThreadPoolMaxSize(), 16);
-      assertEquals(factory.getThreadPoolMaxSize(), 17);
-      assertEquals(factory.getTransactionBatchSize(), 18);
-      assertEquals(factory.isAutoGroup(), !ActiveMQClient.DEFAULT_AUTO_GROUP);
-      assertEquals(factory.isBlockOnAcknowledge(), !ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
-      assertEquals(factory.isBlockOnNonDurableSend(), !ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
-      assertEquals(factory.isBlockOnDurableSend(), !ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
-      assertEquals(factory.isPreAcknowledge(), !ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE);
-      assertEquals(factory.isUseGlobalPools(), !ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
+      assertEquals(1, factory.getCallTimeout());
+      assertEquals(2, factory.getClientFailureCheckPeriod());
+      assertEquals("myid", factory.getClientID());
+      assertEquals("mlbcn", factory.getConnectionLoadBalancingPolicyClassName());
+      assertEquals(3, factory.getConnectionTTL());
+      assertEquals(4, factory.getConsumerMaxRate());
+      assertEquals(5, factory.getConsumerWindowSize());
+      assertEquals(8, factory.getDupsOKBatchSize());
+      assertEquals(10, factory.getMinLargeMessageSize());
+      assertEquals(11, factory.getProducerMaxRate());
+      assertEquals(12, factory.getConfirmationWindowSize());
+      assertEquals(13, factory.getReconnectAttempts());
+      assertEquals(14, factory.getRetryInterval());
+      assertEquals(15d, factory.getRetryIntervalMultiplier(), 0.000001);
+      assertEquals(16, factory.getScheduledThreadPoolMaxSize());
+      assertEquals(17, factory.getThreadPoolMaxSize());
+      assertEquals(18, factory.getTransactionBatchSize());
+      assertEquals(!ActiveMQClient.DEFAULT_AUTO_GROUP, factory.isAutoGroup());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, factory.isBlockOnAcknowledge());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, factory.isBlockOnNonDurableSend());
+      assertEquals(!ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, factory.isBlockOnDurableSend());
+      assertEquals(!ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE, factory.isPreAcknowledge());
+      assertEquals(!ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, factory.isUseGlobalPools());
    }
 
    @Test
@@ -260,9 +260,9 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
       assertNotSame(factory, defaultFactory);
       DiscoveryGroupConfiguration dc = factory.getServerLocator().getDiscoveryGroupConfiguration();
       UDPBroadcastEndpointFactory udpDg = (UDPBroadcastEndpointFactory) dc.getBroadcastEndpointFactory();
-      assertEquals(udpDg.getLocalBindAddress(), "newAddress");
-      assertEquals(udpDg.getGroupAddress(), "myhost");
-      assertEquals(udpDg.getGroupPort(), 5678);
+      assertEquals("newAddress", udpDg.getLocalBindAddress());
+      assertEquals("myhost", udpDg.getGroupAddress());
+      assertEquals(5678, udpDg.getGroupPort());
    }
 
    @Test
@@ -465,7 +465,7 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
          ActiveMQActivation activation = new ActiveMQActivation(ra, new MessageEndpointFactory(), spec);
 
          activation.start();
-         assertEquals(server.getConnectionCount(), 11, "wrong connection count ");
+         assertEquals(11, server.getConnectionCount(), "wrong connection count ");
          activation.stop();
 
          ra.stop();
@@ -521,7 +521,7 @@ public class ResourceAdapterTest extends ActiveMQTestBase {
          ActiveMQActivation activation = new ActiveMQActivation(ra, new MessageEndpointFactory(), spec);
 
          activation.start();
-         assertEquals(server.getConnectionCount(), 2, "wrong connection count ");
+         assertEquals(2, server.getConnectionCount(), "wrong connection count ");
          activation.stop();
 
          ra.stop();