From 071fcbc5cca4e22e650bb459701f5fc9be701013 Mon Sep 17 00:00:00 2001 From: Ryan D. Brooks Date: Mon, 28 Sep 2015 11:49:18 -0700 Subject: refactor: Use type inference when invoking a generic constructor Change-Id: I5afeb235038dcf1dd0496930d15d6b42aeb46fec --- .../framework/messaging/services/messages/ServiceHealth.java | 2 +- .../messaging/services/messages/ServiceHealthRequest.java | 2 +- .../osee/framework/messaging/internal/ConsoleDebugSupport.java | 4 ++-- .../framework/messaging/internal/FailoverConnectionNode.java | 4 ++-- .../osee/framework/messaging/internal/MessageServiceImpl.java | 2 +- .../internal/activemq/ActiveMqMessageListenerWrapper.java | 2 +- .../messaging/internal/activemq/ConnectionNodeActiveMq.java | 10 +++++----- .../internal/activemq/ConnectionNodeActiveMqNoWait.java | 10 +++++----- .../framework/messaging/internal/old/ConcurrentListMap.java | 6 +++--- .../messaging/internal/old/EndpointReceiveCollection.java | 2 +- .../messaging/internal/old/EndpointSendCollection.java | 8 ++++---- .../messaging/internal/old/MessageListenerCollection.java | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'plugins/org.eclipse.osee.framework.messaging') diff --git a/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealth.java b/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealth.java index c6cff5b57b6..8c75233dca0 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealth.java +++ b/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealth.java @@ -179,7 +179,7 @@ public class ServiceHealth { */ public List getServiceDescription() { if (serviceDescription == null) { - serviceDescription = new ArrayList(); + serviceDescription = new ArrayList<>(); } return this.serviceDescription; } diff --git a/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealthRequest.java b/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealthRequest.java index 8ae8388a895..64e78bf97a9 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealthRequest.java +++ b/plugins/org.eclipse.osee.framework.messaging/src-gen/org/eclipse/osee/framework/messaging/services/messages/ServiceHealthRequest.java @@ -98,7 +98,7 @@ public class ServiceHealthRequest { */ public List getServiceDescription() { if (serviceDescription == null) { - serviceDescription = new ArrayList(); + serviceDescription = new ArrayList<>(); } return this.serviceDescription; } diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/ConsoleDebugSupport.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/ConsoleDebugSupport.java index a442ecaf63d..93d7ea2f919 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/ConsoleDebugSupport.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/ConsoleDebugSupport.java @@ -28,8 +28,8 @@ public class ConsoleDebugSupport { private Map receives; public ConsoleDebugSupport(){ - sends = new ConcurrentHashMap(); - receives = new ConcurrentHashMap(); + sends = new ConcurrentHashMap<>(); + receives = new ConcurrentHashMap<>(); } protected void setPrintSends(boolean printSends){ diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java index c00b8bd9b03..72ef075eb73 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/FailoverConnectionNode.java @@ -49,8 +49,8 @@ public class FailoverConnectionNode implements ConnectionNode, Runnable { this.connectionNode = connectionNode; this.exceptionListener = exceptionListener; exceptionListener.setListener(this); - savedSubscribes = new CopyOnWriteArrayList(); - connectionListeners = new CopyOnWriteArrayList(); + savedSubscribes = new CopyOnWriteArrayList<>(); + connectionListeners = new CopyOnWriteArrayList<>(); this.scheduledExecutor = scheduledExecutor; itemToCancel = this.scheduledExecutor.scheduleAtFixedRate(this, 60, 15, TimeUnit.SECONDS); } diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceImpl.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceImpl.java index 9ad9cf89cf0..243a8028fd0 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceImpl.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/MessageServiceImpl.java @@ -36,7 +36,7 @@ public class MessageServiceImpl implements MessageService { private final ConnectionNodeFactory factory; public MessageServiceImpl(ConnectionNodeFactory factory) { - this.connectionNodes = new ConcurrentHashMap(); + this.connectionNodes = new ConcurrentHashMap<>(); this.factory = factory; defaultNode = new NodeInfo("osee-jms", getDefaultURI()); } diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ActiveMqMessageListenerWrapper.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ActiveMqMessageListenerWrapper.java index 88ef7c8bd24..649dc7dfdcf 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ActiveMqMessageListenerWrapper.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ActiveMqMessageListenerWrapper.java @@ -105,7 +105,7 @@ class ActiveMqMessageListenerWrapper implements MessageListener { @Override public void run() { try { - Map headers = new HashMap(); + Map headers = new HashMap<>(); Enumeration propertyNames = message.getPropertyNames(); while( propertyNames.hasMoreElements() ) { diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java index bea83d51e5b..fc60894b10e 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java @@ -73,10 +73,10 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi this.nodeInfo = nodeInfo; this.exceptionListener = exceptionListener; activeMqUtil = new ActiveMqUtil(); - topicCache = new ConcurrentHashMap(); - messageProducerCache = new ConcurrentHashMap(); - regularListeners = new CompositeKeyHashMap(64, true); - replyListeners = new ConcurrentHashMap(); + topicCache = new ConcurrentHashMap<>(); + messageProducerCache = new ConcurrentHashMap<>(); + regularListeners = new CompositeKeyHashMap<>(64, true); + replyListeners = new ConcurrentHashMap<>(); } @Override @@ -283,7 +283,7 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi @Override public void unsubscribe(MessageID messageId, OseeMessagingListener listener, OseeMessagingStatusCallback statusCallback) { Map listeners = regularListeners.getKeyedValues(messageId.getId()); - List consumersToRemove = new ArrayList(); + List consumersToRemove = new ArrayList<>(); if (listeners != null) { try { for (Entry entry : listeners.entrySet()) { diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMqNoWait.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMqNoWait.java index 5797d3e10a8..0a28c543b77 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMqNoWait.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMqNoWait.java @@ -82,10 +82,10 @@ class ConnectionNodeActiveMqNoWait implements ConnectionNodeFailoverSupport, Mes this.nodeInfo = nodeInfo; this.exceptionListener = exceptionListener; activeMqUtil = new ActiveMqUtil(); - topicCache = new ConcurrentHashMap(); - messageProducerCache = new ConcurrentHashMap(); - regularListeners = new CompositeKeyHashMap(64, true); - replyListeners = new ConcurrentHashMap(); + topicCache = new ConcurrentHashMap<>(); + messageProducerCache = new ConcurrentHashMap<>(); + regularListeners = new CompositeKeyHashMap<>(64, true); + replyListeners = new ConcurrentHashMap<>(); } @Override @@ -360,7 +360,7 @@ class ConnectionNodeActiveMqNoWait implements ConnectionNodeFailoverSupport, Mes @Override public void run() { Map listeners = regularListeners.getKeyedValues(messageId.getId()); - List consumersToRemove = new ArrayList(); + List consumersToRemove = new ArrayList<>(); if (listeners != null) { try { for (Entry entry : listeners.entrySet()) { diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/ConcurrentListMap.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/ConcurrentListMap.java index b23bb87c40f..5aa11640280 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/ConcurrentListMap.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/ConcurrentListMap.java @@ -22,16 +22,16 @@ import java.util.concurrent.CopyOnWriteArrayList; public class ConcurrentListMap { private final Map> data; - private final List EMPTY_LIST = new ArrayList(); + private final List EMPTY_LIST = new ArrayList<>(); public ConcurrentListMap() { - data = new HashMap>(); + data = new HashMap<>(); } public synchronized boolean add(MAP_TYPE key, LIST_TYPE value) { List values = data.get(key); if (values == null) { - values = new CopyOnWriteArrayList(); + values = new CopyOnWriteArrayList<>(); data.put(key, values); } if (values.contains(value)) { diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointReceiveCollection.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointReceiveCollection.java index d61c763ddbf..77b26d9897d 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointReceiveCollection.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointReceiveCollection.java @@ -23,7 +23,7 @@ public class EndpointReceiveCollection { private final List receivers; public EndpointReceiveCollection() { - receivers = new CopyOnWriteArrayList(); + receivers = new CopyOnWriteArrayList<>(); } public synchronized boolean add(EndpointReceive endpoint) { diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointSendCollection.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointSendCollection.java index 6366dbe9e47..ff705c62f8d 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointSendCollection.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/EndpointSendCollection.java @@ -31,9 +31,9 @@ public class EndpointSendCollection { private final Map messageIdMapping; public EndpointSendCollection() { - endpoints = new CopyOnWriteArrayList(); - protocolMapping = new ConcurrentHashMap(); - messageIdMapping = new ConcurrentHashMap(); + endpoints = new CopyOnWriteArrayList<>(); + protocolMapping = new ConcurrentHashMap<>(); + messageIdMapping = new ConcurrentHashMap<>(); } public synchronized boolean add(EndpointSend endpoint) { @@ -46,7 +46,7 @@ public class EndpointSendCollection { public synchronized boolean remove(EndpointSend endpoint) { if (endpoints.remove(endpoint)) { - List protocolIdsToRemove = new ArrayList(); + List protocolIdsToRemove = new ArrayList<>(); Iterator it = protocolMapping.keySet().iterator(); while (it.hasNext()) { ProtocolId id = it.next(); diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/MessageListenerCollection.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/MessageListenerCollection.java index fcd5d447a4f..9fc98f6c512 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/MessageListenerCollection.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/old/MessageListenerCollection.java @@ -24,8 +24,8 @@ public class MessageListenerCollection { private final ConcurrentListMap sendListeners; public MessageListenerCollection() { - receiveListeners = new ConcurrentListMap(); - sendListeners = new ConcurrentListMap(); + receiveListeners = new ConcurrentListMap<>(); + sendListeners = new ConcurrentListMap<>(); } public boolean addReceiveListener(MessageId messageId, ReceiveListener receiveListener) { -- cgit v1.2.3