activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [09/32] activemq-artemis git commit: Remove redundant type arguments
Date Tue, 08 Dec 2015 00:12:35 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
index 0983ffa..284d61d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
@@ -125,7 +125,7 @@ public class AddressControlTest extends ManagementTestBase {
       Object[] roles = addressControl.getRoles();
       Assert.assertEquals(0, roles.length);
 
-      Set<Role> newRoles = new HashSet<Role>();
+      Set<Role> newRoles = new HashSet<>();
       newRoles.add(role);
       server.getSecurityRepository().addMatch(address.toString(), newRoles);
 
@@ -158,7 +158,7 @@ public class AddressControlTest extends ManagementTestBase {
       RoleInfo[] roles = RoleInfo.from(jsonString);
       Assert.assertEquals(0, roles.length);
 
-      Set<Role> newRoles = new HashSet<Role>();
+      Set<Role> newRoles = new HashSet<>();
       newRoles.add(role);
       server.getSecurityRepository().addMatch(address.toString(), newRoles);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
index 3b415f0..57181bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
@@ -132,7 +132,7 @@ public class AddressControlUsingCoreTest extends ManagementTestBase {
       }
       Assert.assertEquals(0, roles.length);
 
-      Set<Role> newRoles = new HashSet<Role>();
+      Set<Role> newRoles = new HashSet<>();
       newRoles.add(role);
       server.getSecurityRepository().addMatch(address.toString(), newRoles);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
index 43d7048..d1eb9ea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
@@ -117,7 +117,7 @@ public class BridgeControlTest extends ManagementTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> acceptorParams = new HashMap<String, Object>();
+      Map<String, Object> acceptorParams = new HashMap<>();
       acceptorParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
       TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), acceptorParams, RandomUtil.randomString());
 
@@ -125,7 +125,7 @@ public class BridgeControlTest extends ManagementTestBase {
 
       CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
       CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
-      List<String> connectors = new ArrayList<String>();
+      List<String> connectors = new ArrayList<>();
       connectors.add(connectorConfig.getName());
 
       Configuration conf_1 = createBasicConfig().addAcceptorConfiguration(acceptorConfig).addQueueConfiguration(targetQueueConfig);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
index 025b1e9..e917e0a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
@@ -104,7 +104,7 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> acceptorParams = new HashMap<String, Object>();
+      Map<String, Object> acceptorParams = new HashMap<>();
       acceptorParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
       TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), acceptorParams, RandomUtil.randomString());
 
@@ -112,7 +112,7 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
 
       CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
       CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
-      List<String> connectors = new ArrayList<String>();
+      List<String> connectors = new ArrayList<>();
       connectors.add(connectorConfig.getName());
       bridgeConfig = new BridgeConfiguration().setName(RandomUtil.randomString()).setQueueName(sourceQueueConfig.getName()).setForwardingAddress(targetQueueConfig.getAddress()).setRetryInterval(RandomUtil.randomPositiveLong()).setRetryIntervalMultiplier(RandomUtil.randomDouble()).setInitialConnectAttempts(RandomUtil.randomPositiveInt()).setReconnectAttempts(RandomUtil.randomPositiveInt()).setReconnectAttemptsOnSameNode(RandomUtil.randomPositiveInt()).setUseDuplicateDetection(RandomUtil.randomBoolean()).setConfirmationWindowSize(RandomUtil.randomPositiveInt()).setStaticConnectors(connectors);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
index bc1fb65..e6759eb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
@@ -83,7 +83,7 @@ public class BroadcastGroupControlTest extends ManagementTestBase {
       super.setUp();
 
       TransportConfiguration connectorConfiguration = new TransportConfiguration(NETTY_CONNECTOR_FACTORY);
-      List<String> connectorInfos = new ArrayList<String>();
+      List<String> connectorInfos = new ArrayList<>();
       connectorInfos.add(connectorConfiguration.getName());
       broadcastGroupConfig = new BroadcastGroupConfiguration().setName(RandomUtil.randomString()).setBroadcastPeriod(RandomUtil.randomPositiveInt()).setConnectorInfos(connectorInfos).setEndpointFactory(new UDPBroadcastEndpointFactory().setGroupAddress("231.7.7.7").setGroupPort(1199).setLocalBindPort(1198));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
index 10027b0..12fc1ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
@@ -103,7 +103,7 @@ public class ClusterConnectionControl2Test extends ManagementTestBase {
       String groupAddress = "231.7.7.7";
       int groupPort = 9876;
 
-      Map<String, Object> acceptorParams_1 = new HashMap<String, Object>();
+      Map<String, Object> acceptorParams_1 = new HashMap<>();
       acceptorParams_1.put(TransportConstants.PORT_PROP_NAME, port_1);
       TransportConfiguration acceptorConfig_0 = new TransportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY);
 
@@ -113,7 +113,7 @@ public class ClusterConnectionControl2Test extends ManagementTestBase {
       TransportConfiguration connectorConfig_0 = new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY);
 
       CoreQueueConfiguration queueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
-      List<String> connectorInfos = new ArrayList<String>();
+      List<String> connectorInfos = new ArrayList<>();
       connectorInfos.add("netty");
 
       BroadcastGroupConfiguration broadcastGroupConfig = new BroadcastGroupConfiguration().setName(discoveryName).setBroadcastPeriod(250).setConnectorInfos(connectorInfos).setEndpointFactory(new UDPBroadcastEndpointFactory().setGroupAddress(groupAddress).setGroupPort(groupPort));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
index 1fb9c43..d32b054 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
@@ -187,14 +187,14 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> acceptorParams = new HashMap<String, Object>();
+      Map<String, Object> acceptorParams = new HashMap<>();
       acceptorParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
       TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), acceptorParams, RandomUtil.randomString());
 
       TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName(), acceptorParams, RandomUtil.randomString());
 
       CoreQueueConfiguration queueConfig = new CoreQueueConfiguration().setAddress(RandomUtil.randomString()).setName(RandomUtil.randomString()).setDurable(false);
