http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java index 549f77b..dd4c7b3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java @@ -297,7 +297,7 @@ public class AMQ4952Test { protected BrokerService createProducerBroker() throws Exception { String networkToPorts[] = new String[]{"2006"}; - HashMap<String, String> networkProps = new HashMap<String, String>(); + HashMap<String, String> networkProps = new HashMap<>(); networkProps.put("networkTTL", "10"); networkProps.put("conduitSubscriptions", "true"); @@ -313,7 +313,7 @@ public class AMQ4952Test { // lazy init listener on broker start TransportConnector transportConnector = new TransportConnector(); transportConnector.setUri(new URI("tcp://localhost:2003")); - List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>(); + List<TransportConnector> transportConnectors = new ArrayList<>(); transportConnectors.add(transportConnector); broker.setTransportConnectors(transportConnectors); @@ -379,7 +379,7 @@ public class AMQ4952Test { // lazy init listener on broker start TransportConnector transportConnector = new TransportConnector(); transportConnector.setUri(new URI(scheme + "://localhost:" + listenPort)); - List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>(); + List<TransportConnector> transportConnectors = new ArrayList<>(); transportConnectors.add(transportConnector); broker.setTransportConnectors(transportConnectors);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java index 405e56b..6cf42f3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java @@ -206,7 +206,7 @@ public class AMQ5266SingleDestTest { List<String> idList = entry.getValue(); - int distinctConsumed = new TreeSet<String>(idList).size(); + int distinctConsumed = new TreeSet<>(idList).size(); StringBuilder sb = new StringBuilder(); sb.append(" Queue: " + entry.getKey() + @@ -247,7 +247,7 @@ public class AMQ5266SingleDestTest { this.activemqURL = activemqURL; this.activemqQueues = activemqQueues; - threads = new ArrayList<PublisherThread>(); + threads = new ArrayList<>(); // Build the threads and tell them how many messages to publish for (int i = 0; i < threadCount; i++) { @@ -397,7 +397,7 @@ public class AMQ5266SingleDestTest { private String[] queues = null; // Map of IDs that were consumed, keyed by queue name. // We'll compare these against what was published to know if any got stuck or dropped. - private Map<String, List<String>> idsByQueue = new HashMap<String, List<String>>(); + private Map<String, List<String>> idsByQueue = new HashMap<>(); private Map<String, List<ConsumerThread>> threads; public ExportQueueConsumer(String activemqURL, @@ -416,12 +416,12 @@ public class AMQ5266SingleDestTest { queues[i] = queues[i].trim(); } - threads = new HashMap<String, List<ConsumerThread>>(); + threads = new HashMap<>(); // For each queue, create a list of threads and set up the list of ids for (String q : queues) { - List<ConsumerThread> list = new ArrayList<ConsumerThread>(); + List<ConsumerThread> list = new ArrayList<>(); idsByQueue.put(q, Collections.synchronizedList(new ArrayList<String>())); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java index 86dcf5a..b47c17a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.java @@ -212,7 +212,7 @@ public class AMQ5266StarvedConsumerTest { List<String> idList = entry.getValue(); - int distinctConsumed = new TreeSet<String>(idList).size(); + int distinctConsumed = new TreeSet<>(idList).size(); StringBuilder sb = new StringBuilder(); sb.append(" Queue: " + entry.getKey() + @@ -250,7 +250,7 @@ public class AMQ5266StarvedConsumerTest { this.activemqURL = activemqURL; this.activemqQueues = activemqQueues; - threads = new ArrayList<PublisherThread>(); + threads = new ArrayList<>(); // Build the threads and tell them how many messages to publish for (int i = 0; i < threadCount; i++) { @@ -407,7 +407,7 @@ public class AMQ5266StarvedConsumerTest { private String[] queues = null; // Map of IDs that were consumed, keyed by queue name. // We'll compare these against what was published to know if any got stuck or dropped. - private Map<String, List<String>> idsByQueue = new HashMap<String, List<String>>(); + private Map<String, List<String>> idsByQueue = new HashMap<>(); private Map<String, List<ConsumerThread>> threads; public ExportQueueConsumer(String activemqURL, @@ -426,12 +426,12 @@ public class AMQ5266StarvedConsumerTest { queues[i] = queues[i].trim(); } - threads = new HashMap<String, List<ConsumerThread>>(); + threads = new HashMap<>(); // For each queue, create a list of threads and set up the list of ids for (String q : queues) { - List<ConsumerThread> list = new ArrayList<ConsumerThread>(); + List<ConsumerThread> list = new ArrayList<>(); idsByQueue.put(q, Collections.synchronizedList(new ArrayList<String>())); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java index 582600c..4765fab 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java @@ -193,7 +193,7 @@ public class AMQ5266Test { List<String> idList = entry.getValue(); - int distinctConsumed = new TreeSet<String>(idList).size(); + int distinctConsumed = new TreeSet<>(idList).size(); StringBuilder sb = new StringBuilder(); sb.append(" Queue: " + entry.getKey() + @@ -231,7 +231,7 @@ public class AMQ5266Test { this.activemqURL = activemqURL; this.activemqQueues = activemqQueues; - threads = new ArrayList<PublisherThread>(); + threads = new ArrayList<>(); // Build the threads and tell them how many messages to publish for (int i = 0; i < threadCount; i++) { @@ -382,7 +382,7 @@ public class AMQ5266Test { private String[] queues = null; // Map of IDs that were consumed, keyed by queue name. // We'll compare these against what was published to know if any got stuck or dropped. - private Map<String, List<String>> idsByQueue = new HashMap<String, List<String>>(); + private Map<String, List<String>> idsByQueue = new HashMap<>(); private Map<String, List<ConsumerThread>> threads; public ExportQueueConsumer(String activemqURL, @@ -401,12 +401,12 @@ public class AMQ5266Test { queues[i] = queues[i].trim(); } - threads = new HashMap<String, List<ConsumerThread>>(); + threads = new HashMap<>(); // For each queue, create a list of threads and set up the list of ids for (String q : queues) { - List<ConsumerThread> list = new ArrayList<ConsumerThread>(); + List<ConsumerThread> list = new ArrayList<>(); idsByQueue.put(q, Collections.synchronizedList(new ArrayList<String>())); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5450Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5450Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5450Test.java index 21380e5..7ea4044 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5450Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5450Test.java @@ -132,7 +132,7 @@ public class AMQ5450Test { MultiKahaDBPersistenceAdapter multiKahaDBPersistenceAdapter = new MultiKahaDBPersistenceAdapter(); multiKahaDBPersistenceAdapter.deleteAllMessages(); - ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<FilteredKahaDBPersistenceAdapter>(); + ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<>(); if (compositeMatch) { StringBuffer compositeDestBuf = new StringBuffer(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java index 695b1a4..3046423 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java @@ -74,7 +74,7 @@ public class DurableConsumerTest extends CombinationTestSupport { protected byte[] payload = new byte[1024 * 32]; protected ConnectionFactory factory; - protected Vector<Exception> exceptions = new Vector<Exception>(); + protected Vector<Exception> exceptions = new Vector<>(); private static final String TOPIC_NAME = "failoverTopic"; private static final String CONNECTION_URL = "failover:(tcp://localhost:61616,tcp://localhost:61617)"; @@ -184,7 +184,7 @@ public class DurableConsumerTest extends CombinationTestSupport { Thread publisherThread = new Thread(new MessagePublisher()); publisherThread.start(); final int numSubs = 100; - final List<SimpleTopicSubscriber> list = new ArrayList<SimpleTopicSubscriber>(numSubs); + final List<SimpleTopicSubscriber> list = new ArrayList<>(numSubs); for (int i = 0; i < numSubs; i++) { final int id = i; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java index 84ed4d5..1026a05 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java @@ -65,7 +65,7 @@ public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un Destination bigDestination = new ActiveMQQueue("FooTwoBig"); private String connectionUri; - private final Vector<Throwable> exceptions = new Vector<Throwable>(); + private final Vector<Throwable> exceptions = new Vector<>(); @Test(timeout = 60 * 1000) public void testBlockByOtherResumeNoException() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java index 1885325..95057b9 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java @@ -87,7 +87,7 @@ public class QueueWorkerPrefetchTest extends TestCase implements MessageListener */ private final AtomicLong acksReceived = new AtomicLong(0); - private final AtomicReference<CountDownLatch> latch = new AtomicReference<CountDownLatch>(); + private final AtomicReference<CountDownLatch> latch = new AtomicReference<>(); private String connectionUri; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java index d458348..549922d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java @@ -105,7 +105,7 @@ public class RawRollbackSharedConsumerTests { connection.start(); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); String next = ""; - List<String> msgs = new ArrayList<String>(); + List<String> msgs = new ArrayList<>(); MessageConsumer consumer = session.createConsumer(queue); while (next != null) { next = receiveAndConvert(consumer); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java index 3c25220..74437b7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java @@ -106,7 +106,7 @@ public class RawRollbackTests { connection.start(); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); String next = ""; - List<String> msgs = new ArrayList<String>(); + List<String> msgs = new ArrayList<>(); while (next != null) { next = receiveAndConvert(session); if (next != null) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java index 36a80b4..b6787e6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java @@ -149,7 +149,7 @@ public class TrapMessageInJDBCStoreTest extends TestCase { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Destination destination = session.createQueue(queue); - ArrayList<TextMessage> consumedMessages = new ArrayList<TextMessage>(); + ArrayList<TextMessage> consumedMessages = new ArrayList<>(); MessageConsumer messageConsumer = session.createConsumer(destination); @@ -226,7 +226,7 @@ public class TrapMessageInJDBCStoreTest extends TestCase { try { ResultSet result = statement.executeQuery(); - ArrayList<Long> dbSeq = new ArrayList<Long>(); + ArrayList<Long> dbSeq = new ArrayList<>(); while (result.next()) { dbSeq.add(result.getLong(1)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java index cd0a1c4..89b89db 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java @@ -55,7 +55,7 @@ public class ActiveMQTestCase extends TestCase { private BrokerService broker; protected Connection connection; protected Destination destination; - private final List<MessageConsumer> consumersToEmpty = new LinkedList<MessageConsumer>(); + private final List<MessageConsumer> consumersToEmpty = new LinkedList<>(); protected final long RECEIVE_TIMEOUT = 500; /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java index 46ede44..bd5dd0d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java @@ -56,11 +56,11 @@ public class ActiveMQDestinationTest extends DataStructureTestSupport { } public void testSorting() throws Exception { - SortedSet<ActiveMQDestination> set = new TreeSet<ActiveMQDestination>(); + SortedSet<ActiveMQDestination> set = new TreeSet<>(); ActiveMQDestination[] destinations = {new ActiveMQQueue("A"), new ActiveMQQueue("B"), new ActiveMQTopic("A"), new ActiveMQTopic("B")}; List<ActiveMQDestination> expected = Arrays.asList(destinations); set.addAll(expected); - List<ActiveMQDestination> actual = new ArrayList<ActiveMQDestination>(set); + List<ActiveMQDestination> actual = new ArrayList<>(set); assertEquals("Sorted order", expected, actual); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java index a1da8f5..8d658e7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java @@ -36,7 +36,7 @@ public class BrokerXmlConfigFromJNDITest extends JmsTopicSendReceiveWithTwoConne // we could put these properties into a jndi.properties // on the classpath instead - Hashtable<String, String> properties = new Hashtable<String, String>(); + Hashtable<String, String> properties = new Hashtable<>(); properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); // configure the embedded broker using an XML config file http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java index 6ba38ef..317fd55 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java @@ -71,7 +71,7 @@ public class AMQ3410Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.addAll(DEFAULT_TOKENS); @@ -88,7 +88,7 @@ public class AMQ3410Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--factory"); tokens.add(DummyConnectionFactory.class.getCanonicalName()); @@ -108,7 +108,7 @@ public class AMQ3410Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--factory"); tokens.add("org.apache.activemq.console.command.TestAMQ3410.DoesntExistFactory"); @@ -135,7 +135,7 @@ public class AMQ3410Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--factory"); tokens.add(InvalidConnectionFactory.class.getCanonicalName()); @@ -164,7 +164,7 @@ public class AMQ3410Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--factory"); tokens.add("java.lang.Object"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java index dc307cb..9ca9d18 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java @@ -70,7 +70,7 @@ public class AMQ3411Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.addAll(DEFAULT_TOKENS); @@ -92,7 +92,7 @@ public class AMQ3411Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--password"); tokens.add(password); @@ -117,7 +117,7 @@ public class AMQ3411Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--passwordFactory"); tokens.add(LowercasingPasswordFactory.class.getCanonicalName()); @@ -141,7 +141,7 @@ public class AMQ3411Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--passwordFactory"); tokens.add("org.apache.activemq.console.command.TestAMQ3411.DoesntExistFactory"); @@ -173,7 +173,7 @@ public class AMQ3411Test extends TestCase { command.setCommandContext(context); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.addAll(DEFAULT_OPTIONS); tokens.add("--passwordFactory"); tokens.add("java.lang.Object"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java index 374fa01..cc30cb0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java @@ -237,7 +237,7 @@ public class PurgeCommandTest extends TestCase { purgeCommand.setCommandContext(context); purgeCommand.setJmxUseLocal(true); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.add("--msgsel"); tokens.add(MSG_SEL_WITH_PROPERTY); @@ -263,7 +263,7 @@ public class PurgeCommandTest extends TestCase { purgeCommand.setCommandContext(context); purgeCommand.setJmxUseLocal(true); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.add("--msgsel"); tokens.add(MSG_SEL_COMPLEX); @@ -314,7 +314,7 @@ public class PurgeCommandTest extends TestCase { purgeCommand.setCommandContext(context); purgeCommand.setJmxUseLocal(true); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.add("--msgsel"); tokens.add(MSG_SEL_COMPLEX_SQL_AND); @@ -352,7 +352,7 @@ public class PurgeCommandTest extends TestCase { purgeCommand.setCommandContext(context); purgeCommand.setJmxUseLocal(true); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.add("--msgsel"); tokens.add(MSG_SEL_COMPLEX_SQL_OR); @@ -403,7 +403,7 @@ public class PurgeCommandTest extends TestCase { purgeCommand.setCommandContext(context); purgeCommand.setJmxUseLocal(true); - List<String> tokens = new ArrayList<String>(); + List<String> tokens = new ArrayList<>(); tokens.add("--msgsel"); tokens.add("(XTestProperty LIKE '1:*') AND (JMSPriority>3)"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactoryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactoryTest.java index 2045534..0a4fb47 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactoryTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/ActiveMQWASInitialContextFactoryTest.java @@ -24,7 +24,7 @@ public class ActiveMQWASInitialContextFactoryTest extends JNDITestSupport { @SuppressWarnings("unchecked") public void testTransformEnvironment() { - Hashtable<Object, Object> originalEnvironment = new Hashtable<Object, Object>(); + Hashtable<Object, Object> originalEnvironment = new Hashtable<>(); originalEnvironment.put("java.naming.connectionFactoryNames", "ConnectionFactory"); originalEnvironment.put("java.naming.topic.jms.systemMessageTopic", "jms/systemMessageTopic"); originalEnvironment.put(Context.PROVIDER_URL, "tcp://localhost:61616;tcp://localhost:61617"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java index f1bb0cb..a00ffee 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/jndi/JNDITestSupport.java @@ -38,7 +38,7 @@ public abstract class JNDITestSupport extends TestCase { private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(JNDITestSupport.class); - protected Hashtable<String, String> environment = new Hashtable<String, String>(); + protected Hashtable<String, String> environment = new Hashtable<>(); protected Context context; protected void assertConnectionFactoryPresent(String lookupName) throws NamingException { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java index d5109d9..3befdb6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/joramtests/ActiveMQAdmin.java @@ -42,7 +42,7 @@ public class ActiveMQAdmin implements Admin { { try { // Use the jetty JNDI context since it's mutable. - final Hashtable<String, String> env = new Hashtable<String, String>(); + final Hashtable<String, String> env = new Hashtable<>(); env.put("java.naming.factory.initial", "org.eclipse.jetty.jndi.InitialContextFactory"); env.put("java.naming.factory.url.pkgs", "org.eclipse.jetty.jndi"); ; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java index aa6f9b9..fe6f31c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java @@ -90,8 +90,8 @@ public class BrokerNetworkWithStuckMessagesTest { private BrokerService secondRemoteBroker; private DemandForwardingBridge bridge; - protected Map<String, BrokerService> brokers = new HashMap<String, BrokerService>(); - protected ArrayList<StubConnection> connections = new ArrayList<StubConnection>(); + protected Map<String, BrokerService> brokers = new HashMap<>(); + protected ArrayList<StubConnection> connections = new ArrayList<>(); protected TransportConnector connector; protected TransportConnector remoteConnector; @@ -491,7 +491,7 @@ public class BrokerNetworkWithStuckMessagesTest { session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue destination = session.createQueue(queueName); QueueBrowser browser = session.createBrowser(destination); - List<Message> list = new ArrayList<Message>(); + List<Message> list = new ArrayList<>(); for (Enumeration<Message> enumn = browser.getEnumeration(); enumn.hasMoreElements(); ) { list.add(enumn.nextElement()); } @@ -511,7 +511,7 @@ public class BrokerNetworkWithStuckMessagesTest { } private Object[] browseQueueWithJmx(BrokerService broker) throws Exception { - Hashtable<String, String> params = new Hashtable<String, String>(); + Hashtable<String, String> params = new Hashtable<>(); params.put("brokerName", broker.getBrokerName()); params.put("type", "Broker"); params.put("destinationType", "Queue"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java index c60abe6..1912215 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java @@ -180,7 +180,7 @@ public class CheckDuplicateMessagesOnDuplexTest { localBroker.setManagementContext(managementContext); PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/local"); localBroker.setPersistenceAdapter(persistenceAdapter); - List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>(); + List<TransportConnector> transportConnectors = new ArrayList<>(); DebugTransportFactory tf = new DebugTransportFactory(); TransportServer transport = tf.doBind(URI.create("nio://127.0.0.1:23539")); TransportConnector transportConnector = new TransportConnector(transport); @@ -200,7 +200,7 @@ public class CheckDuplicateMessagesOnDuplexTest { remoteBroker.setManagementContext(managementContext); PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/remote"); remoteBroker.setPersistenceAdapter(persistenceAdapter); - List<NetworkConnector> networkConnectors = new ArrayList<NetworkConnector>(); + List<NetworkConnector> networkConnectors = new ArrayList<>(); DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector(); networkConnector.setName("to local"); // set maxInactivityDuration to 0, otherwise the broker restarts while you are in the debugger http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/FailoverStaticNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/FailoverStaticNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/FailoverStaticNetworkTest.java index 8fcc6fa..d541a15 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/FailoverStaticNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/FailoverStaticNetworkTest.java @@ -84,7 +84,7 @@ public class FailoverStaticNetworkTest { // lazy init listener on broker start TransportConnector transportConnector = new TransportConnector(); transportConnector.setUri(new URI(scheme + "://localhost:" + listenPort)); - List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>(); + List<TransportConnector> transportConnectors = new ArrayList<>(); transportConnectors.add(transportConnector); broker.setTransportConnectors(transportConnectors); if (networkToPorts != null && networkToPorts.length > 0) { @@ -191,7 +191,7 @@ public class FailoverStaticNetworkTest { } private Set<String> getNetworkBridgeMBeanName(BrokerService brokerB) throws Exception { - Set<String> names = new HashSet<String>(); + Set<String> names = new HashSet<>(); for (ObjectName objectName : brokerB.getManagementContext().queryNames(null, null)) { if (objectName.getKeyProperty("networkBridge") != null) { names.add(objectName.getKeyProperty("networkBridge")); @@ -202,7 +202,7 @@ public class FailoverStaticNetworkTest { @Test public void testSendReceiveFailoverDuplex() throws Exception { - final Vector<Throwable> errors = new Vector<Throwable>(); + final Vector<Throwable> errors = new Vector<>(); final String dataDir = "target/data/shared"; brokerA = createBroker("61617", dataDir); brokerA.start(); @@ -224,7 +224,7 @@ public class FailoverStaticNetworkTest { }); executor.shutdown(); - HashMap<String, String> networkConnectorProps = new HashMap<String, String>(); + HashMap<String, String> networkConnectorProps = new HashMap<>(); networkConnectorProps.put("duplex", "true"); brokerB = createBroker("tcp", "62617", new String[]{"61617", "63617"}, networkConnectorProps); brokerB.start(); @@ -268,7 +268,7 @@ public class FailoverStaticNetworkTest { }); executor.shutdown(); - HashMap<String, String> networkConnectorProps = new HashMap<String, String>(); + HashMap<String, String> networkConnectorProps = new HashMap<>(); networkConnectorProps.put("duplex", "true"); networkConnectorProps.put("networkTTL", "2"); @@ -330,7 +330,7 @@ public class FailoverStaticNetworkTest { @Test public void testRepeatedSendReceiveWithMasterSlaveAlternateDuplex() throws Exception { - HashMap<String, String> networkConnectorProps = new HashMap<String, String>(); + HashMap<String, String> networkConnectorProps = new HashMap<>(); networkConnectorProps.put("duplex", "true"); doTestRepeatedSendReceiveWithMasterSlaveAlternate(networkConnectorProps); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkDestinationFilterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkDestinationFilterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkDestinationFilterTest.java index c65f36a..b1db5af 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkDestinationFilterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkDestinationFilterTest.java @@ -32,7 +32,7 @@ public class NetworkDestinationFilterTest extends TestCase { public void testFilter() throws Exception { NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); assertEquals(AdvisorySupport.CONSUMER_ADVISORY_TOPIC_PREFIX + ">", config.getDestinationFilter()); - List<ActiveMQDestination> dests = new ArrayList<ActiveMQDestination>(); + List<ActiveMQDestination> dests = new ArrayList<>(); config.setDynamicallyIncludedDestinations(dests); assertEquals(AdvisorySupport.CONSUMER_ADVISORY_TOPIC_PREFIX + ">", config.getDestinationFilter()); dests.add(new ActiveMQQueue("TEST.>")); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java index 0a8ed30..335a63c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java @@ -185,7 +185,7 @@ public class NetworkLoadTest extends TestCase { memoryManager.getMemoryUsage().setLimit(1024 * 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 * 1024 * 1); // Set to 1 MB @@ -230,7 +230,7 @@ public class NetworkLoadTest extends TestCase { Session fromSession = fromConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = fromSession.createConsumer(new ActiveMQQueue("Q" + from)); - final AtomicReference<ActiveMQTextMessage> lastMessageReceived = new AtomicReference<ActiveMQTextMessage>(); + final AtomicReference<ActiveMQTextMessage> lastMessageReceived = new AtomicReference<>(); final AtomicLong producedMessages = new AtomicLong(); final AtomicLong receivedMessages = new AtomicLong(); final AtomicBoolean done = new AtomicBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java index 34d779e..8e345f4 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectTest.java @@ -56,7 +56,7 @@ public class NetworkReconnectTest extends TestCase { private ActiveMQConnectionFactory producerConnectionFactory; private ActiveMQConnectionFactory consumerConnectionFactory; private Destination destination; - private ArrayList<Connection> connections = new ArrayList<Connection>(); + private ArrayList<Connection> connections = new ArrayList<>(); public void xtestMultipleProducerBrokerRestarts() throws Exception { for (int i = 0; i < 10; i++) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkTestSupport.java index bb875dc..722459c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkTestSupport.java @@ -36,7 +36,7 @@ import org.apache.activemq.usage.SystemUsage; public class NetworkTestSupport extends BrokerTestSupport { - protected ArrayList<StubConnection> connections = new ArrayList<StubConnection>(); + protected ArrayList<StubConnection> connections = new ArrayList<>(); protected TransportConnector connector; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java index 5e74f1d..ba10f45 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.broker.BrokerService; */ public class SSHTunnelNetworkReconnectTest extends NetworkReconnectTest { - ArrayList<Process> processes = new ArrayList<Process>(); + ArrayList<Process> processes = new ArrayList<>(); @Override protected BrokerService createFirstBroker() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java index 2f2a489..b76c859 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java @@ -51,7 +51,7 @@ public class QueueBridgeStandaloneReconnectTest { private Destination outbound; private Destination inbound; - private final ArrayList<Connection> connections = new ArrayList<Connection>(); + private final ArrayList<Connection> connections = new ArrayList<>(); @Test(timeout = 60 * 1000) public void testSendAndReceiveOverConnectedBridges() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java index 7a4582a..04e2a29 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java @@ -54,7 +54,7 @@ public class QueueOutboundBridgeReconnectTest { private ActiveMQConnectionFactory producerConnectionFactory; private ActiveMQConnectionFactory consumerConnectionFactory; private Destination destination; - private final ArrayList<Connection> connections = new ArrayList<Connection>(); + private final ArrayList<Connection> connections = new ArrayList<>(); @Test public void testMultipleProducerBrokerRestarts() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java index 8f62a4f..34236ff 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java @@ -51,7 +51,7 @@ public class TopicBridgeStandaloneReconnectTest { private Destination outbound; private Destination inbound; - private final ArrayList<Connection> connections = new ArrayList<Connection>(); + private final ArrayList<Connection> connections = new ArrayList<>(); @Test public void testSendAndReceiveOverConnectedBridges() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java index 745d1ae..dfcf4a8 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java @@ -54,7 +54,7 @@ public class TopicOutboundBridgeReconnectTest { private ActiveMQConnectionFactory producerConnectionFactory; private ActiveMQConnectionFactory consumerConnectionFactory; private Destination destination; - private final ArrayList<Connection> connections = new ArrayList<Connection>(); + private final ArrayList<Connection> connections = new ArrayList<>(); @Test public void testMultipleProducerBrokerRestarts() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java index 31bb4ed..029ee71 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java @@ -51,7 +51,7 @@ public abstract class DataFileGenerator extends org.junit.Assert { */ public static ArrayList<DataFileGenerator> getAllDataFileGenerators() throws Exception { // System.out.println("Looking for generators in : "+classFileDir); - ArrayList<DataFileGenerator> l = new ArrayList<DataFileGenerator>(); + ArrayList<DataFileGenerator> l = new ArrayList<>(); File[] files = CLASS_FILE_DIR.listFiles(); for (int i = 0; files != null && i < files.length; i++) { File file = files[i]; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java index 4251614..cbaa099 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java @@ -103,7 +103,7 @@ public abstract class DataFileGeneratorTestSupport extends TestSupport { ByteArrayInputStream in = new ByteArrayInputStream(buffer.toByteArray()); DataInputStream dis = new DataInputStream(in); Object actual = openWireformat.unmarshal(dis); - assertBeansEqual("", new HashSet<Object>(), expected, actual); + assertBeansEqual("", new HashSet<>(), expected, actual); LOG.info("Parsed: " + actual); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/ConnectionChurnTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/ConnectionChurnTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/ConnectionChurnTest.java index 83a98c2..fdb1d96 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/ConnectionChurnTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/ConnectionChurnTest.java @@ -45,7 +45,7 @@ public class ConnectionChurnTest extends TestCase { public void testPerformance() throws Exception { ConnectionFactory factory = createConnectionFactory(); - List<Connection> list = new ArrayList<Connection>(); + List<Connection> list = new ArrayList<>(); for (int i = 0; i < CONNECTION_COUNT; i++) { Connection connection = factory.createConnection(); connection.start(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueNetworkTest.java index a240448..eb45c68 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueNetworkTest.java @@ -74,7 +74,7 @@ public class SimpleNonPersistentQueueNetworkTest extends SimpleNetworkTest { protected void configureBroker(BrokerService answer) throws Exception { answer.setPersistent(false); answer.setMonitorConnectionSplits(true); - final List<PolicyEntry> policyEntries = new ArrayList<PolicyEntry>(); + final List<PolicyEntry> policyEntries = new ArrayList<>(); final PolicyEntry entry = new PolicyEntry(); entry.setQueue(">"); entry.setMemoryLimit(1024 * 1024 * 100); // Set to 1 MB http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java index ed5d525..38dddd6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/SimpleNonPersistentQueueTest.java @@ -64,7 +64,7 @@ public class SimpleNonPersistentQueueTest extends SimpleQueueTest { @Override protected void configureBroker(BrokerService answer, String uri) throws Exception { // answer.setPersistent(false); - final List<PolicyEntry> policyEntries = new ArrayList<PolicyEntry>(); + final List<PolicyEntry> policyEntries = new ArrayList<>(); final PolicyEntry entry = new PolicyEntry(); entry.setQueue(">"); entry.setMemoryLimit(1024 * 1024 * 1); // Set to 1 MB http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java index 9450595..df05d7f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java @@ -62,7 +62,7 @@ public class AMQ4889Test { brokerService = new BrokerService(); brokerService.setPersistent(false); - ArrayList<BrokerPlugin> plugins = new ArrayList<BrokerPlugin>(); + ArrayList<BrokerPlugin> plugins = new ArrayList<>(); BrokerPlugin authenticationPlugin = configureAuthentication(); plugins.add(authenticationPlugin); BrokerPlugin[] array = new BrokerPlugin[plugins.size()]; @@ -82,7 +82,7 @@ public class AMQ4889Test { } protected BrokerPlugin configureAuthentication() throws Exception { - List<AuthenticationUser> users = new ArrayList<AuthenticationUser>(); + List<AuthenticationUser> users = new ArrayList<>(); users.add(new AuthenticationUser(USER, GOOD_USER_PASSWORD, "users")); SimpleAuthenticationPlugin authenticationPlugin = new SimpleAuthenticationPlugin(users); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java index 97c66b6..02284df 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java @@ -31,7 +31,7 @@ import org.apache.activemq.usage.SystemUsage; public class ProxyTestSupport extends BrokerTestSupport { - protected ArrayList<StubConnection> connections = new ArrayList<StubConnection>(); + protected ArrayList<StubConnection> connections = new ArrayList<>(); protected TransportConnector connector; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java index 5ca32d7..902ee10 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java @@ -373,7 +373,7 @@ public abstract class AbstractCachedLDAPAuthorizationMapLegacyTest extends Abstr String ldapPass, DirContext context) throws Exception { // Cleanup everything used for testing. - List<String> dns = new LinkedList<String>(); + List<String> dns = new LinkedList<>(); dns.add(deleteFromDn); while (!dns.isEmpty()) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java index 8475355..e0796ba 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java @@ -94,7 +94,7 @@ public class AuthorizationMapTest extends TestCase { protected AuthorizationMap createWildcardAuthorizationMap() { DefaultAuthorizationMap answer = new DefaultAuthorizationMap(); - List<DestinationMapEntry> entries = new ArrayList<DestinationMapEntry>(); + List<DestinationMapEntry> entries = new ArrayList<>(); AuthorizationEntry entry = new AuthorizationEntry(); entry.setQueue(">"); @@ -129,7 +129,7 @@ public class AuthorizationMapTest extends TestCase { protected AuthorizationMap createAuthorizationMap() { DefaultAuthorizationMap answer = new DefaultAuthorizationMap(); - List<DestinationMapEntry> entries = new ArrayList<DestinationMapEntry>(); + List<DestinationMapEntry> entries = new ArrayList<>(); AuthorizationEntry entry = new AuthorizationEntry(); entry.setGroupClass("org.apache.activemq.jaas.GroupPrincipal"); @@ -162,7 +162,7 @@ public class AuthorizationMapTest extends TestCase { protected AuthorizationMap createAuthorizationMapWithTempDest() { DefaultAuthorizationMap answer = new DefaultAuthorizationMap(); - List<DestinationMapEntry> entries = new ArrayList<DestinationMapEntry>(); + List<DestinationMapEntry> entries = new ArrayList<>(); AuthorizationEntry entry = new AuthorizationEntry(); entry.setQueue(">"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java index 72cbfc1..07b007a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java @@ -62,7 +62,7 @@ public class JaasCertificateAuthenticationBrokerTest extends TestCase { } private void setConfiguration(Set<String> userNames, Set<String> groupNames, boolean loginShouldSucceed) { - HashMap<String, String> configOptions = new HashMap<String, String>(); + HashMap<String, String> configOptions = new HashMap<>(); String userNamesString; { @@ -95,10 +95,10 @@ public class JaasCertificateAuthenticationBrokerTest extends TestCase { public void testAddConnectionSuccess() { String dnUserName = "dnUserName"; - HashSet<String> userNames = new HashSet<String>(); + HashSet<String> userNames = new HashSet<>(); userNames.add(dnUserName); - HashSet<String> groupNames = new HashSet<String>(); + HashSet<String> groupNames = new HashSet<>(); groupNames.add("testGroup1"); groupNames.add("testGroup2"); groupNames.add("tesetGroup3"); @@ -155,9 +155,9 @@ public class JaasCertificateAuthenticationBrokerTest extends TestCase { } public void testAddConnectionFailure() { - HashSet<String> userNames = new HashSet<String>(); + HashSet<String> userNames = new HashSet<>(); - HashSet<String> groupNames = new HashSet<String>(); + HashSet<String> groupNames = new HashSet<>(); groupNames.add("testGroup1"); groupNames.add("testGroup2"); groupNames.add("tesetGroup3"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationBrokerTest.java index 17db0a8..a3a5cd6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationBrokerTest.java @@ -66,8 +66,8 @@ public class JaasDualAuthenticationBrokerTest extends TestCase { * using the StubLoginModule */ void createLoginConfig() { - HashMap<String, String> sslConfigOptions = new HashMap<String, String>(); - HashMap<String, String> configOptions = new HashMap<String, String>(); + HashMap<String, String> sslConfigOptions = new HashMap<>(); + HashMap<String, String> configOptions = new HashMap<>(); sslConfigOptions.put(StubLoginModule.ALLOW_LOGIN_PROPERTY, "true"); sslConfigOptions.put(StubLoginModule.USERS_PROPERTY, DN_USERNAME); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java index 34aa7b2..76986a3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java @@ -69,7 +69,7 @@ public class LDAPAuthorizationMapTest extends AbstractLdapTestUnit { @Test public void testOpen() throws Exception { DirContext ctx = authMap.open(); - HashSet<String> set = new HashSet<String>(); + HashSet<String> set = new HashSet<>(); NamingEnumeration<NameClassPair> list = ctx.list("ou=destinations,o=ActiveMQ,ou=system"); while (list.hasMore()) { NameClassPair ncp = list.next(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java index d660de3..eb7fc04 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SecurityJMXTest.java @@ -75,7 +75,7 @@ public class SecurityJMXTest extends TestCase { MBeanServerConnection connection = connector.getMBeanServerConnection(); ObjectName name = new ObjectName("org.apache.activemq:type=Broker,brokerName=localhost," + "destinationType=Queue,destinationName=TEST.Q"); QueueViewMBean queueMbean = MBeanServerInvocationHandler.newProxyInstance(connection, name, QueueViewMBean.class, true); - HashMap<String, String> headers = new HashMap<String, String>(); + HashMap<String, String> headers = new HashMap<>(); headers.put("timeToLive", Long.toString(2000)); headers.put("JMSDeliveryMode", Integer.toString(DeliveryMode.PERSISTENT)); queueMbean.sendTextMessage(headers, "test", "system", "manager"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java index 7036dd0..b29bb21 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java @@ -151,15 +151,15 @@ public class SimpleSecurityBrokerSystemTest extends SecurityTestSupport { @Override public Broker installPlugin(Broker broker) { - HashMap<String, String> u = new HashMap<String, String>(); + HashMap<String, String> u = new HashMap<>(); u.put("system", "manager"); u.put("user", "password"); u.put("guest", "password"); - Map<String, Set<Principal>> groups = new HashMap<String, Set<Principal>>(); - groups.put("system", new HashSet<Principal>(Arrays.asList(new Principal[]{ADMINS, USERS}))); - groups.put("user", new HashSet<Principal>(Arrays.asList(new Principal[]{USERS}))); - groups.put("guest", new HashSet<Principal>(Arrays.asList(new Principal[]{GUESTS}))); + Map<String, Set<Principal>> groups = new HashMap<>(); + groups.put("system", new HashSet<>(Arrays.asList(new Principal[]{ADMINS, USERS}))); + groups.put("user", new HashSet<>(Arrays.asList(new Principal[]{USERS}))); + groups.put("guest", new HashSet<>(Arrays.asList(new Principal[]{GUESTS}))); return new SimpleAuthenticationBroker(broker, u, groups); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java index 1aa2156..c6abef8 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public class ConsumerBean extends Assert implements MessageListener { private static final Logger LOG = LoggerFactory.getLogger(ConsumerBean.class); - private final List<Message> messages = new ArrayList<Message>(); + private final List<Message> messages = new ArrayList<>(); private boolean verbose; /** @@ -44,7 +44,7 @@ public class ConsumerBean extends Assert implements MessageListener { public List<Message> flushMessages() { List<Message> answer = null; synchronized (messages) { - answer = new ArrayList<Message>(messages); + answer = new ArrayList<>(messages); messages.clear(); } return answer; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/AutoStorePerDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/AutoStorePerDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/AutoStorePerDestinationTest.java index da18beb..e28288b 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/AutoStorePerDestinationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/AutoStorePerDestinationTest.java @@ -31,7 +31,7 @@ public class AutoStorePerDestinationTest extends StorePerDestinationTest { if (deleteAllMessages) { multiKahaDBPersistenceAdapter.deleteAllMessages(); } - ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<FilteredKahaDBPersistenceAdapter>(); + ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<>(); FilteredKahaDBPersistenceAdapter template = new FilteredKahaDBPersistenceAdapter(); template.setPersistenceAdapter(createStore(deleteAllMessages)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/StorePerDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/StorePerDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/StorePerDestinationTest.java index 23c2e7d..cc144d0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/StorePerDestinationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/StorePerDestinationTest.java @@ -53,7 +53,7 @@ public class StorePerDestinationTest { static final Logger LOG = LoggerFactory.getLogger(StorePerDestinationTest.class); final static int maxFileLength = 1024 * 100; final static int numToSend = 5000; - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); BrokerService brokerService; protected BrokerService createBroker(PersistenceAdapter kaha) throws Exception { @@ -85,7 +85,7 @@ public class StorePerDestinationTest { if (deleteAllMessages) { multiKahaDBPersistenceAdapter.deleteAllMessages(); } - ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<FilteredKahaDBPersistenceAdapter>(); + ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<>(); FilteredKahaDBPersistenceAdapter theRest = new FilteredKahaDBPersistenceAdapter(); theRest.setPersistenceAdapter(createStore(deleteAllMessages)); @@ -181,7 +181,7 @@ public class StorePerDestinationTest { @Test public void testDirectoryDefault() throws Exception { MultiKahaDBPersistenceAdapter multiKahaDBPersistenceAdapter = new MultiKahaDBPersistenceAdapter(); - ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<FilteredKahaDBPersistenceAdapter>(); + ArrayList<FilteredKahaDBPersistenceAdapter> adapters = new ArrayList<>(); FilteredKahaDBPersistenceAdapter otherFilteredKahaDBPersistenceAdapter = new FilteredKahaDBPersistenceAdapter(); PersistenceAdapter otherStore = createStore(false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerMockeryTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerMockeryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerMockeryTest.java index 20ee5b1..fa7b848 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerMockeryTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerMockeryTest.java @@ -39,7 +39,7 @@ import static org.junit.Assert.fail; public class JDBCIOExceptionHandlerMockeryTest { private static final Logger LOG = LoggerFactory.getLogger(JDBCIOExceptionHandlerMockeryTest.class); - private HashMap<Thread, Throwable> exceptions = new HashMap<Thread, Throwable>(); + private HashMap<Thread, Throwable> exceptions = new HashMap<>(); @Test public void testShutdownWithoutTransportRestart() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java index 5066100..6c43646 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java @@ -121,7 +121,7 @@ public class JDBCIOExceptionHandlerTest extends TestCase { master.start(); master.waitUntilStarted(); - final AtomicReference<BrokerService> slave = new AtomicReference<BrokerService>(); + final AtomicReference<BrokerService> slave = new AtomicReference<>(); Thread slaveThread = new Thread() { @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java index 4637778..ae0ac1f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java @@ -144,7 +144,7 @@ public class JDBCMessagePriorityTest extends MessagePriorityTest { final AtomicInteger[] messageCounts = new AtomicInteger[maxPriority]; final long[] messageIds = new long[maxPriority]; - Vector<ProducerThread> producers = new Vector<ProducerThread>(); + Vector<ProducerThread> producers = new Vector<>(); for (int priority = 0; priority < maxPriority; priority++) { producers.add(new ProducerThread(topic, MSG_NUM, priority)); messageCounts[priority] = new AtomicInteger(0); @@ -156,7 +156,7 @@ public class JDBCMessagePriorityTest extends MessagePriorityTest { } final int closeFrequency = MSG_NUM / 2; - HashMap<String, String> dups = new HashMap<String, String>(); + HashMap<String, String> dups = new HashMap<>(); sub = consumerSession.createDurableSubscriber(topic, subName); for (int i = 0; i < MSG_NUM * maxPriority; i++) { Message msg = sub.receive(10000); @@ -197,7 +197,7 @@ public class JDBCMessagePriorityTest extends MessagePriorityTest { sub.close(); final int TO_SEND = 2000; - final Vector<Message> duplicates = new Vector<Message>(); + final Vector<Message> duplicates = new Vector<>(); final int[] dups = new int[TO_SEND * 4]; long start; double max = 0, sum = 0; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTablePrefixAssignedTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTablePrefixAssignedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTablePrefixAssignedTest.java index bd00179..7ac10b5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTablePrefixAssignedTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTablePrefixAssignedTest.java @@ -97,7 +97,7 @@ public class JDBCTablePrefixAssignedTest { java.sql.Connection conn = ((JDBCPersistenceAdapter) service.getPersistenceAdapter()).getDataSource().getConnection(); PreparedStatement statement = conn.prepareStatement("SELECT ID, MSG FROM MYPREFIX_ACTIVEMQ_MSGS"); ResultSet result = statement.executeQuery(); - ArrayList<Message> results = new ArrayList<Message>(); + ArrayList<Message> results = new ArrayList<>(); while (result.next()) { long id = result.getLong(1); Message message = (Message) wireFormat.unmarshal(new ByteSequence(result.getBytes(2))); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java index 8148125..5db2c05 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java @@ -149,7 +149,7 @@ public class LeaseDatabaseLockerTest { lockerB.setLeaseHolderId("B"); jdbc.setLocker(lockerB); - final Set<LeaseDatabaseLocker> lockedSet = new HashSet<LeaseDatabaseLocker>(); + final Set<LeaseDatabaseLocker> lockedSet = new HashSet<>(); ExecutorService executor = Executors.newCachedThreadPool(); executor.execute(new Runnable() { @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java index b72fe34..352d2f0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java @@ -58,7 +58,7 @@ public class KahaDBFastEnqueueTest { private final String payloadString = new String(new byte[6 * 1024]); private final boolean useBytesMessage = true; private final int parallelProducer = 20; - private final Vector<Exception> exceptions = new Vector<Exception>(); + private final Vector<Exception> exceptions = new Vector<>(); long toSend = 10000; // use with: http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java index b815fe5..2163e5c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java @@ -152,7 +152,7 @@ public class KahaDBStoreRecoveryBrokerTest extends RecoveryBrokerTest { connection.send(sessionInfo); connection.send(producerInfo); - ArrayList<String> expected = new ArrayList<String>(); + ArrayList<String> expected = new ArrayList<>(); int MESSAGE_COUNT = 10000; for (int i = 0; i < MESSAGE_COUNT; i++) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreTest.java index 01271ad..1b9980f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreTest.java @@ -41,7 +41,7 @@ public class KahaDBStoreTest { ActiveMQMessage message; ProducerId producerId = new ProducerId("1.1.1"); private static final int MESSAGE_COUNT = 2000; - private Vector<Throwable> exceptions = new Vector<Throwable>(); + private Vector<Throwable> exceptions = new Vector<>(); @Before public void initStore() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java index 8d36897..7cff644 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java @@ -44,7 +44,7 @@ public class PListTest { private PListImpl plist; final ByteSequence payload = new ByteSequence(new byte[400]); final String idSeed = new String("Seed" + Arrays.toString(new byte[1024])); - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); ExecutorService executor; private PListEntry getFirst(PList plist) throws IOException { @@ -65,7 +65,7 @@ public class PListTest { @Test public void testAddLast() throws Exception { final int COUNT = 1000; - Map<String, ByteSequence> map = new LinkedHashMap<String, ByteSequence>(); + Map<String, ByteSequence> map = new LinkedHashMap<>(); for (int i = 0; i < COUNT; i++) { String test = new String("test" + i); ByteSequence bs = new ByteSequence(test.getBytes()); @@ -86,7 +86,7 @@ public class PListTest { @Test public void testAddFirst() throws Exception { final int COUNT = 1000; - Map<String, ByteSequence> map = new LinkedHashMap<String, ByteSequence>(); + Map<String, ByteSequence> map = new LinkedHashMap<>(); for (int i = 0; i < COUNT; i++) { String test = new String("test" + i); ByteSequence bs = new ByteSequence(test.getBytes()); @@ -110,7 +110,7 @@ public class PListTest { } protected void doTestRemove(final int COUNT) throws IOException { - Map<String, ByteSequence> map = new LinkedHashMap<String, ByteSequence>(); + Map<String, ByteSequence> map = new LinkedHashMap<>(); for (int i = 0; i < COUNT; i++) { String test = new String("test" + i); ByteSequence bs = new ByteSequence(test.getBytes()); @@ -136,7 +136,7 @@ public class PListTest { @Test public void testDestroyNonEmpty() throws Exception { final int COUNT = 1000; - Map<String, ByteSequence> map = new LinkedHashMap<String, ByteSequence>(); + Map<String, ByteSequence> map = new LinkedHashMap<>(); for (int i = 0; i < COUNT; i++) { String test = new String("test" + i); ByteSequence bs = new ByteSequence(test.getBytes()); @@ -193,7 +193,7 @@ public class PListTest { final ByteSequence payload = new ByteSequence(new byte[1024 * 2]); - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); final int iterations = 1000; final int numLists = 10; @@ -627,7 +627,7 @@ public class PListTest { } } - final Map<PList, Object> locks = new HashMap<PList, Object>(); + final Map<PList, Object> locks = new HashMap<>(); private Object plistLocks(PList plist) { Object lock = null;
