Use the diamond notation

mina-core/src/main/java/org/apache/mina/core/buffer/CachedBufferAllocator.java

@@ -136,11 +136,11 @@ Map<Integer, Queue<CachedBuffer>> newPoolMap() {
         Map<Integer, Queue<CachedBuffer>> poolMap = new HashMap<>();
 
         for (int i = 0; i < 31; i++) {
-            poolMap.put(1 << i, new ConcurrentLinkedQueue<CachedBuffer>());
+            poolMap.put(1 << i, new ConcurrentLinkedQueue<>());
         }
 
-        poolMap.put(0, new ConcurrentLinkedQueue<CachedBuffer>());
-        poolMap.put(Integer.MAX_VALUE, new ConcurrentLinkedQueue<CachedBuffer>());
+        poolMap.put(0, new ConcurrentLinkedQueue<>());
+        poolMap.put(Integer.MAX_VALUE, new ConcurrentLinkedQueue<>());
 
         return poolMap;
     }

mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java

@@ -84,7 +84,7 @@ public abstract class AbstractPollingIoAcceptor<S extends AbstractIoSession, H>
 
     private final Queue<AcceptorOperationFuture> cancelQueue = new ConcurrentLinkedQueue<>();
 
-    private final Map<SocketAddress, H> boundHandles = Collections.synchronizedMap(new HashMap<SocketAddress, H>());
+    private final Map<SocketAddress, H> boundHandles = Collections.synchronizedMap(new HashMap<>());
 
     private final ServiceOperationFuture disposalFuture = new ServiceOperationFuture();
 
