http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java index 6ec27c0..38f0213 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java @@ -121,7 +121,7 @@ public class JMSInputStreamTest extends JmsTestSupport { String name2 = "PROPERTY_2"; String value1 = "VALUE_1"; String value2 = "VALUE_2"; - Map<String, Object> jmsProperties = new HashMap<String, Object>(); + Map<String, Object> jmsProperties = new HashMap<>(); jmsProperties.put(name1, value1); jmsProperties.put(name2, value2); setUpConnection(jmsProperties, -1); @@ -157,7 +157,7 @@ public class JMSInputStreamTest extends JmsTestSupport { String name2 = "PROPERTY_2"; String value1 = "VALUE_1"; String value2 = "VALUE_2"; - Map<String, Object> jmsProperties = new HashMap<String, Object>(); + Map<String, Object> jmsProperties = new HashMap<>(); jmsProperties.put(name1, value1); jmsProperties.put(name2, value2);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java index 291e4de..34489ae 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java @@ -75,11 +75,11 @@ public class NestedMapAndListPropertyTest extends JmsTopicSendReceiveWithTwoConn answer.setStringProperty("textField", data[index]); - Map<String, Object> grandChildMap = new HashMap<String, Object>(); + Map<String, Object> grandChildMap = new HashMap<>(); grandChildMap.put("x", "abc"); grandChildMap.put("y", Arrays.asList(new Object[]{"a", "b", "c"})); - Map<String, Object> nestedMap = new HashMap<String, Object>(); + Map<String, Object> nestedMap = new HashMap<>(); nestedMap.put("a", "foo"); nestedMap.put("b", new Integer(23)); nestedMap.put("c", new Long(45)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java index 062cbab..1bf7319 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java @@ -79,11 +79,11 @@ public class NestedMapMessageTest extends JmsTopicSendReceiveWithTwoConnectionsA answer.setString("textField", data[index]); - Map<String, Object> grandChildMap = new HashMap<String, Object>(); + Map<String, Object> grandChildMap = new HashMap<>(); grandChildMap.put("x", "abc"); grandChildMap.put("y", Arrays.asList(new Object[]{"a", "b", "c"})); - Map<String, Object> nestedMap = new HashMap<String, Object>(); + Map<String, Object> nestedMap = new HashMap<>(); nestedMap.put("a", "foo"); nestedMap.put("b", Integer.valueOf(23)); nestedMap.put("c", Long.valueOf(45)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubCompositeTransport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubCompositeTransport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubCompositeTransport.java index 57b7062..108249a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubCompositeTransport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubCompositeTransport.java @@ -26,7 +26,7 @@ import java.util.List; */ public class StubCompositeTransport extends StubTransport implements CompositeTransport { - private List<URI> transportURIs = new ArrayList<URI>(); + private List<URI> transportURIs = new ArrayList<>(); /** * @see org.apache.activemq.transport.CompositeTransport#add(java.net.URI[]) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java index 9375b6d..1175e77 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java @@ -29,7 +29,7 @@ import org.apache.activemq.util.ServiceStopper; */ public class StubTransport extends TransportSupport { - private Queue<Object> queue = new ConcurrentLinkedQueue<Object>(); + private Queue<Object> queue = new ConcurrentLinkedQueue<>(); private AtomicInteger receiveCounter; @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransportListener.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransportListener.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransportListener.java index 6c67e3c..a35003d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransportListener.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransportListener.java @@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; */ public class StubTransportListener implements TransportListener { - private final Queue<Object> commands = new ConcurrentLinkedQueue<Object>(); - private final Queue<Object> exceptions = new ConcurrentLinkedQueue<Object>(); + private final Queue<Object> commands = new ConcurrentLinkedQueue<>(); + private final Queue<Object> exceptions = new ConcurrentLinkedQueue<>(); public Queue<Object> getCommands() { return commands; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java index c8aadbc..5157c33 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java @@ -60,7 +60,7 @@ public class TopicClusterTest extends TestCase implements MessageListener { protected int deliveryMode = DeliveryMode.NON_PERSISTENT; protected MessageProducer[] producers; protected Connection[] connections; - protected List<BrokerService> services = new ArrayList<BrokerService>(); + protected List<BrokerService> services = new ArrayList<>(); protected String groupId; @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java index 18e4cdc..1c39972 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java @@ -30,7 +30,7 @@ import org.apache.activemq.broker.artemiswrapper.ArtemisBrokerWrapper; public abstract class TransportBrokerTestSupport extends BrokerTest { protected TransportConnector connector; - private ArrayList<StubConnection> connections = new ArrayList<StubConnection>(); + private ArrayList<StubConnection> connections = new ArrayList<>(); @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/transport/discovery/DiscoveryNetworkReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java index 8ee3adc..c63177b 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java @@ -123,7 +123,7 @@ public class DiscoveryNetworkReconnectTest { allowing(managementContext).registerMBean(with(any(Object.class)), with(equal(new ObjectName("Test:type=Broker,brokerName=BrokerNC,destinationType=Topic,destinationName=ActiveMQ.Advisory.MasterBroker")))); allowing(managementContext).registerMBean(with(any(Object.class)), with(equal(new ObjectName("Test:type=Broker,brokerName=BrokerNC,service=jobScheduler,jobSchedulerName=JMS")))); - atLeast(maxReconnects - 1).of(managementContext).registerMBean(with(any(Object.class)), with(new NetworkBridgeObjectNameMatcher<ObjectName>(new ObjectName("Test:type=Broker,brokerName=BrokerNC,connector=networkConnectors,networkConnectorName=NC,networkBridge=localhost/127.0.0.1_" + proxy.getUrl().getPort())))); + atLeast(maxReconnects - 1).of(managementContext).registerMBean(with(any(Object.class)), with(new NetworkBridgeObjectNameMatcher<>(new ObjectName("Test:type=Broker,brokerName=BrokerNC,connector=networkConnectors,networkConnectorName=NC,networkBridge=localhost/127.0.0.1_" + proxy.getUrl().getPort())))); will(new CustomAction("signal register network mbean") { @Override public Object invoke(Invocation invocation) throws Throwable { @@ -132,7 +132,7 @@ public class DiscoveryNetworkReconnectTest { return new ObjectInstance((ObjectName) invocation.getParameter(1), "discription"); } }); - atLeast(maxReconnects - 1).of(managementContext).unregisterMBean(with(new NetworkBridgeObjectNameMatcher<ObjectName>(new ObjectName("Test:type=Broker,brokerName=BrokerNC,connector=networkConnectors,networkConnectorName=NC,networkBridge=localhost/127.0.0.1_" + proxy.getUrl().getPort())))); + atLeast(maxReconnects - 1).of(managementContext).unregisterMBean(with(new NetworkBridgeObjectNameMatcher<>(new ObjectName("Test:type=Broker,brokerName=BrokerNC,connector=networkConnectors,networkConnectorName=NC,networkBridge=localhost/127.0.0.1_" + proxy.getUrl().getPort())))); will(new CustomAction("signal unregister network mbean") { @Override public Object invoke(Invocation invocation) throws Throwable { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java index bf022f0..d244dab 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java @@ -53,7 +53,7 @@ public class DiscoveryTransportNoBrokerTest extends CombinationTestSupport { broker.start(); broker.waitUntilStarted(); - Vector<String> existingNames = new Vector<String>(); + Vector<String> existingNames = new Vector<>(); Thread[] threads = getThreads(); for (Thread t : threads) { existingNames.add(t.getName()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java index 4554a0b..f80b09a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java @@ -154,7 +154,7 @@ public class AMQ1925Test extends TestCase implements ExceptionListener { } }).start(); - Collection<Integer> results = new ArrayList<Integer>(MESSAGE_COUNT); + Collection<Integer> results = new ArrayList<>(MESSAGE_COUNT); for (int i = 0; i < MESSAGE_COUNT; i++) { Message message1 = consumer1.receive(20); Message message2 = consumer2.receive(20); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java index 6f38203..110e2fc 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java @@ -42,7 +42,7 @@ public class ConnectionHangOnStartupTest { // connection sooner) protected String uriString = "failover://(tcp://localhost:62001?wireFormat.maxInactivityDurationInitalDelay=1,tcp://localhost:62002?wireFormat.maxInactivityDurationInitalDelay=1)?randomize=false&maxReconnectDelay=200"; protected BrokerService master = null; - protected AtomicReference<BrokerService> slave = new AtomicReference<BrokerService>(); + protected AtomicReference<BrokerService> slave = new AtomicReference<>(); @After public void tearDown() throws Exception { @@ -84,7 +84,7 @@ public class ConnectionHangOnStartupTest { @Test(timeout = 60000) public void testInitialWireFormatNegotiationTimeout() throws Exception { - final AtomicReference<Connection> conn = new AtomicReference<Connection>(); + final AtomicReference<Connection> conn = new AtomicReference<>(); final CountDownLatch connStarted = new CountDownLatch(1); Thread t = new Thread() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java index 113db64..c0c529d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTest.java @@ -44,7 +44,7 @@ public class FailoverClusterTest extends TestCase { private BrokerService brokerB; private String clientUrl; - private final List<ActiveMQConnection> connections = new ArrayList<ActiveMQConnection>(); + private final List<ActiveMQConnection> connections = new ArrayList<>(); public void testClusterConnectedAfterClients() throws Exception { createClients(); @@ -52,7 +52,7 @@ public class FailoverClusterTest extends TestCase { brokerB = createBrokerB(BROKER_BIND_ADDRESS); } Thread.sleep(3000); - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); for (ActiveMQConnection c : connections) { set.add(c.getTransportChannel().getRemoteAddress()); } @@ -66,7 +66,7 @@ public class FailoverClusterTest extends TestCase { brokerB = createBrokerB(BROKER_BIND_ADDRESS + "?transport.closeAsync=false"); } Thread.sleep(3000); - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); for (ActiveMQConnection c : connections) { set.add(c.getTransportChannel().getRemoteAddress()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTestSupport.java index 2a125e1..b518ad5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverClusterTestSupport.java @@ -47,11 +47,11 @@ public class FailoverClusterTestSupport extends TestCase { private String clientUrl; - private final Map<String, BrokerService> brokers = new HashMap<String, BrokerService>(); - private final List<ActiveMQConnection> connections = new ArrayList<ActiveMQConnection>(); + private final Map<String, BrokerService> brokers = new HashMap<>(); + private final List<ActiveMQConnection> connections = new ArrayList<>(); protected void assertClientsConnectedToTwoBrokers() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); for (ActiveMQConnection c : connections) { if (c.getTransportChannel().getRemoteAddress() != null) { set.add(c.getTransportChannel().getRemoteAddress()); @@ -61,7 +61,7 @@ public class FailoverClusterTestSupport extends TestCase { } protected void assertClientsConnectedToThreeBrokers() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); for (ActiveMQConnection c : connections) { if (c.getTransportChannel().getRemoteAddress() != null) { set.add(c.getTransportChannel().getRemoteAddress()); @@ -71,7 +71,7 @@ public class FailoverClusterTestSupport extends TestCase { } protected void assertClientsConnectionsEvenlyDistributed(double minimumPercentage) { - Map<String, Double> clientConnectionCounts = new HashMap<String, Double>(); + Map<String, Double> clientConnectionCounts = new HashMap<>(); int total = 0; for (ActiveMQConnection c : connections) { String key = c.getTransportChannel().getRemoteAddress(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java index ea09832..e33e7ea 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java @@ -254,7 +254,7 @@ public class FailoverConsumerOutstandingCommitTest { final CountDownLatch commitDoneLatch = new CountDownLatch(1); final CountDownLatch messagesReceived = new CountDownLatch(3); final AtomicBoolean gotCommitException = new AtomicBoolean(false); - final ArrayList<TextMessage> receivedMessages = new ArrayList<TextMessage>(); + final ArrayList<TextMessage> receivedMessages = new ArrayList<>(); final MessageConsumer testConsumer = consumerSession.createConsumer(destination); testConsumer.setMessageListener(new MessageListener() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java index 310e239..2779f52 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java @@ -139,7 +139,7 @@ public class FailoverConsumerUnconsumedTest { final Session consumerSession = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); final Queue destination = consumerSession.createQueue(QUEUE_NAME + "?jms.consumer.prefetch=" + prefetch); - final Vector<TestConsumer> testConsumers = new Vector<TestConsumer>(); + final Vector<TestConsumer> testConsumers = new Vector<>(); TestConsumer testConsumer = new TestConsumer(consumerSession, destination, connection); testConsumer.setMessageListener(new MessageListener() { @Override @@ -278,7 +278,7 @@ public class FailoverConsumerUnconsumedTest { final Session consumerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); final Queue destination = consumerSession.createQueue(QUEUE_NAME + "?jms.consumer.prefetch=" + prefetch); - final Vector<TestConsumer> testConsumers = new Vector<TestConsumer>(); + final Vector<TestConsumer> testConsumers = new Vector<>(); for (int i = 0; i < maxConsumers - 1; i++) { testConsumers.add(new TestConsumer(consumerSession, destination, connection)); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java index e48a699..57899ba 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java @@ -120,7 +120,7 @@ public class FailoverPrefetchZeroTest { produceMessage(consumerSession, destination, 1); final CountDownLatch receiveDone = new CountDownLatch(1); - final Vector<Message> received = new Vector<Message>(); + final Vector<Message> received = new Vector<>(); Executors.newSingleThreadExecutor().execute(new Runnable() { @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/transport/failover/FailoverPriorityTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java index fb4f969..b8860a7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java @@ -28,7 +28,7 @@ public class FailoverPriorityTest extends FailoverClusterTestSupport { private static final String BROKER_A_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61616"; private static final String BROKER_B_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61617"; private static final String BROKER_C_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61618"; - private final HashMap<String, String> urls = new HashMap<String, String>(); + private final HashMap<String, String> urls = new HashMap<>(); @Override public 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/transport/failover/FailoverTransactionTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java index 4ee219e..eb5bc61 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java @@ -760,7 +760,7 @@ public class FailoverTransactionTest extends TestSupport { }}); broker.start(); - Vector<Connection> connections = new Vector<Connection>(); + Vector<Connection> connections = new Vector<>(); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + url + ")"); configureConnectionFactory(cf); Connection connection = cf.createConnection(); @@ -785,7 +785,7 @@ public class FailoverTransactionTest extends TestSupport { produceMessage(producerSession, destination); produceMessage(producerSession, destination); - final Vector<Message> receivedMessages = new Vector<Message>(); + final Vector<Message> receivedMessages = new Vector<>(); final CountDownLatch commitDoneLatch = new CountDownLatch(1); final AtomicBoolean gotTransactionRolledBackException = new AtomicBoolean(false); Executors.newSingleThreadExecutor().execute(new Runnable() { @@ -924,7 +924,7 @@ public class FailoverTransactionTest extends TestSupport { }}); broker.start(); - Vector<Connection> connections = new Vector<Connection>(); + Vector<Connection> connections = new Vector<>(); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + url + ")"); configureConnectionFactory(cf); Connection connection = cf.createConnection(); @@ -941,13 +941,13 @@ public class FailoverTransactionTest extends TestSupport { final Session consumerSession = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); final int sessionCount = 10; - final Stack<Session> sessions = new Stack<Session>(); + final Stack<Session> sessions = new Stack<>(); for (int i = 0; i < sessionCount; i++) { sessions.push(connection.createSession(false, Session.AUTO_ACKNOWLEDGE)); } final int consumerCount = 1000; - final Deque<MessageConsumer> consumers = new ArrayDeque<MessageConsumer>(); + final Deque<MessageConsumer> consumers = new ArrayDeque<>(); for (int i = 0; i < consumerCount; i++) { consumers.push(consumerSession.createConsumer(destination)); } @@ -1150,7 +1150,7 @@ public class FailoverTransactionTest extends TestSupport { final CountDownLatch commitDone = new CountDownLatch(1); - final Vector<Exception> exceptions = new Vector<Exception>(); + final Vector<Exception> exceptions = new Vector<>(); // commit may fail if other consumer gets the message on restart Executors.newSingleThreadExecutor().execute(new Runnable() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java index 2826595..3a55473 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/SlowConnectionTest.java @@ -85,7 +85,7 @@ public class SlowConnectionTest extends TestCase { @Override public void run() { - List<Socket> inProgress = new ArrayList<Socket>(); + List<Socket> inProgress = new ArrayList<>(); ServerSocketFactory factory = ServerSocketFactory.getDefault(); try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java index e45bf64..84e8133 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/QualityOfServiceUtilsTest.java @@ -58,7 +58,7 @@ public class QualityOfServiceUtilsTest extends TestCase { } public void testValidDiffServNames() { - Map<String, Integer> namesToExpected = new HashMap<String, Integer>(); + Map<String, Integer> namesToExpected = new HashMap<>(); namesToExpected.put("CS0", Integer.valueOf("000000", 2)); namesToExpected.put("CS1", Integer.valueOf("001000", 2)); namesToExpected.put("CS2", Integer.valueOf("010000", 2)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SocketTstFactory.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SocketTstFactory.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SocketTstFactory.java index b4de0ce..34158cb 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SocketTstFactory.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SocketTstFactory.java @@ -36,7 +36,7 @@ public class SocketTstFactory extends SocketFactory { private static final Logger LOG = LoggerFactory.getLogger(SocketTstFactory.class); - private static final ConcurrentMap<InetAddress, Integer> closeIter = new ConcurrentHashMap<InetAddress, Integer>(); + private static final ConcurrentMap<InetAddress, Integer> closeIter = new ConcurrentHashMap<>(); private class SocketTst { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java index 32e26a3..8d3ff30 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java @@ -90,7 +90,7 @@ public class SslTransportFactoryTest extends TestCase { // 2 transport options, 3 socket options, 3 settings for each option => // 3^5 = 243 combos. for (int i = 0; i < 243; ++i) { - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); for (int j = 0; j < 5; ++j) { // -1 since the option range is [-1,1], not [0,2]. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java index 9640169..5bc9e2f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java @@ -77,7 +77,7 @@ public class TcpFaultyTransportFactory extends TcpTransportFactory { @Override public TransportServer doBind(final URI location) throws IOException { try { - Map<String, String> options = new HashMap<String, String>(URISupport.parseParameters(location)); + Map<String, String> options = new HashMap<>(URISupport.parseParameters(location)); ServerSocketFactory serverSocketFactory = createServerSocketFactory(); TcpFaultyTransportServer server = createTcpFaultyTransportServer(location, serverSocketFactory); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java index fb9c7ba..27a378d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java @@ -43,9 +43,9 @@ public class WireformatNegociationTest extends CombinationTestSupport { private Transport clientTransport; private Transport serverTransport; - private final AtomicReference<WireFormatInfo> clientWF = new AtomicReference<WireFormatInfo>(); - private final AtomicReference<WireFormatInfo> serverWF = new AtomicReference<WireFormatInfo>(); - private final AtomicReference<Exception> asyncError = new AtomicReference<Exception>(); + private final AtomicReference<WireFormatInfo> clientWF = new AtomicReference<>(); + private final AtomicReference<WireFormatInfo> serverWF = new AtomicReference<>(); + private final AtomicReference<Exception> asyncError = new AtomicReference<>(); private final AtomicBoolean ignoreAsycError = new AtomicBoolean(); private final CountDownLatch negotiationCounter = new CountDownLatch(2); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java index 1f8ad67..2268048 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java @@ -54,8 +54,8 @@ public class VMTransportThreadSafeTest { private final static String location1 = "vm://transport1"; private final static String location2 = "vm://transport2"; - private final ConcurrentLinkedQueue<DummyCommand> localReceived = new ConcurrentLinkedQueue<DummyCommand>(); - private final ConcurrentLinkedQueue<DummyCommand> remoteReceived = new ConcurrentLinkedQueue<DummyCommand>(); + private final ConcurrentLinkedQueue<DummyCommand> localReceived = new ConcurrentLinkedQueue<>(); + private final ConcurrentLinkedQueue<DummyCommand> remoteReceived = new ConcurrentLinkedQueue<>(); private class DummyCommand extends BaseCommand { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.java index 3453a2e..2b97cff 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.java @@ -129,7 +129,7 @@ public class VmTransportNetworkBrokerTest extends TestCase { */ public Thread[] filterDaemonThreads(Thread[] threads) throws Exception { - List<Thread> threadList = new ArrayList<Thread>(Arrays.asList(threads)); + List<Thread> threadList = new ArrayList<>(Arrays.asList(threads)); // Can't use an Iterator as it would raise a // ConcurrentModificationException when trying to remove an element http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java index 4e0acba..1154510 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java @@ -121,7 +121,7 @@ public class AMQStackOverFlowTest extends TestCase { //memoryManager.getMemoryUsage().setLimit(10); brokerService.setSystemUsage(memoryManager); - final List<PolicyEntry> policyEntries = new ArrayList<PolicyEntry>(); + final List<PolicyEntry> policyEntries = new ArrayList<>(); final PolicyEntry entry = new PolicyEntry(); entry.setQueue(">"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java index 347548c..dd7527d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java @@ -50,7 +50,7 @@ public class ChangeSentMessageTest extends TestSupport { MessageConsumer consumer = consumerSession.createConsumer(destination); Session publisherSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = publisherSession.createProducer(destination); - HashMap<String, Integer> map = new HashMap<String, Integer>(); + HashMap<String, Integer> map = new HashMap<>(); ObjectMessage message = publisherSession.createObjectMessage(); for (int i = 0; i < COUNT; i++) { map.put(VALUE_NAME, Integer.valueOf(i)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java index d1e8a42..c577c86 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentDestinationCreationTest.java @@ -70,7 +70,7 @@ public class ConcurrentDestinationCreationTest extends org.apache.activemq.TestS public void testSendRateWithActivatingConsumers() throws Exception { - final Vector<Throwable> exceptions = new Vector<Throwable>(); + final Vector<Throwable> exceptions = new Vector<>(); final int jobs = 50; final int destinationCount = 10; final CountDownLatch allDone = new CountDownLatch(jobs); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java index a65d217..e470949 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java @@ -69,7 +69,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport { private final int consumerCount = 5; BrokerService broker; protected List<Connection> connections = Collections.synchronizedList(new ArrayList<Connection>()); - protected Map<MessageConsumer, TimedMessageListener> consumers = new HashMap<MessageConsumer, TimedMessageListener>(); + protected Map<MessageConsumer, TimedMessageListener> consumers = new HashMap<>(); protected MessageIdList allMessagesList = new MessageIdList(); private final int messageSize = 1024; @@ -80,7 +80,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport { TestSupport.PersistenceAdapterChoice[] kahaDb = {TestSupport.PersistenceAdapterChoice.KahaDB}; TestSupport.PersistenceAdapterChoice[] levelDb = {TestSupport.PersistenceAdapterChoice.LevelDB}; TestSupport.PersistenceAdapterChoice[] mem = {TestSupport.PersistenceAdapterChoice.MEM}; - List<TestSupport.PersistenceAdapterChoice[]> choices = new ArrayList<TestSupport.PersistenceAdapterChoice[]>(); + List<TestSupport.PersistenceAdapterChoice[]> choices = new ArrayList<>(); choices.add(kahaDb); choices.add(levelDb); choices.add(mem); @@ -400,7 +400,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport { long batchReceiptAccumulator = 0; long maxReceiptTime = 0; AtomicLong count = new AtomicLong(0); - Map<Integer, MessageIdList> messageLists = new ConcurrentHashMap<Integer, MessageIdList>(new HashMap<Integer, MessageIdList>()); + Map<Integer, MessageIdList> messageLists = new ConcurrentHashMap<>(new HashMap<Integer, MessageIdList>()); @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/ConcurrentProducerQueueConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java index bbd8e5d..14ac31f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java @@ -60,7 +60,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport { private static final Logger LOG = LoggerFactory.getLogger(ConcurrentProducerQueueConsumerTest.class); protected List<Connection> connections = Collections.synchronizedList(new ArrayList<Connection>()); - protected Map<MessageConsumer, TimedMessageListener> consumers = new HashMap<MessageConsumer, TimedMessageListener>(); + protected Map<MessageConsumer, TimedMessageListener> consumers = new HashMap<>(); protected MessageIdList allMessagesList = new MessageIdList(); private BrokerService broker; @@ -354,7 +354,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport { long batchReceiptAccumulator = 0; long maxReceiptTime = 0; - final Map<Integer, MessageIdList> messageLists = new ConcurrentHashMap<Integer, MessageIdList>(new HashMap<Integer, MessageIdList>()); + final Map<Integer, MessageIdList> messageLists = new ConcurrentHashMap<>(new HashMap<Integer, MessageIdList>()); @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/ConsumeTopicPrefetchTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java index 91103cd..5c2c29e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java @@ -66,7 +66,7 @@ public class ConsumeTopicPrefetchTest extends ProducerConsumerTestSupport { validateConsumerPrefetch(this.getSubject(), prefetchSize); - LinkedList<TextMessage> consumed = new LinkedList<TextMessage>(); + LinkedList<TextMessage> consumed = new LinkedList<>(); // lets consume them in two fetch batches int batchSize = messageCount / 2; for (int i = 0; i < batchSize; i++) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java index a8f85f3..2533098 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java @@ -61,7 +61,7 @@ public class DurableSubDelayedUnsubscribeTest { private static final int CARGO_SIZE = 400; // max private static final int MAX_CLIENTS = 15; private static boolean ALLOW_SUBSCRIPTION_ABANDONMENT = true; - private static final Vector<Throwable> exceptions = new Vector<Throwable>(); + private static final Vector<Throwable> exceptions = new Vector<>(); private BrokerService broker; private ActiveMQTopic topic; @@ -357,7 +357,7 @@ public class DurableSubDelayedUnsubscribeTest { private int clientRover = 0; - private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<Client>(); + private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<>(); private boolean stopped; @@ -605,7 +605,7 @@ public class DurableSubDelayedUnsubscribeTest { setDaemon(true); } - public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<String>(); + public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<>(); public void shutdown() throws Exception { done.set(true); @@ -650,7 +650,7 @@ public class DurableSubDelayedUnsubscribeTest { LOG.info("Housekeeper sweeping."); int closed = 0; - ArrayList<String> sweeped = new ArrayList<String>(); + ArrayList<String> sweeped = new ArrayList<>(); try { for (String clientId : abandonedSubscriptions) { LOG.info("Sweeping out subscription of " + clientId + "."); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java index e03ecf3..e04ca9c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java @@ -87,7 +87,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { private final ReentrantReadWriteLock processLock = new ReentrantReadWriteLock(true); private int restartCount = 0; private final AtomicInteger onlineCount = new AtomicInteger(0); - static final Vector<Throwable> exceptions = new Vector<Throwable>(); + static final Vector<Throwable> exceptions = new Vector<>(); // long form of test that found https://issues.apache.org/jira/browse/AMQ-3805 @Ignore("short version in org.apache.activemq.usecases.DurableSubscriptionOfflineTest.testNoDuplicateOnConcurrentSendTranCommitAndActivate" + " and org.apache.activemq.usecases.DurableSubscriptionOfflineTest.testOrderOnActivateDeactivate") @@ -292,7 +292,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { ClientType(String... messageTypes) { this.messageTypes = messageTypes; - messageTypeSet = new HashSet<String>(Arrays.asList(messageTypes)); + messageTypeSet = new HashSet<>(Arrays.asList(messageTypes)); StringBuilder sb = new StringBuilder("TYPE in ("); for (int i = 0; i < messageTypes.length; i++) { @@ -333,7 +333,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { private int clientRover = 0; - private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<Client>(); + private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<>(); private boolean end; @@ -434,7 +434,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { private final ClientType clientType; private final String selector; - private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<Message>(); + private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<>(); private final HashSet<Integer> processed = CHECK_REDELIVERY ? new HashSet<Integer>(10000) : null; private ActiveMQMessageConsumer consumer = null; @@ -702,7 +702,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { setDaemon(true); } - public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<String>(); + public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<>(); @Override public void run() { @@ -732,7 +732,7 @@ public class DurableSubProcessConcurrentCommitActivateNoDuplicateTest { LOG.info("Housekeeper sweeping."); int closed = 0; - ArrayList<String> sweeped = new ArrayList<String>(); + ArrayList<String> sweeped = new ArrayList<>(); try { for (String clientId : abandonedSubscriptions) { LOG.info("Sweeping out subscription of " + clientId + "."); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java index 90a02c9..79d3eb0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java @@ -61,7 +61,7 @@ public class DurableSubProcessMultiRestartTest { private int restartCount = 0; private final int SUBSCRIPTION_ID = 1; - static final Vector<Throwable> exceptions = new Vector<Throwable>(); + static final Vector<Throwable> exceptions = new Vector<>(); /** * The test creates a durable subscriber and producer with a broker that is http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java index cadd730..8a572e9 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java @@ -61,7 +61,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { private Server server; private HouseKeeper houseKeeper; - static final Vector<Throwable> exceptions = new Vector<Throwable>(); + static final Vector<Throwable> exceptions = new Vector<>(); @Test public void testProcess() { @@ -205,7 +205,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { ClientType(String... messageTypes) { this.messageTypes = messageTypes; - messageTypeSet = new HashSet<String>(Arrays.asList(messageTypes)); + messageTypeSet = new HashSet<>(Arrays.asList(messageTypes)); StringBuilder sb = new StringBuilder("TYPE in ("); for (int i = 0; i < messageTypes.length; i++) { @@ -246,7 +246,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { private int clientRover = 0; - private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<Client>(); + private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<>(); public ClientManager() { super("ClientManager"); @@ -338,7 +338,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { private final ClientType clientType; private final String selector; - private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<Message>(); + private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<>(); public Client(int id, ClientType clientType, Random lifetime, Random online, Random offline) throws JMSException { super("Client" + id); @@ -538,7 +538,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { setDaemon(true); } - public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<String>(); + public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<>(); @Override public void run() { @@ -561,7 +561,7 @@ public class DurableSubProcessTest extends org.apache.activemq.TestSupport { LOG.info("Housekeeper sweeping."); int closed = 0; - ArrayList<String> sweeped = new ArrayList<String>(); + ArrayList<String> sweeped = new ArrayList<>(); try { for (String clientId : abandonedSubscriptions) { sweeped.add(clientId); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java index e4118ec..5c778de 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java @@ -79,7 +79,7 @@ public class DurableSubProcessWithRestartTest { private final ReentrantReadWriteLock processLock = new ReentrantReadWriteLock(true); private int restartCount = 0; - static final Vector<Throwable> exceptions = new Vector<Throwable>(); + static final Vector<Throwable> exceptions = new Vector<>(); // this is a nice test but it takes 5mins, may be handy in the future // resulting bug https://issues.apache.org/jira/browse/AMQ-3190 @@ -257,7 +257,7 @@ public class DurableSubProcessWithRestartTest { ClientType(String... messageTypes) { this.messageTypes = messageTypes; - messageTypeSet = new HashSet<String>(Arrays.asList(messageTypes)); + messageTypeSet = new HashSet<>(Arrays.asList(messageTypes)); StringBuilder sb = new StringBuilder("TYPE in ("); for (int i = 0; i < messageTypes.length; i++) { @@ -298,7 +298,7 @@ public class DurableSubProcessWithRestartTest { private int clientRover = 0; - private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<Client>(); + private final CopyOnWriteArrayList<Client> clients = new CopyOnWriteArrayList<>(); public ClientManager() { super("ClientManager"); @@ -391,7 +391,7 @@ public class DurableSubProcessWithRestartTest { private final ClientType clientType; private final String selector; - private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<Message>(); + private final ConcurrentLinkedQueue<Message> waitingList = new ConcurrentLinkedQueue<>(); private final HashSet<Integer> processed = CHECK_REDELIVERY ? new HashSet<Integer>(10000) : null; public Client(int id, ClientType clientType, Random lifetime, Random online, Random offline) throws JMSException { @@ -601,7 +601,7 @@ public class DurableSubProcessWithRestartTest { setDaemon(true); } - public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<String>(); + public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<>(); @Override public void run() { @@ -631,7 +631,7 @@ public class DurableSubProcessWithRestartTest { LOG.info("Housekeeper sweeping."); int closed = 0; - ArrayList<String> sweeped = new ArrayList<String>(); + ArrayList<String> sweeped = new ArrayList<>(); try { for (String clientId : abandonedSubscriptions) { LOG.info("Sweeping out subscription of " + clientId + "."); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java index 48ba447..4ccd348 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest.java @@ -47,7 +47,7 @@ public class DurableSubsOfflineSelectorConcurrentConsumeIndexUseTest extends org public int messageCount = 10000; private BrokerService broker; private ActiveMQTopic topic; - private final List<Throwable> exceptions = new ArrayList<Throwable>(); + private final List<Throwable> exceptions = new ArrayList<>(); @Override protected ActiveMQConnectionFactory createConnectionFactory() 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/DurableSubsOfflineSelectorIndexUseTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java index bc291bc..540cdde 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java @@ -45,7 +45,7 @@ public class DurableSubsOfflineSelectorIndexUseTest extends org.apache.activemq. public int messageCount = 400; private BrokerService broker; private ActiveMQTopic topic; - private List<Throwable> exceptions = new ArrayList<Throwable>(); + private List<Throwable> exceptions = new ArrayList<>(); @Override protected ActiveMQConnectionFactory createConnectionFactory() 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/DurableSubscriptionOffline1Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java index 2f69b4d..f6cda17 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline1Test.java @@ -44,7 +44,7 @@ public class DurableSubscriptionOffline1Test extends DurableSubscriptionOfflineT String osName = System.getProperty("os.name"); LOG.debug("Running on [" + osName + "]"); - List<PersistenceAdapterChoice> persistenceAdapterChoices = new ArrayList<PersistenceAdapterChoice>(); + List<PersistenceAdapterChoice> persistenceAdapterChoices = new ArrayList<>(); persistenceAdapterChoices.add(PersistenceAdapterChoice.KahaDB); persistenceAdapterChoices.add(PersistenceAdapterChoice.JDBC); @@ -53,7 +53,7 @@ public class DurableSubscriptionOffline1Test extends DurableSubscriptionOfflineT persistenceAdapterChoices.add(PersistenceAdapterChoice.LevelDB); } - List<Object[]> testParameters = new ArrayList<Object[]>(); + List<Object[]> testParameters = new ArrayList<>(); Boolean[] booleanValues = {Boolean.FALSE, Boolean.TRUE}; List<Boolean> booleans = java.util.Arrays.asList(booleanValues); for (Boolean booleanValue : booleans) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java index a0a4bcd..d15162f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline2Test.java @@ -46,7 +46,7 @@ public class DurableSubscriptionOffline2Test extends DurableSubscriptionOfflineT public static Collection<Boolean[]> getTestParameters() { Boolean[] f = {Boolean.FALSE}; Boolean[] t = {Boolean.TRUE}; - List<Boolean[]> booleanChoices = new ArrayList<Boolean[]>(); + List<Boolean[]> booleanChoices = new ArrayList<>(); booleanChoices.add(f); booleanChoices.add(t); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java index 829c66a..3aff528 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline3Test.java @@ -48,7 +48,7 @@ public class DurableSubscriptionOffline3Test extends DurableSubscriptionOfflineT PersistenceAdapterChoice[] kahaDb = {PersistenceAdapterChoice.KahaDB}; PersistenceAdapterChoice[] jdbc = {PersistenceAdapterChoice.JDBC}; - List<PersistenceAdapterChoice[]> choices = new ArrayList<PersistenceAdapterChoice[]>(); + List<PersistenceAdapterChoice[]> choices = new ArrayList<>(); choices.add(kahaDb); choices.add(jdbc); if (!osName.equalsIgnoreCase("AIX") && !osName.equalsIgnoreCase("SunOS")) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java index e6edee9..adcf8fb 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java @@ -45,7 +45,7 @@ public class DurableSubscriptionOffline4Test extends DurableSubscriptionOfflineT public static Collection<Boolean[]> getTestParameters() { Boolean[] f = {Boolean.FALSE}; Boolean[] t = {Boolean.TRUE}; - List<Boolean[]> booleanChoices = new ArrayList<Boolean[]>(); + List<Boolean[]> booleanChoices = new ArrayList<>(); booleanChoices.add(f); booleanChoices.add(t); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java index f7689d8..ca197a4 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java @@ -310,7 +310,7 @@ public class DurableSubscriptionOfflineTest extends DurableSubscriptionOfflineTe class CheckForDupsClient implements Runnable { - HashSet<Long> ids = new HashSet<Long>(); + HashSet<Long> ids = new HashSet<>(); final int id; public CheckForDupsClient(int id) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTestBase.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTestBase.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTestBase.java index e53f191..c05edcb 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTestBase.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTestBase.java @@ -55,7 +55,7 @@ public abstract class DurableSubscriptionOfflineTestBase { public boolean keepDurableSubsActive = true; protected BrokerService broker; protected ActiveMQTopic topic; - protected final List<Throwable> exceptions = new ArrayList<Throwable>(); + protected final List<Throwable> exceptions = new ArrayList<>(); protected ActiveMQConnectionFactory connectionFactory; protected boolean isTopic = true; public PersistenceAdapterChoice defaultPersistenceAdapter = PersistenceAdapterChoice.KahaDB; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java index f542ecb..664e0e7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java @@ -49,7 +49,7 @@ public class ExceptionListenerTest implements ExceptionListener { private static final Logger LOG = LoggerFactory.getLogger(ExceptionListenerTest.class); BrokerService brokerService; URI brokerUri; - LinkedList<Throwable> exceptionsViaListener = new LinkedList<Throwable>(); + LinkedList<Throwable> exceptionsViaListener = new LinkedList<>(); @Before public void startBroker() 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/JdbcDurableSubDupTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java index de7ee38..88adefe 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java @@ -63,7 +63,7 @@ public class JdbcDurableSubDupTest { final int TO_RECEIVE = 5000; BrokerService broker = null; - Vector<Throwable> exceptions = new Vector<Throwable>(); + Vector<Throwable> exceptions = new Vector<>(); final int MAX_MESSAGES = 100000; int[] dupChecker = new int[MAX_MESSAGES]; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java index 5a67c46..7c8e4ac 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java @@ -44,10 +44,10 @@ public class MessageGroupCloseTest extends TestCase { private int messagesSent, messagesRecvd1, messagesRecvd2, messageGroupCount, errorCountFirstForConsumer, errorCountWrongConsumerClose, errorCountDuplicateClose; // groupID, count - private HashMap<String, Integer> messageGroups1 = new HashMap<String, Integer>(); - private HashMap<String, Integer> messageGroups2 = new HashMap<String, Integer>(); - private HashSet<String> closedGroups1 = new HashSet<String>(); - private HashSet<String> closedGroups2 = new HashSet<String>(); + private HashMap<String, Integer> messageGroups1 = new HashMap<>(); + private HashMap<String, Integer> messageGroups2 = new HashMap<>(); + private HashSet<String> closedGroups1 = new HashSet<>(); + private HashSet<String> closedGroups2 = new HashSet<>(); // with the prefetch too high, this bug is not realized private static final String connStr = "vm://localhost?broker.persistent=false&broker.useJmx=false&jms.prefetchPolicy.all=1"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java index 6786319..1ed4127 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java @@ -54,8 +54,8 @@ public class MessageGroupDelayedTest extends JmsTestSupport { BrokerService broker; protected TransportConnector connector; - protected HashMap<String, Integer> messageCount = new HashMap<String, Integer>(); - protected HashMap<String, Set<String>> messageGroups = new HashMap<String, Set<String>>(); + protected HashMap<String, Integer> messageCount = new HashMap<>(); + protected HashMap<String, Set<String>> messageGroups = new HashMap<>(); public static Test suite() { return suite(MessageGroupDelayedTest.class); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupLateArrivalsTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupLateArrivalsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupLateArrivalsTest.java index 8b83e44..af91f5a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupLateArrivalsTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupLateArrivalsTest.java @@ -60,8 +60,8 @@ public class MessageGroupLateArrivalsTest { BrokerService broker; protected TransportConnector connector; - protected HashMap<String, Integer> messageCount = new HashMap<String, Integer>(); - protected HashMap<String, Set<String>> messageGroups = new HashMap<String, Set<String>>(); + protected HashMap<String, Integer> messageCount = new HashMap<>(); + protected HashMap<String, Set<String>> messageGroups = new HashMap<>(); @Before public void setUp() throws Exception { @@ -149,7 +149,7 @@ public class MessageGroupLateArrivalsTest { doneSignal.await(); - List<String> workers = new ArrayList<String>(messageCount.keySet()); + List<String> workers = new ArrayList<>(messageCount.keySet()); Collections.sort(workers); for (String worker : workers) { log.info("worker " + worker + " received " + messageCount.get(worker) + " messages from groups " + messageGroups.get(worker)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java index 6096266..7b5c219 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java @@ -119,8 +119,8 @@ public class MessageGroupReconnectDistributionTest { final AtomicLong totalConsumed = new AtomicLong(0); ExecutorService executorService = Executors.newFixedThreadPool(numConsumers); - final ArrayList<AtomicLong> consumedCounters = new ArrayList<AtomicLong>(numConsumers); - final ArrayList<AtomicLong> batchCounters = new ArrayList<AtomicLong>(numConsumers); + final ArrayList<AtomicLong> consumedCounters = new ArrayList<>(numConsumers); + final ArrayList<AtomicLong> batchCounters = new ArrayList<>(numConsumers); for (int i = 0; i < numConsumers; i++) { consumedCounters.add(new AtomicLong(0L)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java index 0888ca2..54dc36e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java @@ -45,7 +45,7 @@ public class MultiBrokersMultiClientsTest extends JmsMultipleBrokersTestSupport private static final Logger LOG = LoggerFactory.getLogger(MultiBrokersMultiClientsTest.class); protected Map<String, MessageConsumer> consumerMap; - final Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>(); + final Map<Thread, Throwable> unhandeledExceptions = new HashMap<>(); public void testTopicAllConnected() throws Exception { bridgeAllBrokers(); @@ -156,7 +156,7 @@ public class MultiBrokersMultiClientsTest extends JmsMultipleBrokersTestSupport createBroker(new URI("broker:()/Broker" + i + "?persistent=false&useJmx=false")); } - consumerMap = new HashMap<String, MessageConsumer>(); + consumerMap = new HashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java index 816589d..1e1c860 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java @@ -85,6 +85,6 @@ public class MultiBrokersMultiClientsUsingTcpTest extends MultiBrokersMultiClien i.next().broker.addConnector("tcp://localhost:" + (61616 + j++)); } - 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/NetworkBridgeProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java index a3705f9..270b437 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java @@ -106,7 +106,7 @@ public class NetworkBridgeProducerFlowControlTest extends JmsMultipleBrokersTest public boolean persistentTestMessages; public boolean networkIsAlwaysSendSync; - private Vector<Throwable> exceptions = new Vector<Throwable>(); + private Vector<Throwable> exceptions = new Vector<>(); public static Test suite() { return suite(NetworkBridgeProducerFlowControlTest.class); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java index 1b8617e..5058e5f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java @@ -238,7 +238,7 @@ public class NoDuplicateOnTopicNetworkTest extends CombinationTestSupport { consumerThread.join(); int duplicateCount = 0; - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for (String msg : consumer.getMessageStrings()) { if (map.containsKey(msg)) { LOG.info("got duplicate: " + msg); @@ -280,7 +280,7 @@ public class NoDuplicateOnTopicNetworkTest extends CombinationTestSupport { public List<String> getMessageStrings() { synchronized (receivedStrings) { - return new ArrayList<String>(receivedStrings); + return new ArrayList<>(receivedStrings); } }
