http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java index 1696063..dc7a62e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java @@ -43,7 +43,7 @@ public class RealNodeManagerTest extends NodeManagerTest { @Override public void performWork(NodeManagerAction... actions) throws Exception { - List<Process> processes = new ArrayList<Process>(); + List<Process> processes = new ArrayList<>(); for (NodeManagerAction action : actions) { Process p = SpawnedVMSupport.spawnVM(NodeManagerAction.class.getName(), "-Xms512m", "-Xmx512m", new String[0], true, true, action.getWork()); processes.add(p);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java index 9021e26..1e2d02e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java @@ -42,7 +42,7 @@ public class BridgeFailoverTest extends MultiServerTestBase { String TARGET_QUEUE = "noCluster.targetQueue"; bridgeConfiguration.setHA(true); - List<String> connectors = new ArrayList<String>(); + List<String> connectors = new ArrayList<>(); connectors.add("target-4"); connectors.add("backup-4"); bridgeConfiguration.setName("Bridge-for-test"); @@ -108,7 +108,7 @@ public class BridgeFailoverTest extends MultiServerTestBase { String TARGET_QUEUE = "noCluster.targetQueue"; bridgeConfiguration.setHA(true); - List<String> connectors = new ArrayList<String>(); + List<String> connectors = new ArrayList<>(); connectors.add("target-4"); connectors.add("backup-4"); bridgeConfiguration.setName("Bridge-for-test"); @@ -213,7 +213,7 @@ public class BridgeFailoverTest extends MultiServerTestBase { String TARGET_QUEUE = "noCluster.targetQueue"; bridgeConfiguration.setHA(true); - List<String> connectors = new ArrayList<String>(); + List<String> connectors = new ArrayList<>(); connectors.add("target-4"); connectors.add("backup-4"); bridgeConfiguration.setName("Bridge-for-test"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java index c74c5fe..e937b26 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java @@ -87,15 +87,15 @@ public class BridgeReconnectTest extends BridgeTestBase { @Before public void setUp() throws Exception { super.setUp(); - server0Params = new HashMap<String, Object>(); - server1Params = new HashMap<String, Object>(); - server2Params = new HashMap<String, Object>(); - connectors = new HashMap<String, TransportConfiguration>(); + server0Params = new HashMap<>(); + server1Params = new HashMap<>(); + server2Params = new HashMap<>(); + connectors = new HashMap<>(); server1 = createActiveMQServer(1, isNetty(), server1Params); server1tc = new TransportConfiguration(getConnector(), server1Params, "server1tc"); connectors.put(server1tc.getName(), server1tc); - staticConnectors = new ArrayList<String>(); + staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); } @@ -136,18 +136,18 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); bridgeConfiguration.setQueueName(queueName); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); server2.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server1.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server0.getConfiguration().setQueueConfigurations(queueConfigs1); server2.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -187,17 +187,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); server2.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -268,17 +268,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); server2.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -333,17 +333,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -421,17 +421,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName).setForwardingAddress(forwardAddress).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setReconnectAttempts(reconnectAttempts).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(confirmationWindowSize).setStaticConnectors(staticConnectors).setPassword(CLUSTER_PASSWORD); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); startServers(); @@ -526,17 +526,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -628,17 +628,17 @@ public class BridgeReconnectTest extends BridgeTestBase { BridgeConfiguration bridgeConfiguration = createBridgeConfig(); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java index bfc134d..99ece87 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java @@ -73,10 +73,10 @@ public class BridgeStartTest extends ActiveMQTestBase { @Test public void testStartStop() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); if (isNetty()) { server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } @@ -91,31 +91,31 @@ public class BridgeStartTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); final String bridgeName = "bridge1"; BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttempts(0).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -220,10 +220,10 @@ public class BridgeStartTest extends ActiveMQTestBase { // shutdown, messages will get resent when it is started, so the dup id cache needs // to be persisted - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); if (isNetty()) { server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } @@ -237,31 +237,31 @@ public class BridgeStartTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); final String bridgeName = "bridge1"; BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(500).setReconnectAttempts(-1).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); ServerLocator locator = null; @@ -406,10 +406,10 @@ public class BridgeStartTest extends ActiveMQTestBase { @Test public void testTargetServerNotAvailableNoReconnectTries() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, false, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); if (isNetty()) { server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } @@ -424,31 +424,31 @@ public class BridgeStartTest extends ActiveMQTestBase { final String queueName1 = "queue1"; ServerLocator locator = null; try { - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); final String bridgeName = "bridge1"; BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttempts(0).setReconnectAttemptsOnSameNode(0).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -538,10 +538,10 @@ public class BridgeStartTest extends ActiveMQTestBase { @Test public void testManualStopStart() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, false, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); if (isNetty()) { server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } @@ -556,31 +556,31 @@ public class BridgeStartTest extends ActiveMQTestBase { final String queueName1 = "queue1"; ServerLocator locator = null; try { - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); final String bridgeName = "bridge1"; BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttempts(1).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java index f0da131..a3c5c6e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java @@ -140,10 +140,10 @@ public class BridgeTest extends ActiveMQTestBase { @Test public void testLargeMessageBridge() throws Exception { long time = System.currentTimeMillis(); - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); @@ -156,7 +156,7 @@ public class BridgeTest extends ActiveMQTestBase { TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); - HashMap<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + HashMap<String, TransportConfiguration> connectors = new HashMap<>(); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); @@ -164,21 +164,21 @@ public class BridgeTest extends ActiveMQTestBase { final int numMessages = 10; - ArrayList<String> connectorConfig = new ArrayList<String>(); + ArrayList<String> connectorConfig = new ArrayList<>(); connectorConfig.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(numMessages * messageSize / 2).setStaticConnectors(connectorConfig); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -245,10 +245,10 @@ public class BridgeTest extends ActiveMQTestBase { public void internaltestSimpleBridge(final boolean largeMessage, final boolean useFiles) throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, useFiles, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, useFiles, server1Params); @@ -262,7 +262,7 @@ public class BridgeTest extends ActiveMQTestBase { TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); - HashMap<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + HashMap<String, TransportConfiguration> connectors = new HashMap<>(); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); @@ -270,21 +270,21 @@ public class BridgeTest extends ActiveMQTestBase { final int numMessages = 10; - ArrayList<String> connectorConfig = new ArrayList<String>(); + ArrayList<String> connectorConfig = new ArrayList<>(); connectorConfig.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(numMessages * messageSize / 2).setStaticConnectors(connectorConfig); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -397,10 +397,10 @@ public class BridgeTest extends ActiveMQTestBase { MyInterceptor myInterceptor = new MyInterceptor(3); - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); @@ -412,7 +412,7 @@ public class BridgeTest extends ActiveMQTestBase { TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); - HashMap<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + HashMap<String, TransportConfiguration> connectors = new HashMap<>(); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); @@ -420,21 +420,21 @@ public class BridgeTest extends ActiveMQTestBase { final int numMessages = 1; - ArrayList<String> connectorConfig = new ArrayList<String>(); + ArrayList<String> connectorConfig = new ArrayList<>(); connectorConfig.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(100).setReconnectAttempts(-1).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(numMessages * messageSize / 2).setStaticConnectors(connectorConfig).setCallTimeout(500); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -555,10 +555,10 @@ public class BridgeTest extends ActiveMQTestBase { final int numMessages = 10; - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, useFiles, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, useFiles, server1Params); @@ -567,7 +567,7 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); @@ -576,21 +576,21 @@ public class BridgeTest extends ActiveMQTestBase { final String filterString = "animal='goat'"; - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setFilterString(filterString).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(0).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -691,10 +691,10 @@ public class BridgeTest extends ActiveMQTestBase { // Created to verify JBPAPP-6057 @Test public void testStartLater() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); @@ -703,23 +703,23 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "jms.queue.forwardAddress"; final String queueName1 = "forwardAddress"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(100).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); @@ -799,10 +799,10 @@ public class BridgeTest extends ActiveMQTestBase { @Test public void testWithDuplicates() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); @@ -811,23 +811,23 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "jms.queue.forwardAddress"; final String queueName1 = "forwardAddress"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(100).setReconnectAttemptsOnSameNode(-1).setConfirmationWindowSize(0).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); @@ -948,10 +948,10 @@ public class BridgeTest extends ActiveMQTestBase { } public void internaltestWithTransformer(final boolean useFiles) throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, false, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, false, server1Params); @@ -960,29 +960,29 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setTransformerClassName(SimpleTransformer.class.getName()).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1052,11 +1052,11 @@ public class BridgeTest extends ActiveMQTestBase { @Test public void testSawtoothLoad() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); server0.getConfiguration().setThreadPoolMaxSize(10); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); ActiveMQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); server1.getConfiguration().setThreadPoolMaxSize(10); @@ -1066,29 +1066,29 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); final TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); final TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(0).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1210,7 +1210,7 @@ public class BridgeTest extends ActiveMQTestBase { } for (int repeat = 0; repeat < totalrepeats; repeat++) { - ArrayList<Thread> threads = new ArrayList<Thread>(); + ArrayList<Thread> threads = new ArrayList<>(); threads.add(new ConsumerThread()); threads.add(new ProducerThread(numMessages / 2)); @@ -1257,10 +1257,10 @@ public class BridgeTest extends ActiveMQTestBase { final int PAGE_SIZE = 1 * 1024; try { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, PAGE_SIZE, PAGE_MAX, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, PAGE_SIZE, PAGE_MAX, server1Params); server1.getConfiguration().setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10); @@ -1270,7 +1270,7 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); @@ -1280,7 +1280,7 @@ public class BridgeTest extends ActiveMQTestBase { server0.getConfiguration().setIDCacheSize(20000).setJournalBufferTimeout_NIO(10).setJournalBufferTimeout_AIO(10); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1).setStaticConnectors(staticConnectors); @@ -1289,21 +1289,21 @@ public class BridgeTest extends ActiveMQTestBase { bridgeConfiguration.setUseDuplicateDetection(true); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); - List<String> interceptorToStop = new ArrayList<String>(); + List<String> interceptorToStop = new ArrayList<>(); interceptorToStop.add(StopInterceptor.class.getName()); server1.getConfiguration().setIncomingInterceptorClassNames(interceptorToStop); @@ -1354,7 +1354,7 @@ public class BridgeTest extends ActiveMQTestBase { // Restarting the server server0.start(); - HashMap<Integer, AtomicInteger> receivedMsg = new HashMap<Integer, AtomicInteger>(); + HashMap<Integer, AtomicInteger> receivedMsg = new HashMap<>(); for (int i = 0; i < numMessages; i++) { ClientMessage message = consumer1.receive(5000); @@ -1498,10 +1498,10 @@ public class BridgeTest extends ActiveMQTestBase { ServerLocator locator = null; try { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, true, PAGE_SIZE, PAGE_MAX, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); @@ -1510,7 +1510,7 @@ public class BridgeTest extends ActiveMQTestBase { final String forwardAddress = "forwardAddress"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); @@ -1518,22 +1518,22 @@ public class BridgeTest extends ActiveMQTestBase { server0.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1622,10 +1622,10 @@ public class BridgeTest extends ActiveMQTestBase { @Test public void testNullForwardingAddress() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); server0 = createClusteredServerWithParams(isNetty(), 0, false, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); addTargetParameters(server1Params); server1 = createClusteredServerWithParams(isNetty(), 1, false, server1Params); @@ -1633,7 +1633,7 @@ public class BridgeTest extends ActiveMQTestBase { final String queueName0 = "queue0"; final String queueName1 = "queue1"; - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); @@ -1645,23 +1645,23 @@ public class BridgeTest extends ActiveMQTestBase { final int numMessages = 10; - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); // do not set forwarding address (defaults to null) to use messages' original address BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(numMessages * messageSize / 2).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); // on server #1, we bind queueName1 to same address testAddress CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1757,15 +1757,15 @@ public class BridgeTest extends ActiveMQTestBase { SequentialFileFactory messagesFF = new NIOSequentialFileFactory(serverToInvestigate.getConfiguration().getJournalLocation(), 1); JournalImpl messagesJournal = new JournalImpl(serverToInvestigate.getConfiguration().getJournalFileSize(), serverToInvestigate.getConfiguration().getJournalMinFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); - List<RecordInfo> records = new LinkedList<RecordInfo>(); + List<RecordInfo> records = new LinkedList<>(); - List<PreparedTransactionInfo> preparedTransactions = new LinkedList<PreparedTransactionInfo>(); + List<PreparedTransactionInfo> preparedTransactions = new LinkedList<>(); messagesJournal.start(); messagesJournal.load(records, preparedTransactions, null); // These are more immutable integers - Map<Long, AtomicInteger> messageRefCounts = new HashMap<Long, AtomicInteger>(); + Map<Long, AtomicInteger> messageRefCounts = new HashMap<>(); for (RecordInfo info : records) { Object o = DescribeJournal.newObjectEncoding(info); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java index e65ec99..b09d355 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java @@ -70,10 +70,10 @@ public class BridgeWithDiscoveryGroupStartTest extends ActiveMQTestBase { @Test public void testStartStop() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer server0 = createClusteredServerWithParams(isNetty(), 0, true, server0Params); - Map<String, Object> server1Params = new HashMap<String, Object>(); + Map<String, Object> server1Params = new HashMap<>(); if (isNetty()) { server1Params.put("port", TransportConstants.DEFAULT_PORT + 1); } @@ -83,7 +83,7 @@ public class BridgeWithDiscoveryGroupStartTest extends ActiveMQTestBase { ActiveMQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); ServerLocator locator = null; try { - Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>(); + Map<String, TransportConfiguration> connectors = new HashMap<>(); TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params); TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); @@ -98,7 +98,7 @@ public class BridgeWithDiscoveryGroupStartTest extends ActiveMQTestBase { final String groupAddress = getUDPDiscoveryAddress(); final int port = getUDPDiscoveryPort(); - ArrayList<String> list = new ArrayList<String>(); + ArrayList<String> list = new ArrayList<>(); list.add(server1tc.getName()); UDPBroadcastEndpointFactory endpoint = new UDPBroadcastEndpointFactory().setGroupAddress(groupAddress).setGroupPort(port); @@ -113,21 +113,21 @@ public class BridgeWithDiscoveryGroupStartTest extends ActiveMQTestBase { final String bridgeName = "bridge1"; - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(bridgeName).setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttempts(0).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration().setAddress(testAddress).setName(queueName0); - List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration().setAddress(forwardAddress).setName(queueName1); - List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java index d6b836b..7c3be5e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java @@ -825,7 +825,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { final int msgStart, final int msgEnd, final int... consumerIDs) throws Exception { - HashMap<SimpleString, Integer> groupIdsReceived = new HashMap<SimpleString, Integer>(); + HashMap<SimpleString, Integer> groupIdsReceived = new HashMap<>(); for (int i = 0; i < consumerIDs.length; i++) { ConsumerHolder holder = consumers[consumerIDs[i]]; @@ -1096,7 +1096,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { // First get one from each consumer to determine the order, then we sort them in this order - List<OrderedConsumerHolder> sorted = new ArrayList<OrderedConsumerHolder>(); + List<OrderedConsumerHolder> sorted = new ArrayList<>(); for (int consumerID : consumerIDs) { ConsumerHolder holder = consumers[consumerID]; @@ -1167,9 +1167,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { protected void verifyReceiveRoundRobinInSomeOrderWithCounts(final boolean ack, final int[] messageCounts, final int... consumerIDs) throws Exception { - List<LinkedList<Integer>> receivedCounts = new ArrayList<LinkedList<Integer>>(); + List<LinkedList<Integer>> receivedCounts = new ArrayList<>(); - Set<Integer> counts = new HashSet<Integer>(); + Set<Integer> counts = new HashSet<>(); for (int consumerID : consumerIDs) { ConsumerHolder holder = consumers[consumerID]; @@ -1178,7 +1178,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { throw new IllegalArgumentException("No consumer at " + consumerID); } - LinkedList<Integer> list = new LinkedList<Integer>(); + LinkedList<Integer> list = new LinkedList<>(); receivedCounts.add(list); @@ -1275,7 +1275,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { throw new IllegalArgumentException("No consumer at " + consumerID); } - List<Integer> ints = new ArrayList<Integer>(); + List<Integer> ints = new ArrayList<>(); ClientMessage message = null; @@ -1539,7 +1539,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { TransportConfiguration connector = createTransportConfiguration(netty, false, params); - List<String> connectorPairs = new ArrayList<String>(); + List<String> connectorPairs = new ArrayList<>(); connectorPairs.add(connector.getName()); UDPBroadcastEndpointFactory endpoint = new UDPBroadcastEndpointFactory().setGroupAddress(groupAddress).setGroupPort(port); @@ -1587,7 +1587,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { TransportConfiguration connector = createTransportConfiguration(netty, false, params); - List<String> connectorPairs = new ArrayList<String>(); + List<String> connectorPairs = new ArrayList<>(); connectorPairs.add(connector.getName()); UDPBroadcastEndpointFactory endpoint = new UDPBroadcastEndpointFactory().setGroupAddress(groupAddress).setGroupPort(port); @@ -1647,7 +1647,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { if (nodeTo != -1) { TransportConfiguration serverTotc = createTransportConfiguration(netty, false, generateParams(nodeTo, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); - pairs = new ArrayList<String>(); + pairs = new ArrayList<>(); pairs.add(serverTotc.getName()); } Configuration config = serverFrom.getConfiguration(); @@ -1681,7 +1681,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { if (nodeTo != -1) { TransportConfiguration serverTotc = createTransportConfiguration(netty, false, generateParams(nodeTo, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); - pairs = new ArrayList<String>(); + pairs = new ArrayList<>(); pairs.add(serverTotc.getName()); } Configuration config = serverFrom.getConfiguration(); @@ -1707,7 +1707,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { TransportConfiguration connectorFrom = createTransportConfiguration(netty, false, generateParams(nodeFrom, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(connectorFrom.getName(), connectorFrom); - List<String> pairs = new ArrayList<String>(); + List<String> pairs = new ArrayList<>(); for (int element : nodesTo) { TransportConfiguration serverTotc = createTransportConfiguration(netty, false, generateParams(element, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); @@ -1737,7 +1737,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { TransportConfiguration connectorFrom = createTransportConfiguration(netty, false, generateParams(nodeFrom, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(connectorFrom.getName(), connectorFrom); - List<String> pairs = new ArrayList<String>(); + List<String> pairs = new ArrayList<>(); for (int element : nodesTo) { TransportConfiguration serverTotc = createTransportConfiguration(netty, false, generateParams(element, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); @@ -1775,7 +1775,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { TransportConfiguration connectorFrom = createTransportConfiguration(netty, false, generateParams(nodeFrom, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(name, connectorFrom); - List<String> pairs = new ArrayList<String>(); + List<String> pairs = new ArrayList<>(); for (int element : nodesTo) { TransportConfiguration serverTotc = createTransportConfiguration(netty, false, generateParams(element, netty)); serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java index 9472202..f2f3f3c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java @@ -526,7 +526,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { final ClientSession session = addClientSession(sf1.createSession(false, false, false)); final ClientProducer producer = addClientProducer(session.createProducer(ADDRESS)); - List<String> groups = new ArrayList<String>(); + List<String> groups = new ArrayList<>(); final AtomicInteger totalMessageProduced = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java index 7d36cc2..2b00104 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java @@ -489,7 +489,7 @@ public class MessageRedistributionTest extends ClusterTestBase { session0.start(); - ArrayList<Xid> xids = new ArrayList<Xid>(); + ArrayList<Xid> xids = new ArrayList<>(); for (int i = 0; i < 100; i++) { Xid xid = newXID(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java index 32c2c32..9730880 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java @@ -102,7 +102,7 @@ public class MessageRedistributionWithDiscoveryTest extends ClusterTestBase { session0.start(); - ArrayList<Xid> xids = new ArrayList<Xid>(); + ArrayList<Xid> xids = new ArrayList<>(); for (int i = 0; i < 100; i++) { Xid xid = newXID(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java index 770c538..f7a6d25 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java @@ -102,7 +102,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase { volatile boolean failed; - ArrayList<Throwable> errors = new ArrayList<Throwable>(); + ArrayList<Throwable> errors = new ArrayList<>(); boolean isFailed() { return failed; @@ -287,7 +287,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase { session.start(); - List<Integer> counts = new ArrayList<Integer>(1000); + List<Integer> counts = new ArrayList<>(1000); int lastCount = -1; boolean counterGap = false; while (true) { @@ -408,7 +408,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase { ClientConsumer consumer = null; do { - ArrayList<Integer> msgs = new ArrayList<Integer>(); + ArrayList<Integer> msgs = new ArrayList<>(); try { if (consumer == null) { consumer = session.createConsumer(FailoverTestBase.ADDRESS); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java index be5870e..56cb74c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java @@ -336,7 +336,7 @@ public class BackupSyncJournalTest extends FailoverTestBase { } private Set<Pair<Long, Integer>> getFileIds(JournalImpl journal) { - Set<Pair<Long, Integer>> results = new HashSet<Pair<Long, Integer>>(); + Set<Pair<Long, Integer>> results = new HashSet<>(); for (JournalFile jf : journal.getDataFiles()) { results.add(getPair(jf)); } @@ -349,7 +349,7 @@ public class BackupSyncJournalTest extends FailoverTestBase { * @return */ private Pair<Long, Integer> getPair(JournalFile jf) { - return new Pair<Long, Integer>(jf.getFileID(), jf.getPosCount()); + return new Pair<>(jf.getFileID(), jf.getPosCount()); } static JournalImpl getMessageJournalFromServer(TestableServer server) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java index 7f70d30..2e5ec8a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java @@ -161,7 +161,7 @@ public class BackupSyncLargeMessageTest extends BackupSyncJournalTest { } private Set<Long> getAllMessageFileIds(File dir) { - Set<Long> idsOnBkp = new TreeSet<Long>(); + Set<Long> idsOnBkp = new TreeSet<>(); String[] fileList = dir.list(); if (fileList != null) { for (String filename : fileList) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java index 052544b..c69b67f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java @@ -43,7 +43,7 @@ public class BackupSyncPagingTest extends BackupSyncJournalTest { final Configuration configuration, final NodeManager nodeManager, int id) { - Map<String, AddressSettings> conf = new HashMap<String, AddressSettings>(); + Map<String, AddressSettings> conf = new HashMap<>(); AddressSettings as = new AddressSettings().setMaxSizeBytes(PAGE_MAX).setPageSizeBytes(PAGE_SIZE).setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); conf.put(ADDRESS.toString(), as); return createInVMFailoverServer(realFiles, configuration, PAGE_SIZE, PAGE_MAX, conf, nodeManager, id); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java index d3b106f..a71adeb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java @@ -286,7 +286,7 @@ public abstract class ClusterWithBackupFailoverTestBase extends ClusterTestBase } private ClientSession[] exploreSessions(final int node) { - HashSet<ClientSession> sessions = new HashSet<ClientSession>(); + HashSet<ClientSession> sessions = new HashSet<>(); for (ConsumerHolder holder : consumers) { if (holder != null && holder.getNode() == node && holder.getSession() != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java index 2088748..dca12ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java @@ -249,7 +249,7 @@ public class FailoverListenerTest extends FailoverTestBase { public class SessionFactoryFailoverListener implements FailoverEventListener { - private final ArrayList<FailoverEventType> failoverTypeEvent = new ArrayList<FailoverEventType>(); + private final ArrayList<FailoverEventType> failoverTypeEvent = new ArrayList<>(); private final CountDownLatch failureLatch; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java index a83f5a0..2fcd6e1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java @@ -44,7 +44,7 @@ public class FailoverOnFlowControlTest extends FailoverTestBase { @Test public void testOverflowSend() throws Exception { ServerLocator locator = getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(-1).setProducerWindowSize(1000).setRetryInterval(123); - final ArrayList<ClientSession> sessionList = new ArrayList<ClientSession>(); + final ArrayList<ClientSession> sessionList = new ArrayList<>(); Interceptor interceptorClient = new Interceptor() { AtomicInteger count = new AtomicInteger(0);