@@ -116,7 +116,7 @@ public abstract class AbstractPollingIoAcceptor<S extends AbstractIoSession, H>
      *            type.
      */
     protected AbstractPollingIoAcceptor(IoSessionConfig sessionConfig, Class<? extends IoProcessor<S>> processorClass) {
-        this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass), true, null);
+        this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass), true, null);
     }
 
     /**
@@ -135,7 +135,7 @@ protected AbstractPollingIoAcceptor(IoSessionConfig sessionConfig, Class<? exten
      */
     protected AbstractPollingIoAcceptor(IoSessionConfig sessionConfig, Class<? extends IoProcessor<S>> processorClass,
             int processorCount) {
-        this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass, processorCount), true, null);
+        this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass, processorCount), true, null);
     }
 
     /**
@@ -155,7 +155,7 @@ protected AbstractPollingIoAcceptor(IoSessionConfig sessionConfig, Class<? exten
      */
     protected AbstractPollingIoAcceptor(IoSessionConfig sessionConfig, Class<? extends IoProcessor<S>> processorClass,
             int processorCount, SelectorProvider selectorProvider ) {
-        this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass, processorCount, selectorProvider), true, selectorProvider);
+        this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass, processorCount, selectorProvider), true, selectorProvider);
     }
 
     /**

mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java

@@ -96,7 +96,7 @@ public abstract class AbstractPollingIoConnector<S extends AbstractIoSession, H>
      *            {@link IoSession} type.
      */
     protected AbstractPollingIoConnector(IoSessionConfig sessionConfig, Class<? extends IoProcessor<S>> processorClass) {
-        this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass), true);
+        this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass), true);
     }
 
     /**
@@ -117,7 +117,7 @@ protected AbstractPollingIoConnector(IoSessionConfig sessionConfig, Class<? exte
      */
     protected AbstractPollingIoConnector(IoSessionConfig sessionConfig, Class<? extends IoProcessor<S>> processorClass,
             int processorCount) {
-        this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass, processorCount), true);
+        this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass, processorCount), true);
     }
 
     /**

mina-core/src/main/java/org/apache/mina/core/write/WriteException.java

@@ -155,13 +155,13 @@ private static List<WriteRequest> asRequestList(Collection<WriteRequest> request
         }
 
         // Create a list of requests removing duplicates.
-        Set<WriteRequest> newRequests = new MapBackedSet<>(new LinkedHashMap<WriteRequest, Boolean>());
+        Set<WriteRequest> newRequests = new MapBackedSet<>(new LinkedHashMap<>());
 
         for (WriteRequest r : requests) {
             newRequests.add(r.getOriginalRequest());
         }
 
-        return Collections.unmodifiableList(new ArrayList<WriteRequest>(newRequests));
+        return Collections.unmodifiableList(new ArrayList<>(newRequests));
     }
 
     private static List<WriteRequest> asRequestList(WriteRequest request) {

mina-core/src/main/java/org/apache/mina/filter/buffer/BufferedWriteFilter.java

@@ -95,7 +95,7 @@ public BufferedWriteFilter(int bufferSize, LazyInitializedCacheMap<IoSession, Io
         super();
         this.bufferSize = bufferSize;
         if (buffersMap == null) {
-            this.buffersMap = new LazyInitializedCacheMap<IoSession, IoBuffer>();
+            this.buffersMap = new LazyInitializedCacheMap<>();
         } else {
             this.buffersMap = buffersMap;
         }

mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java

@@ -185,7 +185,7 @@ public OrderedThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long kee
         // We have to initialize the pool with default values (0 and 1) in order to
         // handle the exception in a better way. We can't add a try {} catch() {}
         // around the super() call.
-        super(DEFAULT_INITIAL_THREAD_POOL_SIZE, 1, keepAliveTime, unit, new SynchronousQueue<Runnable>(),
+        super(DEFAULT_INITIAL_THREAD_POOL_SIZE, 1, keepAliveTime, unit, new SynchronousQueue<>(),
                 threadFactory, new AbortPolicy());
 
         if (corePoolSize < DEFAULT_INITIAL_THREAD_POOL_SIZE) {

mina-core/src/main/java/org/apache/mina/filter/executor/PriorityThreadPoolExecutor.java

@@ -252,7 +252,7 @@ public PriorityThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long ke
         // handle the exception in a better way. We can't add a try {} catch()
         // {}
         // around the super() call.
-        super(DEFAULT_INITIAL_THREAD_POOL_SIZE, 1, keepAliveTime, unit, new SynchronousQueue<Runnable>(), threadFactory,
+        super(DEFAULT_INITIAL_THREAD_POOL_SIZE, 1, keepAliveTime, unit, new SynchronousQueue<>(), threadFactory,
                 new AbortPolicy());
 
         if (corePoolSize < DEFAULT_INITIAL_THREAD_POOL_SIZE) {

mina-core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java

@@ -158,7 +158,7 @@ public UnorderedThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long k
      */
     public UnorderedThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit,
             ThreadFactory threadFactory, IoEventQueueHandler queueHandler) {
-        super(0, 1, keepAliveTime, unit, new LinkedBlockingQueue<Runnable>(), threadFactory, new AbortPolicy());
+        super(0, 1, keepAliveTime, unit, new LinkedBlockingQueue<>(), threadFactory, new AbortPolicy());
 
         if (corePoolSize < 0) {
             throw new IllegalArgumentException("corePoolSize: " + corePoolSize);

mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java

@@ -43,7 +43,7 @@
  */
 public class BlacklistFilter extends IoFilterAdapter {
     /** The list of blocked addresses */
-    private final List<Subnet> blacklist = new CopyOnWriteArrayList<Subnet>();
+    private final List<Subnet> blacklist = new CopyOnWriteArrayList<>();
 
     /** A logger for this class */ 
     private final static Logger LOGGER = LoggerFactory.getLogger(BlacklistFilter.class);

mina-core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java

@@ -112,7 +112,7 @@ public ConnectionThrottleFilter() {
      */
     public ConnectionThrottleFilter(long allowedInterval) {
         this.allowedInterval = allowedInterval;
-        clients = new ConcurrentHashMap<String, Long>();
+        clients = new ConcurrentHashMap<>();
 
         // Create the cleanup thread
         ExpiredSessionThread cleanupThread = new ExpiredSessionThread();

mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java

@@ -71,7 +71,7 @@ public class SslFilter extends IoFilterAdapter {
      * Task executor for processing handshakes
      */
     static protected final Executor EXECUTOR = new ThreadPoolExecutor(2, 2, 100, TimeUnit.MILLISECONDS,
-            new LinkedBlockingDeque<Runnable>(), new BasicThreadFactory("ssl-exec", true));
+            new LinkedBlockingDeque<>(), new BasicThreadFactory("ssl-exec", true));
 
     protected final SSLContext sslContext;
 

mina-core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java

@@ -297,7 +297,7 @@ public void stopProfile(IoEventType type) {
      * @return a Set containing all the profiled {@link IoEventType}
      */
     public Set<IoEventType> getEventsToProfile() {
-        Set<IoEventType> set = new HashSet<IoEventType>();
+        Set<IoEventType> set = new HashSet<>();
 
         if (profileMessageReceived) {
             set.add(IoEventType.MESSAGE_RECEIVED);

mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java

@@ -198,7 +198,7 @@ public synchronized IoHandlerCommand remove(String name) {
      * @throws Exception If we faced some exception during the cleanup 
      */
     public synchronized void clear() throws Exception {
-        Iterator<String> it = new ArrayList<String>(name2entry.keySet()).iterator();
+        Iterator<String> it = new ArrayList<>(name2entry.keySet()).iterator();
 
         while (it.hasNext()) {
             remove(it.next());

mina-core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java

@@ -180,7 +180,7 @@ protected synchronized void flushPendingWriteRequests() throws Exception {
      */
     public synchronized void enqueueWriteRequest(final NextFilter nextFilter, final WriteRequest writeRequest) {
         if (writeRequestQueue == null) {
-            writeRequestQueue = new LinkedList<Event>();
+            writeRequestQueue = new LinkedList<>();
         }
 
         writeRequestQueue.offer(new Event(nextFilter, writeRequest));

mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpSmartProxyHandler.java

@@ -85,7 +85,7 @@ public void doHandshake(final NextFilter nextFilter) throws ProxyAuthException {
             // Compute request headers
             HttpProxyRequest req = (HttpProxyRequest) getProxyIoSession().getRequest();
             Map<String, List<String>> headers = req.getHeaders() != null ? req.getHeaders()
-                    : new HashMap<String, List<String>>();
+                    : new HashMap<>();
 
             AbstractAuthLogicHandler.addKeepAliveHeaders(headers);
             req.setHeaders(headers);

mina-core/src/main/java/org/apache/mina/proxy/handlers/http/basic/HttpBasicAuthLogicHandler.java

@@ -73,7 +73,7 @@ public void doHandshake(final NextFilter nextFilter) throws ProxyAuthException {
         // Send request
         HttpProxyRequest req = (HttpProxyRequest) request;
         Map<String, List<String>> headers = req.getHeaders() != null ? req.getHeaders()
-                : new HashMap<String, List<String>>();
+                : new HashMap<>();
 
         String username = req.getProperties().get(HttpProxyConstants.USER_PROPERTY);
         String password = req.getProperties().get(HttpProxyConstants.PWD_PROPERTY);

mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java

@@ -99,7 +99,7 @@ public void doHandshake(NextFilter nextFilter) throws ProxyAuthException {
 
         HttpProxyRequest req = (HttpProxyRequest) request;
         Map<String, List<String>> headers = req.getHeaders() != null ? req.getHeaders()
-                : new HashMap<String, List<String>>();
+                : new HashMap<>();
 
         if (step > 0) {
             if (LOGGER.isDebugEnabled()) {

mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/HttpNTLMAuthLogicHandler.java

@@ -80,7 +80,7 @@ public void doHandshake(NextFilter nextFilter) throws ProxyAuthException {
 
         HttpProxyRequest req = (HttpProxyRequest) request;
         Map<String, List<String>> headers = req.getHeaders() != null ? req.getHeaders()
-                : new HashMap<String, List<String>>();
+                : new HashMap<>();
 
         String domain = req.getProperties().get(HttpProxyConstants.DOMAIN_PROPERTY);
         String workstation = req.getProperties().get(HttpProxyConstants.WORKSTATION_PROPERTY);

mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java

@@ -88,7 +88,7 @@ public final class NioDatagramAcceptor extends AbstractIoAcceptor implements Dat
     private final Queue<NioSession> flushingSessions = new ConcurrentLinkedQueue<>();
 
     private final Map<SocketAddress, DatagramChannel> boundHandles = Collections
-            .synchronizedMap(new HashMap<SocketAddress, DatagramChannel>());
+            .synchronizedMap(new HashMap<>());
 
     private IoSessionRecycler sessionRecycler = DEFAULT_RECYCLER;
 

mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java

@@ -46,7 +46,7 @@ public final class VmPipeAcceptor extends AbstractIoAcceptor {
     // object used for checking session idle
     private IdleStatusChecker idleChecker;
 
-    static final Map<VmPipeAddress, VmPipe> boundHandlers = new HashMap<VmPipeAddress, VmPipe>();
+    static final Map<VmPipeAddress, VmPipe> boundHandlers = new HashMap<>();
 
     /**
      * Creates a new instance.
@@ -124,7 +124,7 @@ protected void dispose0() throws Exception {
      */
     @Override
     protected Set<SocketAddress> bindInternal(List<? extends SocketAddress> localAddresses) throws IOException {
-        Set<SocketAddress> newLocalAddresses = new HashSet<SocketAddress>();
+        Set<SocketAddress> newLocalAddresses = new HashSet<>();
 
         synchronized (boundHandlers) {
             for (SocketAddress a : localAddresses) {

mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java

@@ -155,7 +155,7 @@ protected void dispose0() throws Exception {
         idleChecker.getNotifyingTask().cancel();
     }
 
-    private static final Set<VmPipeAddress> TAKEN_LOCAL_ADDRESSES = new HashSet<VmPipeAddress>();
+    private static final Set<VmPipeAddress> TAKEN_LOCAL_ADDRESSES = new HashSet<>();
 
     private static int nextLocalPort = -1;
 

mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java

@@ -43,7 +43,7 @@
  */
 class VmPipeFilterChain extends DefaultIoFilterChain {
 
-    private final Queue<IoEvent> eventQueue = new ConcurrentLinkedQueue<IoEvent>();
+    private final Queue<IoEvent> eventQueue = new ConcurrentLinkedQueue<>();
 
     private final IoProcessor<VmPipeSession> processor = new VmPipeIoProcessor();
 
@@ -244,7 +244,7 @@ public void flush(VmPipeSession session) {
 
                 flushPendingDataQueues(session);
             } else {
-                List<WriteRequest> failedRequests = new ArrayList<WriteRequest>();
+                List<WriteRequest> failedRequests = new ArrayList<>();
                 WriteRequest req;
                 while ((req = queue.poll(session)) != null) {
                     failedRequests.add(req);
@@ -305,7 +305,7 @@ public void add(VmPipeSession session) {
 
         public void updateTrafficControl(VmPipeSession session) {
             if (!session.isReadSuspended()) {
-                List<Object> data = new ArrayList<Object>();
+                List<Object> data = new ArrayList<>();
                 session.receivedMessageQueue.drainTo(data);
                 for (Object aData : data) {
                     VmPipeFilterChain.this.fireMessageReceived(aData);

mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java

@@ -73,7 +73,7 @@ class VmPipeSession extends AbstractIoSession {
         this.localAddress = localAddress;
         remoteAddress = serviceAddress = remoteEntry.getAddress();
         filterChain = new VmPipeFilterChain(this);
-        receivedMessageQueue = new LinkedBlockingQueue<Object>();
+        receivedMessageQueue = new LinkedBlockingQueue<>();
 
         remoteSession = new VmPipeSession(this, remoteEntry);
     }
@@ -90,7 +90,7 @@ private VmPipeSession(VmPipeSession remoteSession, VmPipe entry) {
         remoteAddress = remoteSession.localAddress;
         filterChain = new VmPipeFilterChain(this);
         this.remoteSession = remoteSession;
-        receivedMessageQueue = new LinkedBlockingQueue<Object>();
+        receivedMessageQueue = new LinkedBlockingQueue<>();
     }
 
     @Override

mina-core/src/main/java/org/apache/mina/util/ConcurrentHashSet.java

@@ -39,7 +39,7 @@ public class ConcurrentHashSet<E> extends MapBackedSet<E> {
      * Creates a new instance of ConcurrentHashSet
      */
     public ConcurrentHashSet() {
-        super(new ConcurrentHashMap<E, Boolean>());
+        super(new ConcurrentHashMap<>());
     }
 
     /**
@@ -49,7 +49,7 @@ public ConcurrentHashSet() {
      * @param collection The collection to inject in this set
      */
     public ConcurrentHashSet(Collection<E> collection) {
-        super(new ConcurrentHashMap<E, Boolean>(), collection);
+        super(new ConcurrentHashMap<>(), collection);
     }
 
     /**

mina-core/src/main/java/org/apache/mina/util/ExpiringMap.java

@@ -79,7 +79,7 @@ public ExpiringMap(int timeToLive) {
      * @param expirationInterval The time between checks to see if a value should be removed (seconds)
      */
     public ExpiringMap(int timeToLive, int expirationInterval) {
-        this(new ConcurrentHashMap<K, ExpiringObject>(), new CopyOnWriteArrayList<ExpirationListener<V>>(), timeToLive,
+        this(new ConcurrentHashMap<>(), new CopyOnWriteArrayList<>(), timeToLive,
                 expirationInterval);
     }
 

mina-core/src/main/java/org/apache/mina/util/IdentityHashSet.java

@@ -37,7 +37,7 @@ public class IdentityHashSet<E> extends MapBackedSet<E> {
      * Creates a new IdentityHashSet instance
      */
     public IdentityHashSet() {
-        super(new IdentityHashMap<E, Boolean>());
+        super(new IdentityHashMap<>());
     }
 
     /**
@@ -46,7 +46,7 @@ public IdentityHashSet() {
      * @param expectedMaxSize The maximum size for the map
      */
     public IdentityHashSet(int expectedMaxSize) {
-        super(new IdentityHashMap<E, Boolean>(expectedMaxSize));
+        super(new IdentityHashMap<>(expectedMaxSize));
     }
 
     /**
@@ -55,6 +55,6 @@ public IdentityHashSet(int expectedMaxSize) {
      * @param c The elements to put in the map
      */
     public IdentityHashSet(Collection<E> c) {
-        super(new IdentityHashMap<E, Boolean>(), c);
+        super(new IdentityHashMap<>(), c);
     }
 }

mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java

@@ -62,9 +62,9 @@ public class ByteArrayPool implements ByteArrayFactory {
      */
     public ByteArrayPool(boolean direct, int maxFreeBuffers, int maxFreeMemory) {
         this.direct = direct;
-        freeBuffers = new ArrayList<Stack<DirectBufferByteArray>>();
+        freeBuffers = new ArrayList<>();
         for (int i = 0; i < MAX_BITS; i++) {
-            freeBuffers.add(new Stack<DirectBufferByteArray>());
+            freeBuffers.add(new Stack<>());
         }
         this.maxFreeBuffers = maxFreeBuffers;
         this.maxFreeMemory = maxFreeMemory;

mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java

@@ -368,7 +368,7 @@ public boolean hasArray() {
     public void testObjectSerialization() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         buf.setAutoExpand(true);
-        List<Object> o = new ArrayList<Object>();
+        List<Object> o = new ArrayList<>();
         o.add(new Date());
         o.add(long.class);
 

mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java

@@ -165,7 +165,7 @@ public static void main(String[] args) throws IOException, InterruptedException
     }
 
     private List<String> getThreadNames() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         int active = Thread.activeCount();
         Thread[] threads = new Thread[active];
         Thread.enumerate(threads);