http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java index f4775cc..f29680f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.java @@ -60,9 +60,9 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testMessageDeleiveredWhenNonBlockingEnabled() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> afterRollback = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); + final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<>(); + final LinkedHashSet<Message> afterRollback = new LinkedHashSet<>(); Connection connection = connectionFactory.createConnection(); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); @@ -112,9 +112,9 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testMessageDeleiveredInCorrectOrder() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> afterRollback = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); + final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<>(); + final LinkedHashSet<Message> afterRollback = new LinkedHashSet<>(); Connection connection = connectionFactory.createConnection(); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); @@ -178,9 +178,9 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testMessageDeleiveryDoesntStop() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> afterRollback = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); + final LinkedHashSet<Message> beforeRollback = new LinkedHashSet<>(); + final LinkedHashSet<Message> afterRollback = new LinkedHashSet<>(); Connection connection = connectionFactory.createConnection(); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); @@ -229,7 +229,7 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testNonBlockingMessageDeleiveryIsDelayed() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection(); connection.getRedeliveryPolicy().setInitialRedeliveryDelay(TimeUnit.SECONDS.toMillis(6)); @@ -271,7 +271,7 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testNonBlockingMessageDeleiveryWithRollbacks() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection(); final Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); @@ -343,8 +343,8 @@ public class NonBlockingConsumerRedeliveryTest { @Test public void testNonBlockingMessageDeleiveryWithAllRolledBack() throws Exception { - final LinkedHashSet<Message> received = new LinkedHashSet<Message>(); - final LinkedHashSet<Message> dlqed = new LinkedHashSet<Message>(); + final LinkedHashSet<Message> received = new LinkedHashSet<>(); + final LinkedHashSet<Message> dlqed = new LinkedHashSet<>(); ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection(); connection.getRedeliveryPolicy().setMaximumRedeliveries(5);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java index ab21c0b..67e9101 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java @@ -44,7 +44,7 @@ public class ObjectMessageNotSerializableTest extends CombinationTestSupport { BrokerService broker; AtomicInteger numReceived = new AtomicInteger(0); - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); public static Test suite() { return suite(ObjectMessageNotSerializableTest.class); @@ -138,7 +138,7 @@ public class ObjectMessageNotSerializableTest extends CombinationTestSupport { final MyObject obj = new MyObject("A message"); final CountDownLatch consumerStarted = new CountDownLatch(3); - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); Thread vmConsumerThread = new Thread("Consumer Thread") { @Override public void run() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java index 1c8f7af..18c19f5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java @@ -149,7 +149,7 @@ public class QueueDuplicatesTest extends TestCase { private static class SimpleConsumer implements MessageListener { - private Map<String, Message> msgs = new HashMap<String, Message>(); + private Map<String, Message> msgs = new HashMap<>(); @Override public void onMessage(Message message) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java index 316f4f6..e1f1d21 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.java @@ -87,7 +87,7 @@ public class QueueMemoryFullMultiBrokersTest extends JmsMultipleBrokersTestSuppo memoryManager.getMemoryUsage().setLimit(1024 * 50); // 50 MB broker.setSystemUsage(memoryManager); - final List<PolicyEntry> policyEntries = new ArrayList<PolicyEntry>(); + final List<PolicyEntry> policyEntries = new ArrayList<>(); final PolicyEntry entry = new PolicyEntry(); entry.setQueue(">"); entry.setMemoryLimit(1024 * 4); // Set to 2 kb http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java index 593c921..54781ee 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java @@ -53,7 +53,7 @@ public class RequestReplyNoAdvisoryNetworkTest extends JmsMultipleBrokersTestSup private static final transient Logger LOG = LoggerFactory.getLogger(RequestReplyNoAdvisoryNetworkTest.class); - Vector<BrokerService> brokers = new Vector<BrokerService>(); + Vector<BrokerService> brokers = new Vector<>(); BrokerService a, b; ActiveMQQueue sendQ = new ActiveMQQueue("sendQ"); static final String connectionIdMarker = "ID:marker."; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyTempDestRemovalAdvisoryRaceTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyTempDestRemovalAdvisoryRaceTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyTempDestRemovalAdvisoryRaceTest.java index c3a15b3..9211bf2 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyTempDestRemovalAdvisoryRaceTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyTempDestRemovalAdvisoryRaceTest.java @@ -85,8 +85,8 @@ public class RequestReplyTempDestRemovalAdvisoryRaceTest extends JmsMultipleBrok final AtomicLong forwardFailures = new AtomicLong(0); protected final AtomicBoolean shutdown = new AtomicBoolean(false); - HashSet<NetworkConnector> networkConnectors = new HashSet<NetworkConnector>(); - HashSet<Connection> advisoryConsumerConnections = new HashSet<Connection>(); + HashSet<NetworkConnector> networkConnectors = new HashSet<>(); + HashSet<Connection> advisoryConsumerConnections = new HashSet<>(); Appender slowDownAppender; CountDownLatch consumerDemandExists; @@ -117,7 +117,7 @@ public class RequestReplyTempDestRemovalAdvisoryRaceTest extends JmsMultipleBrok waitForBridgeFormation(1); - HashSet<NetworkBridge> bridgesStart = new HashSet<NetworkBridge>(); + HashSet<NetworkBridge> bridgesStart = new HashSet<>(); for (NetworkConnector networkConnector : networkConnectors) { bridgesStart.addAll(networkConnector.activeBridges()); } @@ -150,7 +150,7 @@ public class RequestReplyTempDestRemovalAdvisoryRaceTest extends JmsMultipleBrok LOG.info("shutting down"); shutdown.compareAndSet(false, true); - HashSet<NetworkBridge> bridgesEnd = new HashSet<NetworkBridge>(); + HashSet<NetworkBridge> bridgesEnd = new HashSet<>(); for (NetworkConnector networkConnector : networkConnectors) { bridgesEnd.addAll(networkConnector.activeBridges()); } @@ -203,7 +203,7 @@ public class RequestReplyTempDestRemovalAdvisoryRaceTest extends JmsMultipleBrok waitForBridgeFormation(1); - HashSet<NetworkBridge> bridgesStart = new HashSet<NetworkBridge>(); + HashSet<NetworkBridge> bridgesStart = new HashSet<>(); for (NetworkConnector networkConnector : networkConnectors) { bridgesStart.addAll(networkConnector.activeBridges()); } @@ -235,7 +235,7 @@ public class RequestReplyTempDestRemovalAdvisoryRaceTest extends JmsMultipleBrok LOG.info("shutting down"); shutdown.compareAndSet(false, true); - HashSet<NetworkBridge> bridgesEnd = new HashSet<NetworkBridge>(); + HashSet<NetworkBridge> bridgesEnd = new HashSet<>(); for (NetworkConnector networkConnector : networkConnectors) { bridgesEnd.addAll(networkConnector.activeBridges()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyToTopicViaThreeNetworkHopsTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyToTopicViaThreeNetworkHopsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyToTopicViaThreeNetworkHopsTest.java index 787312f..001142e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyToTopicViaThreeNetworkHopsTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/RequestReplyToTopicViaThreeNetworkHopsTest.java @@ -619,7 +619,7 @@ public class RequestReplyToTopicViaThreeNetworkHopsTest { excl_dest = ActiveMQDestination.createDestination(">", ActiveMQDestination.QUEUE_TYPE); } - excludes = new ArrayList<ActiveMQDestination>(); + excludes = new ArrayList<>(); excludes.add(excl_dest); nw_conn.setExcludedDestinations(excludes); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java index a7b020a..9c0a205 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java @@ -130,7 +130,7 @@ public class ThreeBrokerQueueNetworkTest extends JmsMultipleBrokersTestSupport { Destination dest = createDestination("TEST.FOO", false); // Send messages for broker A - HashMap<String, Object> props = new HashMap<String, Object>(); + HashMap<String, Object> props = new HashMap<>(); props.put("broker", "BROKER_A"); sendMessages("BrokerB", dest, MESSAGE_COUNT, props); @@ -176,7 +176,7 @@ public class ThreeBrokerQueueNetworkTest extends JmsMultipleBrokersTestSupport { Thread.sleep(2000); //et subscriptions get propagated // Send messages for broker A - HashMap<String, Object> props = new HashMap<String, Object>(); + HashMap<String, Object> props = new HashMap<>(); props.put("broker", "BROKER_A"); sendMessages("BrokerB", dest, MESSAGE_COUNT, props); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java index c78530c..93baeca 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java @@ -68,6 +68,6 @@ public class ThreeBrokerQueueNetworkUsingTcpTest extends ThreeBrokerQueueNetwork public void setUp() throws Exception { super.setUp(); - bridges = new ArrayList<DemandForwardingBridge>(); + bridges = new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java index 73a4b10..381ae05 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java @@ -109,7 +109,7 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport { Thread.sleep(2000); // Send messages // Send messages for broker A - HashMap<String, Object> props = new HashMap<String, Object>(); + HashMap<String, Object> props = new HashMap<>(); props.put("dummy", 33); sendMessages("BrokerA", dest, MESSAGE_COUNT, props); props.put("dummy", 34); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java index 110b880..848193a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java @@ -68,6 +68,6 @@ public class ThreeBrokerTopicNetworkUsingTcpTest extends ThreeBrokerTopicNetwork public void setUp() throws Exception { super.setUp(); - bridges = new ArrayList<DemandForwardingBridge>(); + bridges = new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java index 2384aa6..b1e1db6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicDurableConnectStatsTest.java @@ -52,7 +52,7 @@ public class TopicDurableConnectStatsTest extends org.apache.activemq.TestSuppor private static final Logger LOG = LoggerFactory.getLogger(TopicDurableConnectStatsTest.class); private BrokerService broker; private ActiveMQTopic topic; - private final Vector<Throwable> exceptions = new Vector<Throwable>(); + private final Vector<Throwable> exceptions = new Vector<>(); private final int messageSize = 4000; protected MBeanServerConnection mbeanServer; protected String domain = "org.apache.activemq"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java index 2421107..0978480 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java @@ -57,10 +57,10 @@ public final class TransactionRollbackOrderTest extends TestCase { private Connection connection; private CountDownLatch latch = new CountDownLatch(1); private int numMessages = 5; - private List<String> msgSent = new ArrayList<String>(); - private List<String> msgCommitted = new ArrayList<String>(); - private List<String> msgRolledBack = new ArrayList<String>(); - private List<String> msgRedelivered = new ArrayList<String>(); + private List<String> msgSent = new ArrayList<>(); + private List<String> msgCommitted = new ArrayList<>(); + private List<String> msgRolledBack = new ArrayList<>(); + private List<String> msgRedelivered = new ArrayList<>(); public void testTransaction() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java index eeee147..361f514 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java @@ -40,7 +40,7 @@ public class TwoBrokerTopicSendReceiveTest extends JmsTopicSendReceiveWithTwoCon protected ActiveMQConnectionFactory sendFactory; protected ActiveMQConnectionFactory receiveFactory; - protected HashMap<String, BrokerService> brokers = new HashMap<String, BrokerService>(); + protected HashMap<String, BrokerService> brokers = new HashMap<>(); @Override protected void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java index 4abe687..7c042b9 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java @@ -170,7 +170,7 @@ public class TwoBrokerVirtualTopicForwardingTest extends JmsMultipleBrokersTestS NetworkConnector bridge = bridgeBrokers(local, remote); bridge.setDecreaseNetworkConsumerPriority(true); - LinkedList<ActiveMQDestination> excludedDestinations = new LinkedList<ActiveMQDestination>(); + LinkedList<ActiveMQDestination> excludedDestinations = new LinkedList<>(); excludedDestinations.add(new ActiveMQQueue("Consumer.*.VirtualTopic.>")); bridge.setExcludedDestinations(excludedDestinations); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java index 876da5c..cfeef5c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java @@ -81,7 +81,7 @@ public class UnlimitedEnqueueTest { brokerService.getSystemUsage().getTempUsage().setLimit((numMessages * payLoadSize) + (1000 * payLoadSize)); PolicyMap policyMap = new PolicyMap(); - List<PolicyEntry> entries = new ArrayList<PolicyEntry>(); + List<PolicyEntry> entries = new ArrayList<>(); PolicyEntry policy = new PolicyEntry(); // NB: ensure queue cursor limit is below the default 70% usage that the destination will use http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java index 5ba78d0..5c9a3bf 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java @@ -53,7 +53,7 @@ public class VerifyNetworkConsumersDisconnectTest extends JmsMultipleBrokersTest public static final int TIMEOUT = 30000; protected Map<String, MessageConsumer> consumerMap; - final Map<Thread, Throwable> unhandledExceptions = new HashMap<Thread, Throwable>(); + final Map<Thread, Throwable> unhandledExceptions = new HashMap<>(); private void assertNoUnhandledExceptions() { for (Entry<Thread, Throwable> e : unhandledExceptions.entrySet()) { @@ -220,7 +220,7 @@ public class VerifyNetworkConsumersDisconnectTest extends JmsMultipleBrokersTest QueueViewMBean queueViewMBean = (QueueViewMBean) context.newProxyInstance(brokers.get(brokerName).broker.getAdminView().getQueues()[0], QueueViewMBean.class, false); long currentCount = queueViewMBean.getConsumerCount(); LOG.info("On " + brokerName + " current consumer count for " + queueViewMBean + ", " + currentCount); - LinkedList<String> consumerIds = new LinkedList<String>(); + LinkedList<String> consumerIds = new LinkedList<>(); for (ObjectName objectName : queueViewMBean.getSubscriptions()) { consumerIds.add(objectName.getKeyProperty("consumerId")); } @@ -254,7 +254,7 @@ public class VerifyNetworkConsumersDisconnectTest extends JmsMultipleBrokersTest createBroker(new URI("broker:(tcp://localhost:6161" + i + ")/Broker" + i + "?persistent=false&useJmx=true&brokerId=Broker" + i)); } - consumerMap = new LinkedHashMap<String, MessageConsumer>(); + consumerMap = new LinkedHashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java index 828449f..8b87de5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java @@ -41,7 +41,7 @@ public class MessageIdList extends Assert implements MessageListener { private static final Logger LOG = LoggerFactory.getLogger(MessageIdList.class); - private final List<String> messageIds = new ArrayList<String>(); + private final List<String> messageIds = new ArrayList<>(); private final Object semaphore; private boolean verbose; private MessageListener parent; @@ -86,7 +86,7 @@ public class MessageIdList extends Assert implements MessageListener { */ public List<String> flushMessages() { synchronized (semaphore) { - List<String> answer = new ArrayList<String>(messageIds); + List<String> answer = new ArrayList<>(messageIds); messageIds.clear(); return answer; } @@ -94,7 +94,7 @@ public class MessageIdList extends Assert implements MessageListener { public synchronized List<String> getMessageIds() { synchronized (semaphore) { - return new ArrayList<String>(messageIds); + return new ArrayList<>(messageIds); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java index 43a585f..0f4b902 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java @@ -31,9 +31,9 @@ import org.apache.activemq.command.ActiveMQTopic; public class ReflectionSupportTest extends TestCase { - List<ActiveMQDestination> favorites = new ArrayList<ActiveMQDestination>(); + List<ActiveMQDestination> favorites = new ArrayList<>(); String favoritesString = "[queue://test, topic://test]"; - List<ActiveMQDestination> nonFavorites = new ArrayList<ActiveMQDestination>(); + List<ActiveMQDestination> nonFavorites = new ArrayList<>(); String nonFavoritesString = "[topic://test1]"; @Override @@ -45,7 +45,7 @@ public class ReflectionSupportTest extends TestCase { public void testSetProperties() throws URISyntaxException { SimplePojo pojo = new SimplePojo(); - HashMap<String, String> map = new HashMap<String, String>(); + HashMap<String, String> map = new HashMap<>(); map.put("age", "27"); map.put("name", "Hiram"); map.put("enabled", "true"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/SimplePojo.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/SimplePojo.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/SimplePojo.java index b0ba089..a1f9ed3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/SimplePojo.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/SimplePojo.java @@ -28,9 +28,9 @@ public class SimplePojo { int age; boolean enabled; URI uri; - List<ActiveMQDestination> favorites = new ArrayList<ActiveMQDestination>(); - List<ActiveMQDestination> nonFavorites = new ArrayList<ActiveMQDestination>(); - List<ActiveMQDestination> others = new ArrayList<ActiveMQDestination>(); + List<ActiveMQDestination> favorites = new ArrayList<>(); + List<ActiveMQDestination> nonFavorites = new ArrayList<>(); + List<ActiveMQDestination> others = new ArrayList<>(); String[] systems; public int getAge() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java index 734cd1c..e3001a2 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java @@ -49,7 +49,7 @@ public class ManagementContextXBeanConfigTest extends TestCase { assertEquals(2011, brokerService.getManagementContext().getConnectorPort()); assertEquals("test.domain", brokerService.getManagementContext().getJmxDomainName()); // Make sure the broker is registered in the right jmx domain. - Hashtable<String, String> map = new Hashtable<String, String>(); + Hashtable<String, String> map = new Hashtable<>(); map.put("type", "Broker"); map.put("brokerName", JMXSupport.encodeObjectNamePart("localhost")); ObjectName on = new ObjectName("test.domain", map); @@ -59,7 +59,7 @@ public class ManagementContextXBeanConfigTest extends TestCase { public void testSuccessAuthentication() throws Exception { JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:2011/jmxrmi"); - Map<String, Object> env = new HashMap<String, Object>(); + Map<String, Object> env = new HashMap<>(); env.put(JMXConnector.CREDENTIALS, new String[]{"admin", "activemq"}); JMXConnector connector = JMXConnectorFactory.connect(url, env); assertAuthentication(connector); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java index 8f835de..20d3722 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java @@ -64,10 +64,10 @@ public class BridgeServerLocatorConfigurationTest extends ActiveMQTestBase { * It the overrides the return value to be the value of the connection ttl. Note that the unused String parameter is required to * ensure that byteman populates the $1 variable, otherwise it will not bind correctly. */ public void testConnectionTTLOnBridge() throws Exception { - Map<String, Object> server0Params = new HashMap<String, Object>(); + Map<String, Object> server0Params = new HashMap<>(); ActiveMQServer serverWithBridge = 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); } @@ -82,28 +82,28 @@ public class BridgeServerLocatorConfigurationTest 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 server1tc = new TransportConfiguration(getConnector(), server1Params); connectors.put(server1tc.getName(), server1tc); serverWithBridge.getConfiguration().setConnectorConfigurations(connectors); - ArrayList<String> staticConnectors = new ArrayList<String>(); + ArrayList<String> staticConnectors = new ArrayList<>(); staticConnectors.add(server1tc.getName()); BridgeConfiguration bridgeConfiguration = new BridgeConfiguration().setName(BRIDGE_NAME).setQueueName(queueName0).setForwardingAddress(forwardAddress).setConnectionTTL(BRIDGE_TTL).setRetryInterval(1000).setReconnectAttempts(0).setReconnectAttemptsOnSameNode(0).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors); - List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<>(); bridgeConfigs.add(bridgeConfiguration); serverWithBridge.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); serverWithBridge.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/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java index 946be53..5b2dd0d 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java @@ -138,7 +138,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { System.out.println("....."); - final List<ServerSession> serverSessions = new LinkedList<ServerSession>(); + final List<ServerSession> serverSessions = new LinkedList<>(); // We will force now the failure simultaneously from several places for (ServerSession srvSess : server.getSessions()) { @@ -150,7 +150,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { resetLatches(2); // from Transactional reaper - List<Thread> threads = new LinkedList<Thread>(); + List<Thread> threads = new LinkedList<>(); threads.add(new Thread("ConsumerCloser") { @Override @@ -219,7 +219,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = session.createConsumer(queue); - HashMap<Integer, AtomicInteger> mapCount = new HashMap<Integer, AtomicInteger>(); + HashMap<Integer, AtomicInteger> mapCount = new HashMap<>(); while (true) { TextMessage message = (TextMessage) consumer.receiveNoWait(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java index 361cbc7..2c47bf0 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java @@ -50,7 +50,7 @@ public class HierarchicalObjectRepositoryTest { latch = new CountDownLatch(1); latch2 = new CountDownLatch(1); executor = Executors.newSingleThreadExecutor(); - repo = new HierarchicalObjectRepository<String>(); + repo = new HierarchicalObjectRepository<>(); addToRepo(repo, A); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java index 2e37e56..5d7f5cd 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java @@ -132,7 +132,7 @@ public class MessageCopyTest { } } - ArrayList<Thread> threads = new ArrayList<Thread>(); + ArrayList<Thread> threads = new ArrayList<>(); for (int i = 0; i < T1_number; i++) { T1 t = new T1(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java index 0372878..cfd481c 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java @@ -76,7 +76,7 @@ public class PagingLeakTest extends ActiveMQTestBase { public void testValidateLeak() throws Throwable { System.out.println("location::" + getBindingsDir()); - List<PagePositionImpl> positions = new ArrayList<PagePositionImpl>(); + List<PagePositionImpl> positions = new ArrayList<>(); for (int i = 0; i < 300; i++) { positions.add(new PagePositionImpl(3, 3)); @@ -100,7 +100,7 @@ public class PagingLeakTest extends ActiveMQTestBase { // This is just to validate the rules are correctly applied on byteman assertEquals("You have changed something on PagePositionImpl in such way that these byteman rules are no longer working", 0, pagePosInstances.get()); - final ArrayList<Exception> errors = new ArrayList<Exception>(); + final ArrayList<Exception> errors = new ArrayList<>(); // A backup that will be waiting to be activated Configuration config = createDefaultNettyConfig(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java index e4317fb..4ed91c0 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java @@ -117,7 +117,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase { jmsServer0.setRegistry(new JndiBindingRegistry(context0)); jmsServer0.start(); - params1 = new HashMap<String, Object>(); + params1 = new HashMap<>(); params1.put(TransportConstants.SERVER_ID_PROP_NAME, 1); Configuration conf1 = createBasicConfig().setJournalDirectory(getJournalDir(1, false)).setBindingsDirectory(getBindingsDir(1, false)).addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params1)); @@ -388,7 +388,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase { // Consume the messages - Set<String> msgs = new HashSet<String>(); + Set<String> msgs = new HashSet<>(); int count = 0; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java index b1565d8..fe86bbd 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java @@ -66,7 +66,7 @@ public abstract class ClusteredBridgeTestBase extends ActiveMQTestBase { private static int index = 0; - protected Map<String, ServerGroup> groups = new HashMap<String, ServerGroup>(); + protected Map<String, ServerGroup> groups = new HashMap<>(); @Override @Before @@ -137,11 +137,11 @@ public abstract class ClusteredBridgeTestBase extends ActiveMQTestBase { } public void create() throws Exception { - Map<String, Object> params0 = new HashMap<String, Object>(); + Map<String, Object> params0 = new HashMap<>(); params0.put(TransportConstants.SERVER_ID_PROP_NAME, id); liveConnector = new TransportConfiguration(INVM_CONNECTOR_FACTORY, params0, "in-vm-live"); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put(TransportConstants.SERVER_ID_PROP_NAME, id + ID_OFFSET); backupConnector = new TransportConfiguration(INVM_CONNECTOR_FACTORY, params, "in-vm-backup"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java index 9d13e29..aa862b4 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java @@ -717,7 +717,7 @@ public class JMSBridgeTest extends BridgeTestBase { Connection connTarget = null; DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec(); - Map<String, String> prop = new HashMap<String, String>(); + Map<String, String> prop = new HashMap<>(); prop.put("key", "bridgekey"); codec.init(prop); @@ -942,7 +942,7 @@ public class JMSBridgeTest extends BridgeTestBase { JMSBridgeTest.log.trace("Sending " + NUM_MESSAGES + " messages"); - List<String> ids1 = new ArrayList<String>(); + List<String> ids1 = new ArrayList<>(); Session sessSource = connSource.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -983,7 +983,7 @@ public class JMSBridgeTest extends BridgeTestBase { connTarget.start(); - List<TextMessage> msgs = new ArrayList<TextMessage>(); + List<TextMessage> msgs = new ArrayList<>(); for (int i = 0; i < NUM_MESSAGES; i++) { TextMessage tm = (TextMessage) cons.receive(5000); @@ -1021,7 +1021,7 @@ public class JMSBridgeTest extends BridgeTestBase { Iterator<TextMessage> iter = msgs.iterator(); - List<String> ids2 = new ArrayList<String>(); + List<String> ids2 = new ArrayList<>(); while (iter.hasNext()) { Message msg = iter.next(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java index a240c12..41f47b5 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java @@ -64,7 +64,7 @@ import org.junit.Test; */ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase { - final ConcurrentHashMap<Integer, AtomicInteger> mapCounter = new ConcurrentHashMap<Integer, AtomicInteger>(); + final ConcurrentHashMap<Integer, AtomicInteger> mapCounter = new ConcurrentHashMap<>(); volatile ActiveMQResourceAdapter resourceAdapter; @@ -329,7 +329,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase } private List<ServerSession> lookupServerSessions(String parameter) { - List<ServerSession> serverSessions = new LinkedList<ServerSession>(); + List<ServerSession> serverSessions = new LinkedList<>(); for (ServerSession session : server.getSessions()) { if (session.getMetaData(parameter) != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java index 7a33df1..29c7677 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java @@ -49,7 +49,7 @@ public class HornetQProtocolTest extends ActiveMQTestBase { @Override @Before public void setUp() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, "" + 5445); params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PROTOCOLS_PROP_NAME, "HORNETQ"); TransportConfiguration transportConfig = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); @@ -217,7 +217,7 @@ public class HornetQProtocolTest extends ActiveMQTestBase { } private org.hornetq.api.core.client.ClientSession createHQClientSession() throws Exception { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("host", "localhost"); map.put("port", 5445); @@ -228,7 +228,7 @@ public class HornetQProtocolTest extends ActiveMQTestBase { } private ClientSession createCoreClientSession() throws Exception { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("host", "localhost"); map.put("port", 61616); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java index 626918a..2e94aa5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java @@ -29,7 +29,7 @@ public class SimpleNotificationService implements NotificationService { // Attributes ---------------------------------------------------- - private final List<NotificationListener> listeners = new ArrayList<NotificationListener>(); + private final List<NotificationListener> listeners = new ArrayList<>(); // Static -------------------------------------------------------- @@ -70,7 +70,7 @@ public class SimpleNotificationService implements NotificationService { public static class Listener implements NotificationListener { - private final List<Notification> notifications = new ArrayList<Notification>(); + private final List<Notification> notifications = new ArrayList<>(); @Override public void onNotification(final Notification notification) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java index 11b8da5..4c29d6c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java @@ -103,7 +103,7 @@ public class AutoCreateJmsQueueTest extends JMSTestBase { ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().setDefaultUser("guest"); ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("guest", "rejectAll"); Role role = new Role("rejectAll", false, false, false, false, false, false, false); - Set<Role> roles = new HashSet<Role>(); + Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch("#", roles); Connection connection = cf.createConnection(); @@ -187,7 +187,7 @@ public class AutoCreateJmsQueueTest extends JMSTestBase { ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().setDefaultUser("guest"); ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("guest", "allowAll"); Role role = new Role("allowAll", true, true, true, true, true, true, true); - Set<Role> roles = new HashSet<Role>(); + Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch("#", roles); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java index cf404c8..2868644 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java @@ -373,7 +373,7 @@ public class ConsumerTest extends ActiveMQTestBase { @Test public void testReceiveAndResend() throws Exception { - final Set<Object> sessions = new ConcurrentHashSet<Object>(); + final Set<Object> sessions = new ConcurrentHashSet<>(); final AtomicInteger errors = new AtomicInteger(0); final SimpleString QUEUE_RESPONSE = SimpleString.toSimpleString("QUEUE_RESPONSE"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java index f68f5a6..f1b5a1f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java @@ -102,8 +102,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { int numConsumers = 5; - ArrayList<ClientConsumer> consumers = new ArrayList<ClientConsumer>(); - ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); + ArrayList<ClientConsumer> consumers = new ArrayList<>(); + ArrayList<ClientSession> sessions = new ArrayList<>(); for (int i = 0; i < numConsumers; i++) { ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); @@ -205,8 +205,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { int numConsumers = 5; - ArrayList<ClientConsumer> consumers = new ArrayList<ClientConsumer>(); - ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); + ArrayList<ClientConsumer> consumers = new ArrayList<>(); + ArrayList<ClientSession> sessions = new ArrayList<>(); for (int i = 0; i < numConsumers; i++) { ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); @@ -257,8 +257,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { int numConsumers = 5; - ArrayList<ClientConsumer> consumers = new ArrayList<ClientConsumer>(); - ArrayList<ClientSession> sessions = new ArrayList<ClientSession>(); + ArrayList<ClientConsumer> consumers = new ArrayList<>(); + ArrayList<ClientSession> sessions = new ArrayList<>(); for (int i = 0; i < numConsumers; i++) { ClientSession session1 = sf.createSession(); ClientConsumer consumer = session1.createConsumer("testWindow"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java index 89764ba..48580f5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java @@ -268,7 +268,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase { ClientSessionFactory sessionFactory = createSessionFactory(locator); ClientSession sendSession = sessionFactory.createSession(false, true, true); ClientProducer producer = sendSession.createProducer(qName); - Map<String, Long> origIds = new HashMap<String, Long>(); + Map<String, Long> origIds = new HashMap<>(); for (int i = 0; i < NUM_MESSAGES; i++) { ClientMessage tm = createTextMessage(clientSession, "Message:" + i); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java index c38f8a6..121972d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java @@ -431,7 +431,7 @@ public class HangConsumerTest extends ActiveMQTestBase { messagesJournal.start(); - LinkedList<RecordInfo> infos = new LinkedList<RecordInfo>(); + LinkedList<RecordInfo> infos = new LinkedList<>(); messagesJournal.load(infos, null, 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/client/JmsNettyNioStressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java index dbd4e24..b7ea680 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java @@ -82,7 +82,7 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase { public void doTestStressSend(final boolean netty) throws Exception { // first set up the server - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put(TransportConstants.PORT_PROP_NAME, 61616); params.put(TransportConstants.HOST_PROP_NAME, "localhost"); params.put(TransportConstants.USE_NIO_PROP_NAME, true); @@ -96,7 +96,7 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase { server.start(); // now the client side - Map<String, Object> connectionParams = new HashMap<String, Object>(); + Map<String, Object> connectionParams = new HashMap<>(); connectionParams.put(TransportConstants.PORT_PROP_NAME, 61616); connectionParams.put(TransportConstants.HOST_PROP_NAME, "localhost"); connectionParams.put(TransportConstants.USE_NIO_PROP_NAME, true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java index f9e31d0..91ac760 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java @@ -193,8 +193,8 @@ public class JournalCrashTest extends ActiveMQTestBase { NIOSequentialFileFactory factory = new NIOSequentialFileFactory(new File(getJournalDir()), 100); JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), 2, 0, 0, factory, "activemq-data", "amq", 100); - ArrayList<RecordInfo> records = new ArrayList<RecordInfo>(); - ArrayList<PreparedTransactionInfo> transactions = new ArrayList<PreparedTransactionInfo>(); + ArrayList<RecordInfo> records = new ArrayList<>(); + ArrayList<PreparedTransactionInfo> transactions = new ArrayList<>(); journal.start(); journal.load(records, transactions, 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/client/LargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java index 00841fe..d99ba63 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java @@ -1817,7 +1817,7 @@ public class LargeMessageTest extends LargeMessageTestBase { final int PAGE_SIZE = 10 * 1024; - HashMap<String, AddressSettings> map = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> map = new HashMap<>(); AddressSettings value = new AddressSettings(); map.put(ADDRESS.toString(), value); @@ -1944,7 +1944,7 @@ public class LargeMessageTest extends LargeMessageTestBase { final int PAGE_SIZE = 10 * 1024; - HashMap<String, AddressSettings> map = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> map = new HashMap<>(); AddressSettings value = new AddressSettings(); map.put(ADDRESS.toString(), value); @@ -2238,7 +2238,7 @@ public class LargeMessageTest extends LargeMessageTestBase { final int PAGE_SIZE = 10 * 1024; - HashMap<String, AddressSettings> map = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> map = new HashMap<>(); AddressSettings value = new AddressSettings(); map.put(ADDRESS.toString(), value); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java index 362f409..c9b1464 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java @@ -67,9 +67,9 @@ public class MessageConcurrencyTest extends ActiveMQTestBase { ClientSession createSession = sf.createSession(); - Set<ClientSession> sendSessions = new HashSet<ClientSession>(); + Set<ClientSession> sendSessions = new HashSet<>(); - Set<Sender> senders = new HashSet<Sender>(); + Set<Sender> senders = new HashSet<>(); final int numSessions = 100; @@ -131,9 +131,9 @@ public class MessageConcurrencyTest extends ActiveMQTestBase { consumeSession.start(); - Set<ClientSession> sendSessions = new HashSet<ClientSession>(); + Set<ClientSession> sendSessions = new HashSet<>(); - final Set<Sender> senders = new HashSet<Sender>(); + final Set<Sender> senders = new HashSet<>(); final int numSessions = 100; @@ -193,7 +193,7 @@ public class MessageConcurrencyTest extends ActiveMQTestBase { private class Sender extends Thread { - private final BlockingQueue<ClientMessage> queue = new LinkedBlockingQueue<ClientMessage>(); + private final BlockingQueue<ClientMessage> queue = new LinkedBlockingQueue<>(); private final ClientProducer producer; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java index 7de970d..de9a4cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java @@ -112,7 +112,7 @@ public class MessageConsumerRollbackTest extends ActiveMQTestBase { session.start(); - HashSet<Integer> values = new HashSet<Integer>(); + HashSet<Integer> values = new HashSet<>(); for (int i = 0; i < numberOfMessages; i++) { ClientMessage msg = consumer.receive(1000); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java index c4356c7..f38ea31 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java @@ -118,7 +118,7 @@ public class MessageGroupingConnectionFactoryTest extends ActiveMQTestBase { private static class DummyMessageHandler implements MessageHandler { - ArrayList<ClientMessage> list = new ArrayList<ClientMessage>(); + ArrayList<ClientMessage> list = new ArrayList<>(); private final CountDownLatch latch; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java index 4aaaa0b..3da716d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java @@ -549,7 +549,7 @@ public class MessageGroupingTest extends ActiveMQTestBase { private static class DummyMessageHandler implements MessageHandler { - ArrayList<ClientMessage> list = new ArrayList<ClientMessage>(); + ArrayList<ClientMessage> list = new ArrayList<>(); private CountDownLatch latch; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java index 460b581..54d7ca7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java @@ -78,7 +78,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase { Sender[] senders = new Sender[numSenders]; - List<ClientSessionFactory> factories = new ArrayList<ClientSessionFactory>(); + List<ClientSessionFactory> factories = new ArrayList<>(); ServerLocator locator = createInVMNonHALocator(); @@ -143,7 +143,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase { private void testPerf(boolean nio) throws Exception { Configuration config = createDefaultInVMConfig(); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put(TransportConstants.USE_NIO_PROP_NAME, nio); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java index f97546a..94a9dbe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java @@ -111,7 +111,7 @@ public class PagingTest extends ActiveMQTestBase { final int PAGE_SIZE = 10 * 1024; - HashMap<String, AddressSettings> map = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> map = new HashMap<>(); AddressSettings value = new AddressSettings(); map.put(ADDRESS.toString(), value); @@ -829,7 +829,7 @@ public class PagingTest extends ActiveMQTestBase { Pair<List<RecordInfo>, List<PreparedTransactionInfo>> journalData = loadMessageJournal(config); - HashSet<Long> deletedQueueReferences = new HashSet<Long>(); + HashSet<Long> deletedQueueReferences = new HashSet<>(); for (RecordInfo info : journalData.getA()) { if (info.getUserRecordType() == JournalRecordIds.ADD_REF) { @@ -961,7 +961,7 @@ public class PagingTest extends ActiveMQTestBase { assertEquals(numberOfMessages, getMessageCount(queue)); - LinkedList<Xid> xids = new LinkedList<Xid>(); + LinkedList<Xid> xids = new LinkedList<>(); int msgReceived = 0; for (int i = 0; i < numberOfTX; i++) { @@ -1492,9 +1492,9 @@ public class PagingTest extends ActiveMQTestBase { } } - ArrayList<RecordInfo> records = new ArrayList<RecordInfo>(); + ArrayList<RecordInfo> records = new ArrayList<>(); - List<PreparedTransactionInfo> list = new ArrayList<PreparedTransactionInfo>(); + List<PreparedTransactionInfo> list = new ArrayList<>(); JournalImpl jrn = new JournalImpl(config.getJournalFileSize(), 2, 0, 0, new NIOSequentialFileFactory(server.getConfiguration().getJournalLocation(), 1), "activemq-data", "amq", 1); jrn.start(); @@ -3128,7 +3128,7 @@ public class PagingTest extends ActiveMQTestBase { public void testDropMessages() throws Exception { clearDataRecreateServerDirs(); - HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> settings = new HashMap<>(); AddressSettings set = new AddressSettings(); set.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP); @@ -3238,7 +3238,7 @@ public class PagingTest extends ActiveMQTestBase { public void testDropMessagesExpiring() throws Exception { clearDataRecreateServerDirs(); - HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> settings = new HashMap<>(); AddressSettings set = new AddressSettings(); set.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP); @@ -3468,7 +3468,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration configuration = createDefaultInVMConfig(); - Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>(); + Map<String, AddressSettings> addresses = new HashMap<>(); addresses.put("#", new AddressSettings()); @@ -3552,7 +3552,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration configuration = createDefaultInVMConfig(); - Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>(); + Map<String, AddressSettings> addresses = new HashMap<>(); addresses.put("#", new AddressSettings()); @@ -4122,7 +4122,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration config = createDefaultInVMConfig().setThreadPoolMaxSize(5).setJournalSyncNonTransactional(false); - Map<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + Map<String, AddressSettings> settings = new HashMap<>(); AddressSettings dla = new AddressSettings().setMaxDeliveryAttempts(5).setDeadLetterAddress(new SimpleString("DLA")); settings.put(ADDRESS.toString(), dla); @@ -4339,7 +4339,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration config = createDefaultInVMConfig().setMessageExpiryScanPeriod(500).setJournalSyncNonTransactional(false); - Map<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + Map<String, AddressSettings> settings = new HashMap<>(); AddressSettings dla = new AddressSettings().setMaxDeliveryAttempts(5).setDeadLetterAddress(new SimpleString("DLA")).setExpiryAddress(new SimpleString("DLA")); settings.put(ADDRESS.toString(), dla); @@ -4481,7 +4481,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration config = createDefaultInVMConfig(); - HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> settings = new HashMap<>(); AddressSettings set = new AddressSettings(); set.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); @@ -4563,7 +4563,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration config = createDefaultInVMConfig(); - HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> settings = new HashMap<>(); AddressSettings set = new AddressSettings(); set.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); @@ -4637,7 +4637,7 @@ public class PagingTest extends ActiveMQTestBase { Configuration config = createDefaultInVMConfig(); - HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>(); + HashMap<String, AddressSettings> settings = new HashMap<>(); AddressSettings set = new AddressSettings(); set.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java index 093206d..033f4c1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java @@ -611,7 +611,7 @@ public class ProducerFlowControlTest extends ActiveMQTestBase { ClientProducerCredits credits = null; - List<ClientProducerCredits> creditsList = new ArrayList<ClientProducerCredits>(); + List<ClientProducerCredits> creditsList = new ArrayList<>(); for (int i = 0; i < ClientProducerCreditManagerImpl.MAX_UNREFERENCED_CREDITS_CACHE_SIZE; i++) { ClientProducer prod = session.createProducer("address" + i); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java index d5a13d9..3f25a47 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java @@ -58,8 +58,8 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { s1.close(); s2.close(); - WeakReference<ClientSession> wrs1 = new WeakReference<ClientSession>(s1); - WeakReference<ClientSession> wrs2 = new WeakReference<ClientSession>(s2); + WeakReference<ClientSession> wrs1 = new WeakReference<>(s1); + WeakReference<ClientSession> wrs2 = new WeakReference<>(s2); s1 = null; s2 = null; @@ -69,7 +69,7 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { locator = null; ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); - WeakReference<ClientSessionFactory> fref = new WeakReference<ClientSessionFactory>(factory); + WeakReference<ClientSessionFactory> fref = new WeakReference<>(factory); factory.close(); @@ -90,8 +90,8 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { s1.close(); s2.close(); - WeakReference<ClientSession> wrs1 = new WeakReference<ClientSession>(s1); - WeakReference<ClientSession> wrs2 = new WeakReference<ClientSession>(s2); + WeakReference<ClientSession> wrs1 = new WeakReference<>(s1); + WeakReference<ClientSession> wrs2 = new WeakReference<>(s2); s1 = null; s2 = null; @@ -101,7 +101,7 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { locator = null; ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); - WeakReference<ClientSessionFactory> fref = new WeakReference<ClientSessionFactory>(factory); + WeakReference<ClientSessionFactory> fref = new WeakReference<>(factory); factory.close(); @@ -120,8 +120,8 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { s1.close(); s2.close(); - WeakReference<ClientSession> wrs1 = new WeakReference<ClientSession>(s1); - WeakReference<ClientSession> wrs2 = new WeakReference<ClientSession>(s2); + WeakReference<ClientSession> wrs1 = new WeakReference<>(s1); + WeakReference<ClientSession> wrs2 = new WeakReference<>(s2); s1 = null; s2 = null; @@ -131,7 +131,7 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { locator = null; ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); - WeakReference<ClientSessionFactory> fref = new WeakReference<ClientSessionFactory>(factory); + WeakReference<ClientSessionFactory> fref = new WeakReference<>(factory); factory = null; @@ -145,8 +145,8 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { ClientSession s1 = factory.createSession(); ClientSession s2 = factory.createSession(); - WeakReference<ClientSession> wrs1 = new WeakReference<ClientSession>(s1); - WeakReference<ClientSession> wrs2 = new WeakReference<ClientSession>(s2); + WeakReference<ClientSession> wrs1 = new WeakReference<>(s1); + WeakReference<ClientSession> wrs2 = new WeakReference<>(s2); s1 = null; s2 = null; @@ -156,7 +156,7 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { locator = null; ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); - WeakReference<ClientSessionFactory> fref = new WeakReference<ClientSessionFactory>(factory); + WeakReference<ClientSessionFactory> fref = new WeakReference<>(factory); factory = null; @@ -167,7 +167,7 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { public void testValidateFactoryGC5() throws Exception { ClientSessionFactory factory = locator.createSessionFactory(); - WeakReference<ClientSessionFactory> fref = new WeakReference<ClientSessionFactory>(factory); + WeakReference<ClientSessionFactory> fref = new WeakReference<>(factory); factory = null; @@ -206,9 +206,9 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase { Assert.assertEquals(1, server.getRemotingService().getConnections().size()); - WeakReference<ClientSession> ref1 = new WeakReference<ClientSession>(session1); - WeakReference<ClientSession> ref2 = new WeakReference<ClientSession>(session2); - WeakReference<ClientSession> ref3 = new WeakReference<ClientSession>(session3); + WeakReference<ClientSession> ref1 = new WeakReference<>(session1); + WeakReference<ClientSession> ref2 = new WeakReference<>(session2); + WeakReference<ClientSession> ref3 = new WeakReference<>(session3); session1 = null; session2 = 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/NodeManagerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java index c5f0917..901bfa3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java @@ -123,7 +123,7 @@ public class NodeManagerTest extends ActiveMQTestBase { public void performWork(NodeManagerAction... actions) throws Exception { NodeManager nodeManager = new InVMNodeManager(false); - List<NodeRunner> nodeRunners = new ArrayList<NodeRunner>(); + List<NodeRunner> nodeRunners = new ArrayList<>(); Thread[] threads = new Thread[actions.length]; for (NodeManagerAction action : actions) { NodeRunner nodeRunner = new NodeRunner(nodeManager, action);