-      List<String> connectors = new ArrayList<String>();
+      List<String> connectors = new ArrayList<>();
       connectors.add(connectorConfig.getName());
 
       String discoveryGroupName = RandomUtil.randomString();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
index 86a9d02..2a357b0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
@@ -40,7 +40,7 @@ public class JMXDomainTest extends ManagementTestBase {
 
       String jmxDomain_1 = ActiveMQDefaultConfiguration.getDefaultJmxDomain() + ".1";
 
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
       Configuration config_1 = createBasicConfig().addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params)).setJMXDomain(jmxDomain_1);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
index 5a538ff..480f536 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
@@ -69,7 +69,7 @@ public class ManagementActivationTest extends FailoverTestBase {
 
    @Test
    public void testCreateConnectionFactory() throws Exception {
-      List<String> connectorNames = new ArrayList<String>();
+      List<String> connectorNames = new ArrayList<>();
       connectorNames.add(connectorName);
 
       ConnectionFactoryConfiguration config = new ConnectionFactoryConfigurationImpl().setName("test").setConnectorNames(connectorNames).setBindings("/myConnectionFactory");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index 16839e0..d6bd6a4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -74,7 +74,7 @@ public class ManagementHelperTest extends Assert {
       double d = RandomUtil.randomDouble();
       boolean b = RandomUtil.randomBoolean();
       long l = RandomUtil.randomLong();
-      Map<String, Object> map = new HashMap<String, Object>();
+      Map<String, Object> map = new HashMap<>();
       String key1 = RandomUtil.randomString();
       int value1 = RandomUtil.randomInt();
       String key2 = RandomUtil.randomString();
@@ -91,7 +91,7 @@ public class ManagementHelperTest extends Assert {
       map.put(key4, value4);
       map.put(key5, value5);
 
-      Map<String, Object> map2 = new HashMap<String, Object>();
+      Map<String, Object> map2 = new HashMap<>();
       String key2_1 = RandomUtil.randomString();
       int value2_1 = RandomUtil.randomInt();
       String key2_2 = RandomUtil.randomString();
@@ -108,7 +108,7 @@ public class ManagementHelperTest extends Assert {
       map2.put(key2_4, value2_4);
       map2.put(key2_5, value2_5);
 
-      Map<String, Object> map3 = new HashMap<String, Object>();
+      Map<String, Object> map3 = new HashMap<>();
       String key3_1 = RandomUtil.randomString();
       int value3_1 = RandomUtil.randomInt();
       String key3_2 = RandomUtil.randomString();
@@ -185,7 +185,7 @@ public class ManagementHelperTest extends Assert {
       String resource = RandomUtil.randomString();
       String operationName = RandomUtil.randomString();
 
-      Map<String, Object> map = new HashMap<String, Object>();
+      Map<String, Object> map = new HashMap<>();
       String key1 = RandomUtil.randomString();
       String[] val1 = new String[]{"a", "b", "c"};
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
index 1816d00..96b6dc3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
@@ -160,7 +160,7 @@ public class ManagementWithStompTest extends ManagementTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.PROTOCOLS_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME);
       params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT);
       TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
index 98ee6f7..b3e20c9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
@@ -90,7 +90,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
 
       // guest can not create queue
       Role role = new Role("roleCanNotCreateQueue", true, true, false, true, false, true, true);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(address.toString(), roles);
       ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
@@ -139,7 +139,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
       securityManager.getConfiguration().setDefaultUser("guest");
 
       Role role = new Role("notif", true, true, true, true, true, true, true);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(), roles);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
index 6627014..f15af10 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
@@ -293,7 +293,7 @@ public class MQTTTest extends MQTTTestSupport {
       String RETAINED = "retained";
       publisher.publish("foo", RETAINED.getBytes(), AT_LEAST_ONCE, true);
 
-      List<String> messages = new ArrayList<String>();
+      List<String> messages = new ArrayList<>();
       for (int i = 0; i < 10; i++) {
          messages.add("TEST MESSAGE:" + i);
       }
@@ -629,7 +629,7 @@ public class MQTTTest extends MQTTTestSupport {
       mqtt.setKeepAlive((short) 2);
       mqtt.setCleanSession(true);
 
-      final List<PUBLISH> publishList = new ArrayList<PUBLISH>();
+      final List<PUBLISH> publishList = new ArrayList<>();
       mqtt.setTracer(new Tracer() {
          @Override
          public void onReceive(MQTTFrame frame) {
@@ -715,7 +715,7 @@ public class MQTTTest extends MQTTTestSupport {
       final MQTT mqtt = createMQTTConnection("resend", false);
       mqtt.setKeepAlive((short) 5);
 
-      final List<PUBLISH> publishList = new ArrayList<PUBLISH>();
+      final List<PUBLISH> publishList = new ArrayList<>();
       mqtt.setTracer(new Tracer() {
          @Override
          public void onReceive(MQTTFrame frame) {
@@ -785,7 +785,7 @@ public class MQTTTest extends MQTTTestSupport {
       final MQTT mqtt = createMQTTConnection("nonclean-packetid", false);
       mqtt.setKeepAlive((short) 15);
 
-      final Map<Short, PUBLISH> publishMap = new ConcurrentHashMap<Short, PUBLISH>();
+      final Map<Short, PUBLISH> publishMap = new ConcurrentHashMap<>();
       mqtt.setTracer(new Tracer() {
          @Override
          public void onReceive(MQTTFrame frame) {
@@ -860,7 +860,7 @@ public class MQTTTest extends MQTTTestSupport {
    // If there is a good reason for this we should follow ActiveMQ.
    public void testPacketIdGeneratorCleanSession() throws Exception {
       final String[] cleanClientIds = new String[]{"", "clean-packetid", null};
-      final Map<Short, PUBLISH> publishMap = new ConcurrentHashMap<Short, PUBLISH>();
+      final Map<Short, PUBLISH> publishMap = new ConcurrentHashMap<>();
       MQTT[] mqtts = new MQTT[cleanClientIds.length];
       for (int i = 0; i < cleanClientIds.length; i++) {
          mqtts[i] = createMQTTConnection("", true);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index 28cd8d3..2e37110 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -55,7 +55,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
 
    protected int port = 1883;
    protected ActiveMQConnectionFactory cf;
-   protected LinkedList<Throwable> exceptions = new LinkedList<Throwable>();
+   protected LinkedList<Throwable> exceptions = new LinkedList<>();
    protected boolean persistent;
    protected String protocolConfig;
    protected String protocolScheme;
@@ -134,7 +134,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
       // MQTT transport connectors as needed, the port variable is always supposed to be
       // assigned the primary MQTT connector's port.
 
-      HashMap<String, Object> params = new HashMap<String, Object>();
+      HashMap<String, Object> params = new HashMap<>();
       params.put(TransportConstants.PORT_PROP_NAME, "" + 5445);
       params.put(TransportConstants.PROTOCOLS_PROP_NAME, "CORE");
       TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
@@ -148,7 +148,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
       // MQTT transport connectors as needed, the port variable is always supposed to be
       // assigned the primary MQTT connector's port.
 
-      HashMap<String, Object> params = new HashMap<String, Object>();
+      HashMap<String, Object> params = new HashMap<>();
       params.put(TransportConstants.PORT_PROP_NAME, "" + port);
       params.put(TransportConstants.PROTOCOLS_PROP_NAME, "MQTT");
       TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/PahoMQTTTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/PahoMQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/PahoMQTTTest.java
index 73f52c0..bd912ff 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/PahoMQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/PahoMQTTTest.java
@@ -60,7 +60,7 @@ public class PahoMQTTTest extends MQTTTestSupport {
       client.connect();
       client.subscribe("test");
 
-      final AtomicReference<Throwable> asyncError = new AtomicReference<Throwable>();
+      final AtomicReference<Throwable> asyncError = new AtomicReference<>();
       final CountDownLatch connectedDoneLatch = new CountDownLatch(CLIENTS);
       final CountDownLatch disconnectDoneLatch = new CountDownLatch(CLIENTS);
       final CountDownLatch sendBarrier = new CountDownLatch(1);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/util/ResourceLoadingSslContext.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/util/ResourceLoadingSslContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/util/ResourceLoadingSslContext.java
index 7312e62..91eef82 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/util/ResourceLoadingSslContext.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/util/ResourceLoadingSslContext.java
@@ -93,7 +93,7 @@ public class ResourceLoadingSslContext extends SslContext {
    private Collection<TrustManager> createTrustManagers() throws Exception {
       KeyStore ks = createTrustManagerKeyStore();
       if (ks == null) {
-         return new ArrayList<TrustManager>(0);
+         return new ArrayList<>(0);
       }
 
       TrustManagerFactory tmf = TrustManagerFactory.getInstance(trustStoreAlgorithm);
@@ -104,7 +104,7 @@ public class ResourceLoadingSslContext extends SslContext {
    private Collection<KeyManager> createKeyManagers() throws Exception {
       KeyStore ks = createKeyManagerKeyStore();
       if (ks == null) {
-         return new ArrayList<KeyManager>(0);
+         return new ArrayList<>(0);
       }
 
       KeyManagerFactory tmf = KeyManagerFactory.getInstance(keyStoreAlgorithm);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
index 01dafe0..d2e3215 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
@@ -54,7 +54,7 @@ public class BasicOpenWireTest extends OpenWireTestBase {
    protected String messageTextPrefix = "";
    protected boolean topic = true;
 
-   protected Map<String, SimpleString> testQueues = new HashMap<String, SimpleString>();
+   protected Map<String, SimpleString> testQueues = new HashMap<>();
 
    @Override
    @Before

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 675574e..275fad6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -100,12 +100,12 @@ public class OpenWireTestBase extends ActiveMQTestBase {
 
          Map<String, Set<Role>> settings = server.getConfiguration().getSecurityRoles();
          if (settings == null) {
-            settings = new HashMap<String, Set<Role>>();
+            settings = new HashMap<>();
             server.getConfiguration().setSecurityRoles(settings);
          }
          Set<Role> anySet = settings.get("#");
          if (anySet == null) {
-            anySet = new HashSet<Role>();
+            anySet = new HashSet<>();
             settings.put("#", anySet);
          }
          anySet.add(senderRole);
@@ -129,7 +129,7 @@ public class OpenWireTestBase extends ActiveMQTestBase {
    }
 
    protected void registerConnectionFactory() throws Exception {
-      List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>();
+      List<TransportConfiguration> connectorConfigs = new ArrayList<>();
       connectorConfigs.add(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
       createCF(connectorConfigs, "/cf");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
index 43cf62e..0d44282 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
@@ -263,7 +263,7 @@ public class JMSMessageTest extends BasicOpenWireTest {
       private long expiration;
       private int priority;
       private String text;
-      private final HashMap<String, Object> props = new HashMap<String, Object>();
+      private final HashMap<String, Object> props = new HashMap<>();
 
       @Override
       public String getJMSMessageID() throws JMSException {
@@ -430,7 +430,7 @@ public class JMSMessageTest extends BasicOpenWireTest {
 
       @Override
       public Enumeration<?> getPropertyNames() throws JMSException {
-         return new Vector<String>(props.keySet()).elements();
+         return new Vector<>(props.keySet()).elements();
       }
 
       @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
index 3606200..c538aef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
@@ -119,7 +119,7 @@ public class JmsConnectionStartStopTest extends BasicOpenWireTest {
    @Test
    public void testConcurrentSessionCreateWithStart() throws Exception {
       ThreadPoolExecutor executor = new ThreadPoolExecutor(50, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
-      final Vector<Throwable> exceptions = new Vector<Throwable>();
+      final Vector<Throwable> exceptions = new Vector<>();
       final AtomicInteger counter = new AtomicInteger(0);
       final Random rand = new Random();
       Runnable createSessionTask = new Runnable() {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
index b50abb6..04a331e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
@@ -53,7 +53,7 @@ public class JmsConsumerResetActiveListenerTest extends BasicOpenWireTest {
 
       final CountDownLatch latch = new CountDownLatch(2);
       final AtomicBoolean first = new AtomicBoolean(true);
-      final Vector<Object> results = new Vector<Object>();
+      final Vector<Object> results = new Vector<>();
       consumer.setMessageListener(new MessageListener() {
 
          @Override
@@ -105,7 +105,7 @@ public class JmsConsumerResetActiveListenerTest extends BasicOpenWireTest {
 
       final CountDownLatch latch = new CountDownLatch(2);
       final AtomicBoolean first = new AtomicBoolean(true);
-      final Vector<Object> results = new Vector<Object>();
+      final Vector<Object> results = new Vector<>();
       consumer.setMessageListener(new MessageListener() {
 
          @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
index e31621d..5228d03 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
@@ -48,7 +48,7 @@ public class JmsTopicRequestReplyTest extends BasicOpenWireTest implements Messa
    private MessageProducer replyProducer;
    private Session serverSession;
    private Destination requestDestination;
-   private List<JMSException> failures = new Vector<JMSException>();
+   private List<JMSException> failures = new Vector<>();
    private boolean dynamicallyCreateProducer;
    private String clientSideClientID;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
index 21e0444..e2cd32d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
@@ -53,8 +53,8 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
    protected int batchCount = 10;
    protected int batchSize = 20;
 
-   private List<Message> unackMessages = new ArrayList<Message>(MESSAGE_COUNT);
-   private List<Message> ackMessages = new ArrayList<Message>(MESSAGE_COUNT);
+   private List<Message> unackMessages = new ArrayList<>(MESSAGE_COUNT);
+   private List<Message> ackMessages = new ArrayList<>(MESSAGE_COUNT);
    private boolean resendPhase;
 
    @Override
@@ -175,7 +175,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
 
       // receives the first message
       beginTx();
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       System.out.println("About to consume message 1");
       Message message = consumer.receive(1000);
       messages.add(message);
@@ -212,7 +212,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
 
       // receives the first message
       beginTx();
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       System.out.println("About to consume message 1");
       Message message = consumer.receive(1000);
       messages.add(message);
@@ -254,7 +254,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
       commitTx();
 
       // receives the first message
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       System.out.println("About to consume message 1");
       beginTx();
       Message message = consumer.receive(1000);
@@ -303,7 +303,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
       commitTx();
 
       // receives the first message
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       System.out.println("About to consume message 1");
       beginTx();
       Message message = consumer.receive(1000);
@@ -348,7 +348,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
       System.out.println("Sent 0: " + outbound[0]);
       System.out.println("Sent 1: " + outbound[1]);
 
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       beginTx();
       Message message = consumer.receive(1000);
       messages.add(message);
@@ -400,7 +400,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
       System.out.println("Sent 0: " + outbound[0]);
       System.out.println("Sent 1: " + outbound[1]);
 
-      ArrayList<Message> messages = new ArrayList<Message>();
+      ArrayList<Message> messages = new ArrayList<>();
       beginTx();
       TextMessage message = (TextMessage) consumer.receive(1000);
       assertEquals(outbound[0], message);
@@ -551,7 +551,7 @@ public abstract class JmsTransactionTestSupport extends BasicOpenWireTest implem
 
    @Test
    public void testChangeMutableObjectInObjectMessageThenRollback() throws Exception {
-      ArrayList<String> list = new ArrayList<String>();
+      ArrayList<String> list = new ArrayList<>();
       list.add("First");
       Message outbound = session.createObjectMessage(list);
       outbound.setStringProperty("foo", "abc");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
index d07ec1a..5606a6a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
@@ -280,7 +280,7 @@ public class MessageListenerRedeliveryTest extends BasicOpenWireTest {
       final CountDownLatch gotMessage = new CountDownLatch(2);
       final AtomicInteger count = new AtomicInteger(0);
       final int maxDeliveries = getRedeliveryPolicy().getMaximumRedeliveries();
-      final ArrayList<String> received = new ArrayList<String>();
+      final ArrayList<String> received = new ArrayList<>();
       consumer.setMessageListener(new MessageListener() {
          @Override
          public void onMessage(Message message) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
index a57c781..0adcc2f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
@@ -64,7 +64,7 @@ public class MultipleProducersPagingTest extends ActiveMQTestBase {
 
    private AtomicLong msgReceived;
    private AtomicLong msgSent;
-   private final Set<Connection> connections = new HashSet<Connection>();
+   private final Set<Connection> connections = new HashSet<>();
    private EmbeddedJMS jmsServer;
    private ConnectionFactory cf;
    private Queue queue;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
index db8a2ee..5f736fc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
@@ -284,7 +284,7 @@ public class PagingSendTest extends ActiveMQTestBase {
    public List<String> sendMessageBatch(int batchSize,
                                         ClientSession session,
                                         SimpleString queueAddr) throws ActiveMQException {
-      List<String> messageIds = new ArrayList<String>();
+      List<String> messageIds = new ArrayList<>();
       ClientProducer producer = session.createProducer(queueAddr);
       for (int i = 0; i < batchSize; i++) {
          Message message = session.createMessage(true);
@@ -308,7 +308,7 @@ public class PagingSendTest extends ActiveMQTestBase {
    public void checkBatchMessagesAreNotPagedTwice(Queue queue) throws Exception {
       LinkedListIterator<MessageReference> pageIterator = queue.totalIterator();
 
-      Set<String> messageOrderSet = new HashSet<String>();
+      Set<String> messageOrderSet = new HashSet<>();
 
       int duplicates = 0;
       while (pageIterator.hasNext()) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
index 68986de..cad965c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
@@ -73,7 +73,7 @@ public class SpawnedServerSupport {
    }
 
    protected static final ClusterConnectionConfiguration setupClusterConn(String connectorName, String... connectors) {
-      List<String> connectorList = new LinkedList<String>();
+      List<String> connectorList = new LinkedList<>();
       for (String conn : connectors) {
          connectorList.add(conn);
       }
@@ -97,7 +97,7 @@ public class SpawnedServerSupport {
       else {
          className = NettyConnectorFactory.class.getName();
       }
-      Map<String, Object> serverParams = new HashMap<String, Object>();
+      Map<String, Object> serverParams = new HashMap<>();
       serverParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
       return new TransportConfiguration(className, serverParams);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
index a03c5a2..cca5ed4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
@@ -37,7 +37,7 @@ public class AddressSettingsConfigurationStorageTest extends StorageManagerTestB
    public void setUp() throws Exception {
       super.setUp();
 
-      mapExpectedAddresses = new HashMap<SimpleString, PersistedAddressSetting>();
+      mapExpectedAddresses = new HashMap<>();
    }
 
    protected void addAddress(JournalStorageManager journal1, String address, AddressSettings setting) throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
index 718dccc..8b783e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
@@ -37,14 +37,14 @@ public class DeleteMessagesOnStartupTest extends StorageManagerTestBase {
 
    volatile boolean deleteMessages = false;
 
-   ArrayList<Long> deletedMessage = new ArrayList<Long>();
+   ArrayList<Long> deletedMessage = new ArrayList<>();
 
    @Test
    public void testDeleteMessagesOnStartup() throws Exception {
       createStorage();
 
       Queue theQueue = new FakeQueue(new SimpleString(""));
-      HashMap<Long, Queue> queues = new HashMap<Long, Queue>();
+      HashMap<Long, Queue> queues = new HashMap<>();
       queues.put(100L, theQueue);
 
       ServerMessage msg = new ServerMessageImpl(1, 100);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
index 0bf1ec4..8989b27 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
@@ -41,7 +41,7 @@ public class JMSConnectionFactoryConfigurationStorageTest extends StorageManager
    public void setUp() throws Exception {
       super.setUp();
 
-      mapExpectedCFs = new HashMap<String, PersistedConnectionFactory>();
+      mapExpectedCFs = new HashMap<>();
    }
 
    protected void addSetting(PersistedConnectionFactory setting) throws Exception {
@@ -54,7 +54,7 @@ public class JMSConnectionFactoryConfigurationStorageTest extends StorageManager
 
       createJMSStorage();
 
-      List<String> transportConfigs = new ArrayList<String>();
+      List<String> transportConfigs = new ArrayList<>();
 
       for (int i = 0; i < 5; i++) {
          transportConfigs.add("c1-" + i);
@@ -126,16 +126,16 @@ public class JMSConnectionFactoryConfigurationStorageTest extends StorageManager
          str[i] = "str" + i;
       }
 
-      List<String> connectorConfigs = new ArrayList<String>();
-      Map<String, Object> liveParams = new HashMap<String, Object>();
+      List<String> connectorConfigs = new ArrayList<>();
+      Map<String, Object> liveParams = new HashMap<>();
       liveParams.put(TransportConstants.PORT_PROP_NAME, 5665);
-      Map<String, Object> backupParams = new HashMap<String, Object>();
+      Map<String, Object> backupParams = new HashMap<>();
       backupParams.put(TransportConstants.PORT_PROP_NAME, 5775);
-      Map<String, Object> liveParams2 = new HashMap<String, Object>();
+      Map<String, Object> liveParams2 = new HashMap<>();
       liveParams2.put(TransportConstants.PORT_PROP_NAME, 6665);
 
       ConnectionFactoryConfiguration config = new ConnectionFactoryConfigurationImpl().setName("some-name").setConnectorNames(connectorConfigs).setBindings(str).setCallTimeout(RandomUtil.randomPositiveLong());
-      List<Pair<String, String>> connectors = new ArrayList<Pair<String, String>>();
+      List<Pair<String, String>> connectors = new ArrayList<>();
       connectors.add(new Pair<String, String>(RandomUtil.randomString(), null));
       //config.setConnectorNames(connectors);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
index 1a1430d..8d9dbfa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
@@ -46,7 +46,7 @@ public class JMSDynamicConfigTest extends JMSTestBase {
 
    @Test
    public void testStart() throws Exception {
-      ArrayList<String> connectors = new ArrayList<String>();
+      ArrayList<String> connectors = new ArrayList<>();
 
       connectors.add("invm");
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index f5dea62..a60e05f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -74,11 +74,11 @@ public class RestartSMTest extends ActiveMQTestBase {
 
          journal.start();
 
-         List<QueueBindingInfo> queueBindingInfos = new ArrayList<QueueBindingInfo>();
+         List<QueueBindingInfo> queueBindingInfos = new ArrayList<>();
 
          journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>());
 
-         Map<Long, Queue> queues = new HashMap<Long, Queue>();
+         Map<Long, Queue> queues = new HashMap<>();
 
          journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new FakeJournalLoader());
 
@@ -88,11 +88,11 @@ public class RestartSMTest extends ActiveMQTestBase {
 
          journal.start();
 
-         queues = new HashMap<Long, Queue>();
+         queues = new HashMap<>();
 
          journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new FakeJournalLoader());
 
-         queueBindingInfos = new ArrayList<QueueBindingInfo>();
+         queueBindingInfos = new ArrayList<>();
 
          journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
index 1ebf8ad..c0aaf86 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
@@ -36,7 +36,7 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      mapExpectedSets = new HashMap<SimpleString, PersistedRoles>();
+      mapExpectedSets = new HashMap<>();
    }
 
    protected void addSetting(PersistedRoles setting) throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index 3ee521b..ec4b666 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -48,7 +48,7 @@ public class TransportConfigurationEncodingSupportTest extends Assert {
 
    @Test
    public void testTransportConfiguration() throws Exception {
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.PORT_PROP_NAME, 5665);
       params.put(TransportConstants.HOST_PROP_NAME, RandomUtil.randomString());
       TransportConfiguration config = new TransportConfiguration(NettyConnectorFactory.class.getName(), params);
@@ -72,18 +72,18 @@ public class TransportConfigurationEncodingSupportTest extends Assert {
 
    @Test
    public void testTransportConfigurations() throws Exception {
-      List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
-      Map<String, Object> liveParams = new HashMap<String, Object>();
+      List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<>();
+      Map<String, Object> liveParams = new HashMap<>();
       liveParams.put(TransportConstants.PORT_PROP_NAME, 5665);
       TransportConfiguration live1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), liveParams);
-      Map<String, Object> backupParams = new HashMap<String, Object>();
+      Map<String, Object> backupParams = new HashMap<>();
       backupParams.put(TransportConstants.PORT_PROP_NAME, 5775);
       TransportConfiguration backup1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), backupParams);
-      Map<String, Object> liveParams2 = new HashMap<String, Object>();
+      Map<String, Object> liveParams2 = new HashMap<>();
       liveParams2.put(TransportConstants.PORT_PROP_NAME, 6665);
       TransportConfiguration live2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), liveParams2);
 
-      connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1));
+      connectorConfigs.add(new Pair<>(live1, backup1));
       connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(live2, null));
 
       ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(TransportConfigurationEncodingSupport.getEncodeSize(connectorConfigs));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index 7663f69..5d628f9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -94,7 +94,7 @@ public class ProtonTest extends ActiveMQTestBase {
       super.setUp();
       disableCheckThread();
       server = this.createServer(true, true);
-      HashMap<String, Object> params = new HashMap<String, Object>();
+      HashMap<String, Object> params = new HashMap<>();
       params.put(TransportConstants.PORT_PROP_NAME, "5672");
       params.put(TransportConstants.PROTOCOLS_PROP_NAME, "AMQP");
       TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
index 13d1560..544ebea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
@@ -68,7 +68,7 @@ public class ActiveMQMessageHandlerSecurityTest extends ActiveMQRATestBase {
       securityManager.getConfiguration().addUser("testuser", "testpassword");
       securityManager.getConfiguration().addRole("testuser", "arole");
       Role role = new Role("arole", false, true, false, false, false, false, false);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
       ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
index 0fc7416..756127f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
@@ -58,7 +58,7 @@ public class JMSContextTest extends ActiveMQRATestBase {
       securityManager.getConfiguration().addRole("testuser", "arole");
       securityManager.getConfiguration().addRole("guest", "arole");
       Role role = new Role("arole", true, true, true, true, true, true, true);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
       resourceAdapter = new ActiveMQResourceAdapter();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
index 10723a5..e9fbff3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
@@ -83,7 +83,7 @@ public class OutgoingConnectionTest extends ActiveMQRATestBase {
       securityManager.getConfiguration().addRole("testuser", "arole");
       securityManager.getConfiguration().addRole("guest", "arole");
       Role role = new Role("arole", true, true, true, true, true, true, true);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
index a1abc48..1b32d2c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
@@ -72,7 +72,7 @@ public class OutgoingConnectionTestJTA extends ActiveMQRATestBase {
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("testuser", "arole");
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("guest", "arole");
       Role role = new Role("arole", true, true, true, true, true, true, true);
-      Set<Role> roles = new HashSet<Role>();
+      Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
index 6bce079..272214b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
@@ -620,7 +620,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
       qResourceAdapter.setPasswordCodec(DefaultSensitiveStringCodec.class.getName() + ";key=anotherkey");
 
       DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec();
-      Map<String, String> prop = new HashMap<String, String>();
+      Map<String, String> prop = new HashMap<>();
 
       prop.put("key", "anotherkey");
       codec.init(prop);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
index 2548fc6..78ca02c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
@@ -48,7 +48,7 @@ public class BatchDelayTest extends ActiveMQTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.BATCH_DELAY, DELAY);
 
       TransportConfiguration tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
@@ -59,7 +59,7 @@ public class BatchDelayTest extends ActiveMQTestBase {
    }
 
    protected ClientSessionFactory createSessionFactory() throws Exception {
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.BATCH_DELAY, DELAY);
       ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(createTransportConfiguration(true, false, params));
       addServerLocator(locator);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
index 6a06a88..897cec0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
@@ -49,7 +49,7 @@ public class DirectDeliverTest extends ActiveMQTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(TransportConstants.DIRECT_DELIVER, true);
 
       TransportConfiguration tc = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
index 1fb4cef..366d55d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
@@ -62,7 +62,7 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
    }
 
    public static Map<NetworkInterface, InetAddress> getAddressForEachNetworkInterface() throws Exception {
-      Map<NetworkInterface, InetAddress> map = new HashMap<NetworkInterface, InetAddress>();
+      Map<NetworkInterface, InetAddress> map = new HashMap<>();
       Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
       while (ifaces.hasMoreElements()) {
          NetworkInterface iface = ifaces.nextElement();
@@ -183,10 +183,10 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
                               final int localPort) throws Exception {
       System.out.println("acceptor=" + acceptorHost + ", connector=" + connectorHost + ", mustConnect=" + mustConnect);
 
-      Map<String, Object> params = new HashMap<String, Object>();
+      Map<String, Object> params = new HashMap<>();
       params.put(getHostPropertyKey(), acceptorHost);
       TransportConfiguration acceptorConfig = new TransportConfiguration(getAcceptorFactoryClassName(), params);
-      Set<TransportConfiguration> transportConfigs = new HashSet<TransportConfiguration>();
+      Set<TransportConfiguration> transportConfigs = new HashSet<>();
       transportConfigs.add(acceptorConfig);
 
       Configuration config = createDefaultNettyConfig();
@@ -195,7 +195,7 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
       try {
          messagingService.start();
 
-         params = new HashMap<String, Object>();
+         params = new HashMap<>();
          params.put(getHostPropertyKey(), connectorHost);
          if (localPort != 0) {
             params.put(getLocalPortProperty(), localPort);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
index 268b10b..c344591 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -188,7 +188,7 @@ public class ReconnectTest extends ActiveMQTestBase {
    }
 
    private ServerSession[] countMetadata(ActiveMQServer server, String parameter, int expected) throws Exception {
-      List<ServerSession> sessionList = new LinkedList<ServerSession>();
+      List<ServerSession> sessionList = new LinkedList<>();
 
       for (int i = 0; i < 10 && sessionList.size() != expected; i++) {
          sessionList.clear();
@@ -241,7 +241,7 @@ public class ReconnectTest extends ActiveMQTestBase {
          // One for beforeReconnecto from the Factory, and one for the commit about to be done
          final CountDownLatch latchCommit = new CountDownLatch(2);
 
-         final ArrayList<Thread> threadToBeInterrupted = new ArrayList<Thread>();
+         final ArrayList<Thread> threadToBeInterrupted = new ArrayList<>();
 
          factory.addFailureListener(new SessionFailureListener() {
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index e9e3c02..4a00caa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -340,7 +340,7 @@ public final class ReplicationTest extends ActiveMQTestBase {
 
       final AtomicInteger lastError = new AtomicInteger(0);
 
-      final List<String> msgsResult = new ArrayList<String>();
+      final List<String> msgsResult = new ArrayList<>();
 
       final CountDownLatch latch = new CountDownLatch(1);
 
@@ -498,7 +498,7 @@ public final class ReplicationTest extends ActiveMQTestBase {
 
       setupServer(true);
 
-      final ArrayList<Integer> executions = new ArrayList<Integer>();
+      final ArrayList<Integer> executions = new ArrayList<>();
 
       StorageManager storage = getStorage();
       manager = liveServer.getReplicationManager();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8a1c5ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
index 11a9c67..1b6b513 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
@@ -727,7 +727,7 @@ public class ScheduledMessageTest extends ActiveMQTestBase {
 
       ClientConsumer consumer = session.createConsumer(atestq);
 
-      ArrayList<Xid> xids = new ArrayList<Xid>();
+      ArrayList<Xid> xids = new ArrayList<>();
 
       session.start();
 


Mime
View raw message