diff --git a/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java b/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
index 4fcc732147..f582da293c 100644
--- a/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
@@ -637,7 +637,7 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
             return Collections.singletonList(slice);
         }
 
-        List<ByteBuf> sliceList = new ArrayList<ByteBuf>(componentCount - componentId);
+        List<ByteBuf> sliceList = new ArrayList<>(componentCount - componentId);
         sliceList.add(slice);
 
         // Add all the slices until there is nothing more left and then return the List.
diff --git a/buffer/src/main/java/io/netty/buffer/PoolArena.java b/buffer/src/main/java/io/netty/buffer/PoolArena.java
index 8ef5d76ea8..46374a8ab8 100644
--- a/buffer/src/main/java/io/netty/buffer/PoolArena.java
+++ b/buffer/src/main/java/io/netty/buffer/PoolArena.java
@@ -128,7 +128,7 @@ abstract class PoolArena<T> implements PoolArenaMetric {
     }
 
     private PoolSubpage<T> newSubpagePoolHead(int pageSize) {
-        PoolSubpage<T> head = new PoolSubpage<T>(pageSize);
+        PoolSubpage<T> head = new PoolSubpage<>(pageSize);
         head.prev = head;
         head.next = head;
         return head;
diff --git a/buffer/src/main/java/io/netty/buffer/PoolChunk.java b/buffer/src/main/java/io/netty/buffer/PoolChunk.java
index 0a19a5a1d4..abcabdc453 100644
--- a/buffer/src/main/java/io/netty/buffer/PoolChunk.java
+++ b/buffer/src/main/java/io/netty/buffer/PoolChunk.java
@@ -173,7 +173,7 @@ final class PoolChunk<T> implements PoolChunkMetric {
         }
 
         subpages = newSubpageArray(maxSubpageAllocs);
-        cachedNioBuffers = new ArrayDeque<ByteBuffer>(8);
+        cachedNioBuffers = new ArrayDeque<>(8);
     }
 
     /** Creates a special chunk that is not pooled. */
@@ -355,7 +355,7 @@ final class PoolChunk<T> implements PoolChunkMetric {
             int subpageIdx = subpageIdx(id);
             PoolSubpage<T> subpage = subpages[subpageIdx];
             if (subpage == null) {
-                subpage = new PoolSubpage<T>(head, this, id, runOffset(id), pageSize, normCapacity);
+                subpage = new PoolSubpage<>(head, this, id, runOffset(id), pageSize, normCapacity);
                 subpages[subpageIdx] = subpage;
             } else {
                 subpage.init(head, normCapacity);
diff --git a/buffer/src/main/java/io/netty/buffer/PoolChunkList.java b/buffer/src/main/java/io/netty/buffer/PoolChunkList.java
index e610be8e9b..5302be5421 100644
--- a/buffer/src/main/java/io/netty/buffer/PoolChunkList.java
+++ b/buffer/src/main/java/io/netty/buffer/PoolChunkList.java
@@ -192,7 +192,7 @@ final class PoolChunkList<T> implements PoolChunkListMetric {
             if (head == null) {
                 return EMPTY_METRICS;
             }
-            List<PoolChunkMetric> metrics = new ArrayList<PoolChunkMetric>();
+            List<PoolChunkMetric> metrics = new ArrayList<>();
             for (PoolChunk<T> cur = head;;) {
                 metrics.add(cur);
                 cur = cur.next;
diff --git a/buffer/src/main/java/io/netty/buffer/PoolThreadCache.java b/buffer/src/main/java/io/netty/buffer/PoolThreadCache.java
index de2a9be060..09b1aa12b0 100644
--- a/buffer/src/main/java/io/netty/buffer/PoolThreadCache.java
+++ b/buffer/src/main/java/io/netty/buffer/PoolThreadCache.java
@@ -126,7 +126,7 @@ final class PoolThreadCache {
             MemoryRegionCache<T>[] cache = new MemoryRegionCache[numCaches];
             for (int i = 0; i < cache.length; i++) {
                 // TODO: maybe use cacheSize / cache.length
-                cache[i] = new SubPageMemoryRegionCache<T>(cacheSize, sizeClass);
+                cache[i] = new SubPageMemoryRegionCache<>(cacheSize, sizeClass);
             }
             return cache;
         } else {
@@ -143,7 +143,7 @@ final class PoolThreadCache {
             @SuppressWarnings("unchecked")
             MemoryRegionCache<T>[] cache = new MemoryRegionCache[arraySize];
             for (int i = 0; i < cache.length; i++) {
-                cache[i] = new NormalMemoryRegionCache<T>(cacheSize);
+                cache[i] = new NormalMemoryRegionCache<>(cacheSize);
             }
             return cache;
         } else {
diff --git a/buffer/src/main/java/io/netty/buffer/PooledByteBufAllocator.java b/buffer/src/main/java/io/netty/buffer/PooledByteBufAllocator.java
index de6eee1d54..f79f83d221 100644
--- a/buffer/src/main/java/io/netty/buffer/PooledByteBufAllocator.java
+++ b/buffer/src/main/java/io/netty/buffer/PooledByteBufAllocator.java
@@ -239,7 +239,7 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator implements
 
         if (nHeapArena > 0) {
             heapArenas = newArenaArray(nHeapArena);
-            List<PoolArenaMetric> metrics = new ArrayList<PoolArenaMetric>(heapArenas.length);
+            List<PoolArenaMetric> metrics = new ArrayList<>(heapArenas.length);
             for (int i = 0; i < heapArenas.length; i ++) {
                 PoolArena.HeapArena arena = new PoolArena.HeapArena(this,
                         pageSize, maxOrder, pageShifts, chunkSize,
@@ -255,7 +255,7 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator implements
 
         if (nDirectArena > 0) {
             directArenas = newArenaArray(nDirectArena);
-            List<PoolArenaMetric> metrics = new ArrayList<PoolArenaMetric>(directArenas.length);
+            List<PoolArenaMetric> metrics = new ArrayList<>(directArenas.length);
             for (int i = 0; i < directArenas.length; i ++) {
                 PoolArena.DirectArena arena = new PoolArena.DirectArena(
                         this, pageSize, maxOrder, pageShifts, chunkSize, directMemoryCacheAlignment);
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java b/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
index 082c9a89d5..24fbe25df7 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
@@ -2086,8 +2086,8 @@ public abstract class AbstractByteBufTest {
         buffer.writeBytes("Hello, World!".getBytes(CharsetUtil.ISO_8859_1));
 
         final AtomicInteger counter = new AtomicInteger(30000);
-        final AtomicReference<Throwable> errorRef = new AtomicReference<Throwable>();
-        List<Thread> threads = new ArrayList<Thread>();
+        final AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             Thread thread = new Thread(new Runnable() {
                 @Override
@@ -2202,7 +2202,7 @@ public abstract class AbstractByteBufTest {
         elemA.writeBytes(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 });
         elemB.writeBytes(new byte[] { 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9 });
 
-        Set<ByteBuf> set = new HashSet<ByteBuf>();
+        Set<ByteBuf> set = new HashSet<>();
         set.add(elemA);
         set.add(elemB);
 
@@ -2465,7 +2465,7 @@ public abstract class AbstractByteBufTest {
 
         final ByteBuf buffer = newBuffer(8);
         buffer.writeBytes(bytes);
-        final AtomicReference<Throwable> cause = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> cause = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(60000);
         final CyclicBarrier barrier = new CyclicBarrier(11);
         for (int i = 0; i < 10; i++) {
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java b/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
index 92374bcf8b..c5dac64aba 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
@@ -67,7 +67,7 @@ public abstract class AbstractCompositeByteBufTest extends AbstractByteBufTest {
     protected ByteBuf newBuffer(int length, int maxCapacity) {
         Assume.assumeTrue(maxCapacity == Integer.MAX_VALUE);
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>();
+        List<ByteBuf> buffers = new ArrayList<>();
         for (int i = 0; i < length + 45; i += 45) {
             buffers.add(EMPTY_BUFFER);
             buffers.add(wrappedBuffer(new byte[1]));
@@ -659,7 +659,7 @@ public abstract class AbstractCompositeByteBufTest extends AbstractByteBufTest {
         CompositeByteBuf buf = compositeBuffer();
         assertThat(buf.refCnt(), is(1));
 
-        List<ByteBuf> components = new ArrayList<ByteBuf>();
+        List<ByteBuf> components = new ArrayList<>();
         Collections.addAll(components, c1, c2, c3);
         buf.addComponents(components);
 
diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
index 828c874e6b..272933dea2 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
+++ b/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
@@ -677,8 +677,8 @@ public class ByteBufUtilTest {
 
         try {
             final AtomicInteger counter = new AtomicInteger(60000);
-            final AtomicReference<Throwable> errorRef = new AtomicReference<Throwable>();
-            List<Thread> threads = new ArrayList<Thread>();
+            final AtomicReference<Throwable> errorRef = new AtomicReference<>();
+            List<Thread> threads = new ArrayList<>();
             for (int i = 0; i < 10; i++) {
                 Thread thread = new Thread(new Runnable() {
                     @Override
diff --git a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java b/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java
index 495bb76540..de004fc7a1 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java
@@ -416,7 +416,7 @@ public class PooledByteBufAllocatorTest extends AbstractByteBufAllocatorTest<Poo
         // We use no caches and only one arena to maximize the chance of hitting the race-condition we
         // had before.
         ByteBufAllocator allocator = new PooledByteBufAllocator(true, 1, 1, 8192, 11, 0, 0, 0);
-        List<AllocationThread> threads = new ArrayList<AllocationThread>();
+        List<AllocationThread> threads = new ArrayList<>();
         try {
             for (int i = 0; i < 512; i++) {
                 AllocationThread thread = new AllocationThread(allocator);
@@ -457,9 +457,9 @@ public class PooledByteBufAllocatorTest extends AbstractByteBufAllocatorTest<Poo
             }
         }
 
-        private final Queue<ByteBuf> buffers = new ConcurrentLinkedQueue<ByteBuf>();
+        private final Queue<ByteBuf> buffers = new ConcurrentLinkedQueue<>();
         private final ByteBufAllocator allocator;
-        private final AtomicReference<Object> finish = new AtomicReference<Object>();
+        private final AtomicReference<Object> finish = new AtomicReference<>();
 
         public AllocationThread(ByteBufAllocator allocator) {
             this.allocator = allocator;
diff --git a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java b/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java
index 66ca89fad3..7aaeec3de1 100644
--- a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 public class SimpleLeakAwareByteBufTest extends BigEndianHeapByteBufTest {
     private final Class<? extends ByteBuf> clazz = leakClass();
-    private final Queue<NoopResourceLeakTracker<ByteBuf>> trackers = new ArrayDeque<NoopResourceLeakTracker<ByteBuf>>();
+    private final Queue<NoopResourceLeakTracker<ByteBuf>> trackers = new ArrayDeque<>();
 
     @Override
     protected final ByteBuf newBuffer(int capacity, int maxCapacity) {
@@ -36,7 +36,7 @@ public class SimpleLeakAwareByteBufTest extends BigEndianHeapByteBufTest {
     }
 
     private ByteBuf wrap(ByteBuf buffer) {
-        NoopResourceLeakTracker<ByteBuf> tracker = new NoopResourceLeakTracker<ByteBuf>();
+        NoopResourceLeakTracker<ByteBuf> tracker = new NoopResourceLeakTracker<>();
         ByteBuf leakAwareBuf = wrap(buffer, tracker);
         trackers.add(tracker);
         return leakAwareBuf;
diff --git a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java b/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java
index 713fe728a4..580bcdbb72 100644
--- a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java
@@ -29,11 +29,11 @@ import static org.junit.Assert.assertTrue;
 public class SimpleLeakAwareCompositeByteBufTest extends WrappedCompositeByteBufTest {
 
     private final Class<? extends ByteBuf> clazz = leakClass();
-    private final Queue<NoopResourceLeakTracker<ByteBuf>> trackers = new ArrayDeque<NoopResourceLeakTracker<ByteBuf>>();
+    private final Queue<NoopResourceLeakTracker<ByteBuf>> trackers = new ArrayDeque<>();
 
     @Override
     protected final WrappedCompositeByteBuf wrap(CompositeByteBuf buffer) {
-        NoopResourceLeakTracker<ByteBuf> tracker = new NoopResourceLeakTracker<ByteBuf>();
+        NoopResourceLeakTracker<ByteBuf> tracker = new NoopResourceLeakTracker<>();
         WrappedCompositeByteBuf leakAwareBuf = wrap(buffer, tracker);
         trackers.add(tracker);
         return leakAwareBuf;
diff --git a/buffer/src/test/java/io/netty/buffer/UnpooledTest.java b/buffer/src/test/java/io/netty/buffer/UnpooledTest.java
index f7fd30ba91..458f51eb5b 100644
--- a/buffer/src/test/java/io/netty/buffer/UnpooledTest.java
+++ b/buffer/src/test/java/io/netty/buffer/UnpooledTest.java
@@ -60,7 +60,7 @@ public class UnpooledTest {
 
     @Test
     public void testHashCode() {
-        Map<byte[], Integer> map = new LinkedHashMap<byte[], Integer>();
+        Map<byte[], Integer> map = new LinkedHashMap<>();
         map.put(EMPTY_BYTES, 1);
         map.put(new byte[] { 1 }, 32);
         map.put(new byte[] { 2 }, 33);
@@ -149,7 +149,7 @@ public class UnpooledTest {
 
     @Test
     public void testCompare() {
-        List<ByteBuf> expected = new ArrayList<ByteBuf>();
+        List<ByteBuf> expected = new ArrayList<>();
         expected.add(wrappedBuffer(new byte[]{1}));
         expected.add(wrappedBuffer(new byte[]{1, 2}));
         expected.add(wrappedBuffer(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}));
diff --git a/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java b/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
index 5d0a3933e0..f7f2f12f8a 100644
--- a/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
+++ b/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
@@ -469,6 +469,6 @@ public abstract class AbstractDnsMessage extends AbstractReferenceCounted implem
     }
 
     private static ArrayList<DnsRecord> newRecordList() {
-        return new ArrayList<DnsRecord>(2);
+        return new ArrayList<>(2);
     }
 }
diff --git a/codec-dns/src/main/java/io/netty/handler/codec/dns/DnsRecordType.java b/codec-dns/src/main/java/io/netty/handler/codec/dns/DnsRecordType.java
index 1c5f79b8d7..31e8443f06 100644
--- a/codec-dns/src/main/java/io/netty/handler/codec/dns/DnsRecordType.java
+++ b/codec-dns/src/main/java/io/netty/handler/codec/dns/DnsRecordType.java
@@ -303,7 +303,7 @@ public class DnsRecordType implements Comparable<DnsRecordType> {
      */
     public static final DnsRecordType DLV = new DnsRecordType(0x8001, "DLV");
 
-    private static final Map<String, DnsRecordType> BY_NAME = new HashMap<String, DnsRecordType>();
+    private static final Map<String, DnsRecordType> BY_NAME = new HashMap<>();
     private static final IntObjectHashMap<DnsRecordType> BY_TYPE = new IntObjectHashMap<DnsRecordType>();
     private static final String EXPECTED;
 
diff --git a/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsQueryTest.java b/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsQueryTest.java
index d322f61a01..a14427db58 100644
--- a/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsQueryTest.java
+++ b/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsQueryTest.java
@@ -35,7 +35,7 @@ public class DnsQueryTest {
     public void writeQueryTest() throws Exception {
         InetSocketAddress addr = SocketUtils.socketAddress("8.8.8.8", 53);
         EmbeddedChannel embedder = new EmbeddedChannel(new DatagramDnsQueryEncoder());
-        List<DnsQuery> queries = new ArrayList<DnsQuery>(5);
+        List<DnsQuery> queries = new ArrayList<>(5);
         queries.add(new DatagramDnsQuery(null, addr, 1).setRecord(
                 DnsSection.QUESTION,
                 new DefaultDnsQuestion("1.0.0.127.in-addr.arpa", DnsRecordType.PTR)));
diff --git a/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsRecordTypeTest.java b/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsRecordTypeTest.java
index aeeab95b04..d261e6e58e 100644
--- a/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsRecordTypeTest.java
+++ b/codec-dns/src/test/java/io/netty/handler/codec/dns/DnsRecordTypeTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
 public class DnsRecordTypeTest {
 
     private static List<DnsRecordType> allTypes() throws Exception {
-        List<DnsRecordType> result = new ArrayList<DnsRecordType>();
+        List<DnsRecordType> result = new ArrayList<>();
         for (Field field : DnsRecordType.class.getFields()) {
             if ((field.getModifiers() & Modifier.STATIC) != 0 && field.getType() == DnsRecordType.class) {
                 result.add((DnsRecordType) field.get(null));
@@ -41,7 +41,7 @@ public class DnsRecordTypeTest {
     @Test
     public void testSanity() throws Exception {
         assertEquals("More than one type has the same int value",
-                allTypes().size(), new HashSet<DnsRecordType>(allTypes()).size());
+                allTypes().size(), new HashSet<>(allTypes()).size());
     }
 
     /**
diff --git a/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
index b40bf42df2..cff30adc2f 100644
--- a/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
+++ b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java
@@ -243,7 +243,7 @@ public final class HAProxyMessage {
             return Collections.emptyList();
         }
         // In most cases there are less than 4 TLVs available
-        List<HAProxyTLV> haProxyTLVs = new ArrayList<HAProxyTLV>(4);
+        List<HAProxyTLV> haProxyTLVs = new ArrayList<>(4);
 
         do {
             haProxyTLVs.add(haProxyTLV);
@@ -274,7 +274,7 @@ public final class HAProxyMessage {
 
             if (byteBuf.readableBytes() >= 4) {
 
-                final List<HAProxyTLV> encapsulatedTlvs = new ArrayList<HAProxyTLV>(4);
+                final List<HAProxyTLV> encapsulatedTlvs = new ArrayList<>(4);
                 do {
                     final HAProxyTLV haProxyTLV = readNextTLV(byteBuf);
                     if (haProxyTLV == null) {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
index 040e12d710..f4cf3926e1 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
@@ -82,8 +82,8 @@ public final class CookieDecoder {
      * @return the decoded {@link Cookie}s
      */
     private Set<Cookie> doDecode(String header) {
-        List<String> names = new ArrayList<String>(8);
-        List<String> values = new ArrayList<String>(8);
+        List<String> names = new ArrayList<>(8);
+        List<String> values = new ArrayList<>(8);
         extractKeyValuePairs(header, names, values);
 
         if (names.isEmpty()) {
@@ -111,7 +111,7 @@ public final class CookieDecoder {
             return Collections.emptySet();
         }
 
-        Set<Cookie> cookies = new TreeSet<Cookie>();
+        Set<Cookie> cookies = new TreeSet<>();
         for (; i < names.size(); i ++) {
             String name = names.get(i);
             String value = values.get(i);
@@ -133,7 +133,7 @@ public final class CookieDecoder {
             String domain = null;
             String path = null;
             long maxAge = Long.MIN_VALUE;
-            List<Integer> ports = new ArrayList<Integer>(2);
+            List<Integer> ports = new ArrayList<>(2);
 
             for (int j = i + 1; j < names.size(); j++, i++) {
                 name = names.get(j);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
index 902ba16a2d..ad96bb8899 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
@@ -139,7 +139,7 @@ public class DefaultCookie extends io.netty.handler.codec.http.cookie.DefaultCoo
         if (portsCopy.length == 0) {
             unmodifiablePorts = this.ports = Collections.emptySet();
         } else {
-            Set<Integer> newPorts = new TreeSet<Integer>();
+            Set<Integer> newPorts = new TreeSet<>();
             for (int p: portsCopy) {
                 if (p <= 0 || p > 65535) {
                     throw new IllegalArgumentException("port out of range: " + p);
@@ -154,7 +154,7 @@ public class DefaultCookie extends io.netty.handler.codec.http.cookie.DefaultCoo
     @Override
     @Deprecated
     public void setPorts(Iterable<Integer> ports) {
-        Set<Integer> newPorts = new TreeSet<Integer>();
+        Set<Integer> newPorts = new TreeSet<>();
         for (int p: ports) {
             if (p <= 0 || p > 65535) {
                 throw new IllegalArgumentException("port out of range: " + p);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java
index 88af27f738..019365582b 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java
@@ -83,9 +83,9 @@ public class DefaultHttpHeaders extends HttpHeaders {
     }
 
     protected DefaultHttpHeaders(boolean validate, NameValidator<CharSequence> nameValidator) {
-        this(new DefaultHeadersImpl<CharSequence, CharSequence>(CASE_INSENSITIVE_HASHER,
-                                                                valueConverter(validate),
-                                                                nameValidator));
+        this(new DefaultHeadersImpl<>(CASE_INSENSITIVE_HASHER,
+                valueConverter(validate),
+                nameValidator));
     }
 
     protected DefaultHttpHeaders(DefaultHeaders<CharSequence, CharSequence, ?> headers) {
@@ -257,7 +257,7 @@ public class DefaultHttpHeaders extends HttpHeaders {
         if (isEmpty()) {
             return Collections.emptyList();
         }
-        List<Entry<String, String>> entriesConverted = new ArrayList<Entry<String, String>>(
+        List<Entry<String, String>> entriesConverted = new ArrayList<>(
                 headers.size());
         for (Entry<String, String> entry : this) {
             entriesConverted.add(entry);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
index 8770202d0d..8eff1d07d7 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
@@ -46,7 +46,7 @@ public final class HttpClientCodec extends CombinedChannelDuplexHandler<HttpResp
         implements HttpClientUpgradeHandler.SourceCodec {
 
     /** A queue that is used for correlating a request and a response. */
-    private final Queue<HttpMethod> queue = new ArrayDeque<HttpMethod>();
+    private final Queue<HttpMethod> queue = new ArrayDeque<>();
     private final boolean parseHttpAfterConnectRequest;
 
     /** If true, decoding stops (i.e. pass-through) */
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
index 241a347bc9..d17cfc6c1d 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
@@ -272,7 +272,7 @@ public class HttpClientUpgradeHandler extends HttpObjectAggregator implements Ch
         request.headers().set(HttpHeaderNames.UPGRADE, upgradeCodec.protocol());
 
         // Add all protocol-specific headers to the request.
-        Set<CharSequence> connectionParts = new LinkedHashSet<CharSequence>(2);
+        Set<CharSequence> connectionParts = new LinkedHashSet<>(2);
         connectionParts.addAll(upgradeCodec.setUpgradeHeaders(ctx, request));
 
         // Set the CONNECTION header from the set of all protocol-specific headers that were added.
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
index c486a67ed8..4c18933f38 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
@@ -61,7 +61,7 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpReque
     private static final CharSequence ZERO_LENGTH_CONNECT = "CONNECT";
     private static final int CONTINUE_CODE = HttpResponseStatus.CONTINUE.code();
 
-    private final Queue<CharSequence> acceptEncodingQueue = new ArrayDeque<CharSequence>();
+    private final Queue<CharSequence> acceptEncodingQueue = new ArrayDeque<>();
     private EmbeddedChannel encoder;
     private State state = State.AWAIT_HEADERS;
 
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java
index 3d975516d5..c361f2285e 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java
@@ -88,16 +88,16 @@ public class HttpMethod implements Comparable<HttpMethod> {
     private static final EnumNameMap<HttpMethod> methodMap;
 
     static {
-        methodMap = new EnumNameMap<HttpMethod>(
-                new EnumNameMap.Node<HttpMethod>(OPTIONS.toString(), OPTIONS),
-                new EnumNameMap.Node<HttpMethod>(GET.toString(), GET),
-                new EnumNameMap.Node<HttpMethod>(HEAD.toString(), HEAD),
-                new EnumNameMap.Node<HttpMethod>(POST.toString(), POST),
-                new EnumNameMap.Node<HttpMethod>(PUT.toString(), PUT),
-                new EnumNameMap.Node<HttpMethod>(PATCH.toString(), PATCH),
-                new EnumNameMap.Node<HttpMethod>(DELETE.toString(), DELETE),
-                new EnumNameMap.Node<HttpMethod>(TRACE.toString(), TRACE),
-                new EnumNameMap.Node<HttpMethod>(CONNECT.toString(), CONNECT));
+        methodMap = new EnumNameMap<>(
+                new EnumNameMap.Node<>(OPTIONS.toString(), OPTIONS),
+                new EnumNameMap.Node<>(GET.toString(), GET),
+                new EnumNameMap.Node<>(HEAD.toString(), HEAD),
+                new EnumNameMap.Node<>(POST.toString(), POST),
+                new EnumNameMap.Node<>(PUT.toString(), PUT),
+                new EnumNameMap.Node<>(PATCH.toString(), PATCH),
+                new EnumNameMap.Node<>(DELETE.toString(), DELETE),
+                new EnumNameMap.Node<>(TRACE.toString(), TRACE),
+                new EnumNameMap.Node<>(CONNECT.toString(), CONNECT));
     }
 
     /**
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
index f72484e4f2..66883d4cee 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
@@ -33,7 +33,7 @@ public final class HttpServerCodec extends CombinedChannelDuplexHandler<HttpRequ
         implements HttpServerUpgradeHandler.SourceCodec {
 
     /** A queue that is used for correlating a request and a response. */
-    private final Queue<HttpMethod> queue = new ArrayDeque<HttpMethod>();
+    private final Queue<HttpMethod> queue = new ArrayDeque<>();
 
     /**
      * Creates a new instance with the default decoder options
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerUpgradeHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerUpgradeHandler.java
index f1f3efcb1d..a720661fd3 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerUpgradeHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerUpgradeHandler.java
@@ -359,7 +359,7 @@ public class HttpServerUpgradeHandler extends HttpObjectAggregator {
      */
     private static List<CharSequence> splitHeader(CharSequence header) {
         final StringBuilder builder = new StringBuilder(header.length());
-        final List<CharSequence> protocols = new ArrayList<CharSequence>(4);
+        final List<CharSequence> protocols = new ArrayList<>(4);
         for (int i = 0; i < header.length(); ++i) {
             char c = header.charAt(i);
             if (Character.isWhitespace(c)) {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpUtil.java
index 8e04b10db6..a668b8942a 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpUtil.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpUtil.java
@@ -325,7 +325,7 @@ public final class HttpUtil {
             if (encodings.isEmpty()) {
                 return;
             }
-            List<CharSequence> values = new ArrayList<CharSequence>(encodings);
+            List<CharSequence> values = new ArrayList<>(encodings);
             Iterator<CharSequence> valuesIt = values.iterator();
             while (valuesIt.hasNext()) {
                 CharSequence value = valuesIt.next();
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
index 7c631f31ce..fadb610adb 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
@@ -212,7 +212,7 @@ public class QueryStringDecoder {
         if (s.charAt(from) == '?') {
             from++;
         }
-        Map<String, List<String>> params = new LinkedHashMap<String, List<String>>();
+        Map<String, List<String>> params = new LinkedHashMap<>();
         int nameStart = from;
         int valueStart = -1;
         int i;
@@ -258,7 +258,7 @@ public class QueryStringDecoder {
         String value = decodeComponent(s, valueStart, valueEnd, charset, false);
         List<String> values = params.get(name);
         if (values == null) {
-            values = new ArrayList<String>(1);  // Often there's only 1 value.
+            values = new ArrayList<>(1);  // Often there's only 1 value.
             params.put(name, values);
         }
         values.add(value);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/ReadOnlyHttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/ReadOnlyHttpHeaders.java
index 995e2ad90a..75301d4b2f 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/ReadOnlyHttpHeaders.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/ReadOnlyHttpHeaders.java
@@ -132,7 +132,7 @@ public final class ReadOnlyHttpHeaders extends HttpHeaders {
             return Collections.emptyList();
         }
         final int nameHash = AsciiString.hashCode(name);
-        List<String> values = new ArrayList<String>(4);
+        List<String> values = new ArrayList<>(4);
         for (int i = 0; i < nameValuePairs.length; i += 2) {
             CharSequence roName = nameValuePairs[i];
             if (AsciiString.hashCode(roName) == nameHash && contentEqualsIgnoreCase(roName, name)) {
@@ -147,9 +147,9 @@ public final class ReadOnlyHttpHeaders extends HttpHeaders {
         if (isEmpty()) {
             return Collections.emptyList();
         }
-        List<Map.Entry<String, String>> entries = new ArrayList<Map.Entry<String, String>>(size());
+        List<Map.Entry<String, String>> entries = new ArrayList<>(size());
         for (int i = 0; i < nameValuePairs.length; i += 2) {
-            entries.add(new SimpleImmutableEntry<String, String>(nameValuePairs[i].toString(),
+            entries.add(new SimpleImmutableEntry<>(nameValuePairs[i].toString(),
                     nameValuePairs[i + 1].toString()));
         }
         return entries;
@@ -220,7 +220,7 @@ public final class ReadOnlyHttpHeaders extends HttpHeaders {
         if (isEmpty()) {
             return Collections.emptySet();
         }
-        Set<String> names = new LinkedHashSet<String>(size());
+        Set<String> names = new LinkedHashSet<>(size());
         for (int i = 0; i < nameValuePairs.length; i += 2) {
             names.add(nameValuePairs[i].toString());
         }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java
index cf5349b086..4ec93d8335 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java
@@ -68,7 +68,7 @@ public final class ServerCookieDecoder extends CookieDecoder {
             return Collections.emptySet();
         }
 
-        Set<Cookie> cookies = new TreeSet<Cookie>();
+        Set<Cookie> cookies = new TreeSet<>();
 
         int i = 0;
 
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java
index b707dc33d1..de130b7f3b 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java
@@ -139,7 +139,7 @@ public final class ServerCookieEncoder extends CookieEncoder {
         for (int idx : nameToLastIndex.values()) {
             isLastInstance[idx] = true;
         }
-        List<String> dedupd = new ArrayList<String>(nameToLastIndex.size());
+        List<String> dedupd = new ArrayList<>(nameToLastIndex.size());
         for (int i = 0, n = encoded.size(); i < n; i++) {
             if (isLastInstance[i]) {
                 dedupd.add(encoded.get(i));
@@ -159,8 +159,8 @@ public final class ServerCookieEncoder extends CookieEncoder {
             return Collections.emptyList();
         }
 
-        List<String> encoded = new ArrayList<String>(cookies.length);
-        Map<String, Integer> nameToIndex = strict && cookies.length > 1 ? new HashMap<String, Integer>() : null;
+        List<String> encoded = new ArrayList<>(cookies.length);
+        Map<String, Integer> nameToIndex = strict && cookies.length > 1 ? new HashMap<>() : null;
         boolean hasDupdName = false;
         for (int i = 0; i < cookies.length; i++) {
             Cookie c = cookies[i];
@@ -183,8 +183,8 @@ public final class ServerCookieEncoder extends CookieEncoder {
             return Collections.emptyList();
         }
 
-        List<String> encoded = new ArrayList<String>(cookies.size());
-        Map<String, Integer> nameToIndex = strict && cookies.size() > 1 ? new HashMap<String, Integer>() : null;
+        List<String> encoded = new ArrayList<>(cookies.size());
+        Map<String, Integer> nameToIndex = strict && cookies.size() > 1 ? new HashMap<>() : null;
         int i = 0;
         boolean hasDupdName = false;
         for (Cookie c : cookies) {
@@ -208,9 +208,9 @@ public final class ServerCookieEncoder extends CookieEncoder {
             return Collections.emptyList();
         }
 
-        List<String> encoded = new ArrayList<String>();
+        List<String> encoded = new ArrayList<>();
         Cookie firstCookie = cookiesIt.next();
-        Map<String, Integer> nameToIndex = strict && cookiesIt.hasNext() ? new HashMap<String, Integer>() : null;
+        Map<String, Integer> nameToIndex = strict && cookiesIt.hasNext() ? new HashMap<>() : null;
         int i = 0;
         encoded.add(encode(firstCookie));
         boolean hasDupdName = nameToIndex != null && nameToIndex.put(firstCookie.name(), i++) != null;
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfig.java b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfig.java
index 5ccae5d641..317e44517f 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfig.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfig.java
@@ -47,7 +47,7 @@ public final class CorsConfig {
     private final boolean shortCircuit;
 
     CorsConfig(final CorsConfigBuilder builder) {
-        origins = new LinkedHashSet<String>(builder.origins);
+        origins = new LinkedHashSet<>(builder.origins);
         anyOrigin = builder.anyOrigin;
         enabled = builder.enabled;
         exposeHeaders = builder.exposeHeaders;
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfigBuilder.java b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfigBuilder.java
index c55eed184b..6b1c083149 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfigBuilder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsConfigBuilder.java
@@ -68,11 +68,11 @@ public final class CorsConfigBuilder {
     boolean allowNullOrigin;
     boolean enabled = true;
     boolean allowCredentials;
-    final Set<String> exposeHeaders = new HashSet<String>();
+    final Set<String> exposeHeaders = new HashSet<>();
     long maxAge;
-    final Set<HttpMethod> requestMethods = new HashSet<HttpMethod>();
-    final Set<String> requestHeaders = new HashSet<String>();
-    final Map<CharSequence, Callable<?>> preflightHeaders = new HashMap<CharSequence, Callable<?>>();
+    final Set<HttpMethod> requestMethods = new HashSet<>();
+    final Set<String> requestHeaders = new HashSet<>();
+    final Map<CharSequence, Callable<?>> preflightHeaders = new HashMap<>();
     private boolean noPreflightHeaders;
     boolean shortCircuit;
 
@@ -82,7 +82,7 @@ public final class CorsConfigBuilder {
      * @param origins the origin to be used for this builder.
      */
     CorsConfigBuilder(final String... origins) {
-        this.origins = new LinkedHashSet<String>(Arrays.asList(origins));
+        this.origins = new LinkedHashSet<>(Arrays.asList(origins));
         anyOrigin = false;
     }
 
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java
index 6387ecaac7..9f92325bf4 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java
@@ -67,7 +67,7 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
      * different data items may be equal.
      */
     private final Map<HttpRequest, List<HttpData>> requestFileDeleteMap =
-            Collections.synchronizedMap(new IdentityHashMap<HttpRequest, List<HttpData>>());
+            Collections.synchronizedMap(new IdentityHashMap<>());
 
     /**
      * HttpData will be in memory if less than default size (16KB).
@@ -122,7 +122,7 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
     private List<HttpData> getList(HttpRequest request) {
         List<HttpData> list = requestFileDeleteMap.get(request);
         if (list == null) {
-            list = new ArrayList<HttpData>();
+            list = new ArrayList<>();
             requestFileDeleteMap.put(request, list);
         }
         return list;
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java
index e910e889ed..2bc91dc510 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java
@@ -79,12 +79,12 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest
     /**
      * HttpDatas from Body
      */
-    private final List<InterfaceHttpData> bodyListHttpData = new ArrayList<InterfaceHttpData>();
+    private final List<InterfaceHttpData> bodyListHttpData = new ArrayList<>();
 
     /**
      * HttpDatas as Map from Body
      */
-    private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap<String, List<InterfaceHttpData>>(
+    private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap<>(
             CaseIgnoringComparator.INSTANCE);
 
     /**
@@ -424,7 +424,7 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest
         }
         List<InterfaceHttpData> datas = bodyMapHttpData.get(data.getName());
         if (datas == null) {
-            datas = new ArrayList<InterfaceHttpData>(1);
+            datas = new ArrayList<>(1);
             bodyMapHttpData.put(data.getName(), datas);
         }
         datas.add(data);
@@ -669,7 +669,7 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest
     private InterfaceHttpData findMultipartDisposition() {
         int readerIndex = undecodedChunk.readerIndex();
         if (currentStatus == MultiPartStatus.DISPOSITION) {
-            currentFieldAttributes = new TreeMap<CharSequence, Attribute>(CaseIgnoringComparator.INSTANCE);
+            currentFieldAttributes = new TreeMap<>(CaseIgnoringComparator.INSTANCE);
         }
         // read many lines until empty line with newline found! Store all data
         while (!skipOneLine()) {
@@ -1453,7 +1453,7 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest
      *         follows by several values that were separated by ';' or ','
      */
     private static String[] splitMultipartHeader(String sb) {
-        ArrayList<String> headers = new ArrayList<String>(1);
+        ArrayList<String> headers = new ArrayList<>(1);
         int nameStart;
         int nameEnd;
         int colonEnd;
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
index 21faffe4a3..361215068a 100755
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
@@ -98,9 +98,9 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
 
     static {
         percentEncodings = new Map.Entry[] {
-                new SimpleImmutableEntry<Pattern, String>(Pattern.compile("\\*"), "%2A"),
-                new SimpleImmutableEntry<Pattern, String>(Pattern.compile("\\+"), "%20"),
-                new SimpleImmutableEntry<Pattern, String>(Pattern.compile("~"), "%7E")
+                new SimpleImmutableEntry<>(Pattern.compile("\\*"), "%2A"),
+                new SimpleImmutableEntry<>(Pattern.compile("\\+"), "%20"),
+                new SimpleImmutableEntry<>(Pattern.compile("~"), "%7E")
         };
     }
 
@@ -216,12 +216,12 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
             throw new ErrorDataEncoderException("Cannot create a Encoder if request is a TRACE");
         }
         // Fill default values
-        bodyListDatas = new ArrayList<InterfaceHttpData>();
+        bodyListDatas = new ArrayList<>();
         // default mode
         isLastChunk = false;
         isLastChunkSent = false;
         isMultipart = multipart;
-        multipartHttpDatas = new ArrayList<InterfaceHttpData>();
+        multipartHttpDatas = new ArrayList<>();
         this.encoderMode = encoderMode;
         if (isMultipart) {
             initDataMultipart();
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java
index 88cf05ee60..8bce1c4a93 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java
@@ -68,12 +68,12 @@ public class HttpPostStandardRequestDecoder implements InterfaceHttpPostRequestD
     /**
      * HttpDatas from Body
      */
-    private final List<InterfaceHttpData> bodyListHttpData = new ArrayList<InterfaceHttpData>();
+    private final List<InterfaceHttpData> bodyListHttpData = new ArrayList<>();
 
     /**
      * HttpDatas as Map from Body
      */
-    private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap<String, List<InterfaceHttpData>>(
+    private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap<>(
             CaseIgnoringComparator.INSTANCE);
 
     /**
@@ -369,7 +369,7 @@ public class HttpPostStandardRequestDecoder implements InterfaceHttpPostRequestD
         }
         List<InterfaceHttpData> datas = bodyMapHttpData.get(data.getName());
         if (datas == null) {
-            datas = new ArrayList<InterfaceHttpData>(1);
+            datas = new ArrayList<>(1);
             bodyMapHttpData.put(data.getName(), datas);
         }
         datas.add(data);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InternalAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InternalAttribute.java
index 991100ed20..24059355ee 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InternalAttribute.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InternalAttribute.java
@@ -28,7 +28,7 @@ import java.util.List;
  * (like Multipart Mixed mode)
  */
 final class InternalAttribute extends AbstractReferenceCounted implements InterfaceHttpData {
-    private final List<ByteBuf> value = new ArrayList<ByteBuf>();
+    private final List<ByteBuf> value = new ArrayList<>();
     private final Charset charset;
     private int size;
 
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
index 4eb43484c4..439595514a 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@@ -106,7 +106,7 @@ public abstract class WebSocketServerHandshaker {
      * Returns the CSV of supported sub protocols
      */
     public Set<String> subprotocols() {
-        Set<String> ret = new LinkedHashSet<String>();
+        Set<String> ret = new LinkedHashSet<>();
         Collections.addAll(ret, subprotocols);
         return ret;
     }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java
index 92ee9cc35d..ab8b782568 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java
@@ -90,7 +90,7 @@ public class WebSocketClientExtensionHandler extends ChannelDuplexHandler {
                     List<WebSocketExtensionData> extensions =
                             WebSocketExtensionUtil.extractExtensions(extensionsHeader);
                     List<WebSocketClientExtension> validExtensions =
-                            new ArrayList<WebSocketClientExtension>(extensions.size());
+                            new ArrayList<>(extensions.size());
                     int rsv = 0;
 
                     for (WebSocketExtensionData extensionData : extensions) {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java
index fd91f72eab..86f4731af6 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java
@@ -44,13 +44,13 @@ public final class WebSocketExtensionUtil {
     public static List<WebSocketExtensionData> extractExtensions(String extensionHeader) {
         String[] rawExtensions = extensionHeader.split(EXTENSION_SEPARATOR);
         if (rawExtensions.length > 0) {
-            List<WebSocketExtensionData> extensions = new ArrayList<WebSocketExtensionData>(rawExtensions.length);
+            List<WebSocketExtensionData> extensions = new ArrayList<>(rawExtensions.length);
             for (String rawExtension : rawExtensions) {
                 String[] extensionParameters = rawExtension.split(PARAMETER_SEPARATOR);
                 String name = extensionParameters[0].trim();
                 Map<String, String> parameters;
                 if (extensionParameters.length > 1) {
-                    parameters = new HashMap<String, String>(extensionParameters.length - 1);
+                    parameters = new HashMap<>(extensionParameters.length - 1);
                     for (int i = 1; i < extensionParameters.length; i++) {
                         String parameter = extensionParameters[i].trim();
                         Matcher parameterMatcher = PARAMETER.matcher(parameter);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java
index 1b2e39189c..f63401d865 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java
@@ -89,7 +89,7 @@ public class WebSocketServerExtensionHandler extends ChannelDuplexHandler {
 
                         if (validExtension != null && ((validExtension.rsv() & rsv) == 0)) {
                             if (validExtensions == null) {
-                                validExtensions = new ArrayList<WebSocketServerExtension>(1);
+                                validExtensions = new ArrayList<>(1);
                             }
                             rsv = rsv | validExtension.rsv();
                             validExtensions.add(validExtension);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java
index ddebaaa92f..58370518c9 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java
@@ -85,7 +85,7 @@ public final class PerMessageDeflateClientExtensionHandshaker implements WebSock
 
     @Override
     public WebSocketExtensionData newRequestData() {
-        HashMap<String, String> parameters = new HashMap<String, String>(4);
+        HashMap<String, String> parameters = new HashMap<>(4);
         if (requestedServerWindowSize != MAX_WINDOW_SIZE) {
             parameters.put(SERVER_NO_CONTEXT, null);
         }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java
index 0bf0162e8a..ff592ef2aa 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java
@@ -177,7 +177,7 @@ public final class PerMessageDeflateServerExtensionHandshaker implements WebSock
 
         @Override
         public WebSocketExtensionData newReponseData() {
-            HashMap<String, String> parameters = new HashMap<String, String>(4);
+            HashMap<String, String> parameters = new HashMap<>(4);
             if (serverNoContext) {
                 parameters.put(SERVER_NO_CONTEXT, null);
             }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
index 3e62928012..1419c87605 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
@@ -95,7 +95,7 @@ public final class RtspMethods {
      */
     public static final HttpMethod RECORD = new HttpMethod("RECORD");
 
-    private static final Map<String, HttpMethod> methodMap = new HashMap<String, HttpMethod>();
+    private static final Map<String, HttpMethod> methodMap = new HashMap<>();
 
     static {
         methodMap.put(DESCRIBE.toString(), DESCRIBE);
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java
index 5097048601..cbebb4a0b0 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java
@@ -27,7 +27,7 @@ import java.util.TreeMap;
 public class DefaultSpdySettingsFrame implements SpdySettingsFrame {
 
     private boolean clear;
-    private final Map<Integer, Setting> settingsMap = new TreeMap<Integer, Setting>();
+    private final Map<Integer, Setting> settingsMap = new TreeMap<>();
 
     @Override
     public Set<Integer> ids() {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
index 366ad15b66..221201958b 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
@@ -59,7 +59,7 @@ public class SpdyHttpDecoder extends MessageToMessageDecoder<SpdyFrame> {
      *        a {@link TooLongFrameException} will be raised.
      */
     public SpdyHttpDecoder(SpdyVersion version, int maxContentLength) {
-        this(version, maxContentLength, new HashMap<Integer, FullHttpMessage>(), true);
+        this(version, maxContentLength, new HashMap<>(), true);
     }
 
     /**
@@ -72,7 +72,7 @@ public class SpdyHttpDecoder extends MessageToMessageDecoder<SpdyFrame> {
      * @param validateHeaders {@code true} if http headers should be validated
      */
     public SpdyHttpDecoder(SpdyVersion version, int maxContentLength, boolean validateHeaders) {
-        this(version, maxContentLength, new HashMap<Integer, FullHttpMessage>(), validateHeaders);
+        this(version, maxContentLength, new HashMap<>(), validateHeaders);
     }
 
     /**
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
index 4ad32e4dc2..e57c167a77 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
@@ -33,7 +33,7 @@ import java.util.Queue;
 public class SpdyHttpResponseStreamIdHandler extends
         MessageToMessageCodec<Object, HttpMessage> {
     private static final Integer NO_ID = -1;
-    private final Queue<Integer> ids = new LinkedList<Integer>();
+    private final Queue<Integer> ids = new LinkedList<>();
 
     @Override
     public boolean acceptInboundMessage(Object msg) throws Exception {
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySession.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySession.java
index e34dc27f6d..136e71fb37 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySession.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySession.java
@@ -59,7 +59,7 @@ final class SpdySession {
 
     // Stream-IDs should be iterated in priority order
     Map<Integer, StreamState> activeStreams() {
-        Map<Integer, StreamState> streams = new TreeMap<Integer, StreamState>(streamComparator);
+        Map<Integer, StreamState> streams = new TreeMap<>(streamComparator);
         streams.putAll(activeStreams);
         return streams;
     }
@@ -239,7 +239,7 @@ final class SpdySession {
         private final AtomicInteger sendWindowSize;
         private final AtomicInteger receiveWindowSize;
         private int receiveWindowSizeLowerBound;
-        private final Queue<PendingWrite> pendingWriteQueue = new ConcurrentLinkedQueue<PendingWrite>();
+        private final Queue<PendingWrite> pendingWriteQueue = new ConcurrentLinkedQueue<>();
 
         StreamState(
                 byte priority, boolean remoteSideClosed, boolean localSideClosed,
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpContentDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpContentDecoderTest.java
index 8646558c9f..eb66a6fb7b 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpContentDecoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpContentDecoderTest.java
@@ -273,7 +273,7 @@ public class HttpContentDecoderTest {
         HttpRequestDecoder decoder = new HttpRequestDecoder();
         final int maxBytes = 10;
         HttpObjectAggregator aggregator = new HttpObjectAggregator(maxBytes);
-        final AtomicReference<FullHttpRequest> secondRequestRef = new AtomicReference<FullHttpRequest>();
+        final AtomicReference<FullHttpRequest> secondRequestRef = new AtomicReference<>();
         EmbeddedChannel channel = new EmbeddedChannel(decoder, aggregator, new ChannelInboundHandlerAdapter() {
             @Override
             public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
@@ -571,7 +571,7 @@ public class HttpContentDecoderTest {
 
         int outputSize = 0;
         ByteBuf o;
-        List<ByteBuf> inbound = new ArrayList<ByteBuf>();
+        List<ByteBuf> inbound = new ArrayList<>();
         while ((o = channel.readInbound()) != null) {
             inbound.add(o);
             outputSize += o.readableBytes();
@@ -626,7 +626,7 @@ public class HttpContentDecoderTest {
 
         int outputSize = 0;
         ByteBuf o;
-        List<ByteBuf> outbound = new ArrayList<ByteBuf>();
+        List<ByteBuf> outbound = new ArrayList<>();
         while ((o = channel.readOutbound()) != null) {
             outbound.add(o);
             outputSize += o.readableBytes();
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeadersTestUtils.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeadersTestUtils.java
index d5e453c39f..d415b61373 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeadersTestUtils.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeadersTestUtils.java
@@ -54,7 +54,7 @@ public final class HttpHeadersTestUtils {
 
         public List<CharSequence> asList() {
             if (array == null) {
-                List<CharSequence> list = new ArrayList<CharSequence>(nr);
+                List<CharSequence> list = new ArrayList<>(nr);
                 for (int i = 1; i <= nr; i++) {
                     list.add(of(i).toString());
                 }
@@ -68,7 +68,7 @@ public final class HttpHeadersTestUtils {
             --from;
             final int size = nr - from;
             final int end = from + size;
-            List<CharSequence> list = new ArrayList<CharSequence>(size);
+            List<CharSequence> list = new ArrayList<>(size);
             List<CharSequence> fullList = asList();
             for (int i = from; i < end; ++i) {
                 list.add(fullList.get(i));
@@ -117,7 +117,7 @@ public final class HttpHeadersTestUtils {
         private static final Map<Integer, HeaderValue> MAP;
 
         static {
-            final Map<Integer, HeaderValue> map = new HashMap<Integer, HeaderValue>();
+            final Map<Integer, HeaderValue> map = new HashMap<>();
             for (HeaderValue v : values()) {
                 final int nr = v.nr;
                 map.put(Integer.valueOf(nr), v);
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpUtilTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpUtilTest.java
index 31596067ae..b4a6d939b9 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpUtilTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpUtilTest.java
@@ -194,7 +194,7 @@ public class HttpUtilTest {
     }
 
     private static List<String> allPossibleCasesOfContinue() {
-        final List<String> cases = new ArrayList<String>();
+        final List<String> cases = new ArrayList<>();
         final String c = "continue";
         for (int i = 0; i < Math.pow(2, c.length()); i++) {
             final StringBuilder sb = new StringBuilder(c.length());
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ClientCookieDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ClientCookieDecoderTest.java
index 2cd69f98dc..1aa7a2f5dc 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ClientCookieDecoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ClientCookieDecoderTest.java
@@ -118,11 +118,11 @@ public class ClientCookieDecoderTest {
 
     @Test
     public void testDecodingQuotedCookie() {
-        Collection<String> sources = new ArrayList<String>();
+        Collection<String> sources = new ArrayList<>();
         sources.add("a=\"\",");
         sources.add("b=\"1\",");
 
-        Collection<Cookie> cookies = new ArrayList<Cookie>();
+        Collection<Cookie> cookies = new ArrayList<>();
         for (String source : sources) {
             cookies.add(ClientCookieDecoder.STRICT.decode(source));
         }
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ServerCookieEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ServerCookieEncoderTest.java
index 82f813ff47..afa6f39bf1 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ServerCookieEncoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/cookie/ServerCookieEncoderTest.java
@@ -70,7 +70,7 @@ public class ServerCookieEncoderTest {
 
     @Test
     public void testEncodingMultipleCookiesStrict() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         result.add("cookie2=value2");
         result.add("cookie1=value3");
         Cookie cookie1 = new DefaultCookie("cookie1", "value1");
@@ -82,7 +82,7 @@ public class ServerCookieEncoderTest {
 
     @Test
     public void illegalCharInCookieNameMakesStrictEncoderThrowsException() {
-        Set<Character> illegalChars = new HashSet<Character>();
+        Set<Character> illegalChars = new HashSet<>();
         // CTLs
         for (int i = 0x00; i <= 0x1F; i++) {
             illegalChars.add((char) i);
@@ -109,7 +109,7 @@ public class ServerCookieEncoderTest {
 
     @Test
     public void illegalCharInCookieValueMakesStrictEncoderThrowsException() {
-        Set<Character> illegalChars = new HashSet<Character>();
+        Set<Character> illegalChars = new HashSet<>();
         // CTLs
         for (int i = 0x00; i <= 0x1F; i++) {
             illegalChars.add((char) i);
@@ -144,7 +144,7 @@ public class ServerCookieEncoderTest {
 
     @Test
     public void testEncodingMultipleCookiesLax() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         result.add("cookie1=value1");
         result.add("cookie2=value2");
         result.add("cookie1=value3");
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoderTest.java
index cb6c187efc..fc80180378 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoderTest.java
@@ -38,11 +38,11 @@ public class WebSocket08FrameDecoderTest {
 
     @Test
     public void supportIanaStatusCodes() throws Exception {
-        Set<Integer> forbiddenIanaCodes = new HashSet<Integer>();
+        Set<Integer> forbiddenIanaCodes = new HashSet<>();
         forbiddenIanaCodes.add(1004);
         forbiddenIanaCodes.add(1005);
         forbiddenIanaCodes.add(1006);
-        Set<Integer> validIanaCodes = new HashSet<Integer>();
+        Set<Integer> validIanaCodes = new HashSet<>();
         for (int i = 1000; i < 1015; i++) {
             validIanaCodes.add(i);
         }
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
index 50bd6bebea..0e9c075369 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
 
 public class WebSocketServerProtocolHandlerTest {
 
-    private final Queue<FullHttpResponse> responses = new ArrayDeque<FullHttpResponse>();
+    private final Queue<FullHttpResponse> responses = new ArrayDeque<>();
 
     @Before
     public void setUp() {
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java
index d3ee5a4c1f..0d241db78e 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java
@@ -71,7 +71,7 @@ public class DeflateFrameClientExtensionHandshakerTest {
         DeflateFrameClientExtensionHandshaker handshaker =
                 new DeflateFrameClientExtensionHandshaker(false);
 
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         parameters.put("invalid", "12");
 
         // execute
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java
index 1d6f8ba5af..a18df0aac2 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java
@@ -70,7 +70,7 @@ public class DeflateFrameServerExtensionHandshakerTest {
                 new DeflateFrameServerExtensionHandshaker();
 
         Map<String, String> parameters;
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put("unknown", "11");
 
         // execute
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java
index 8ed3a7c25f..6f94bbe571 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java
@@ -84,7 +84,7 @@ public class PerMessageDeflateClientExtensionHandshakerTest {
         PerMessageDeflateClientExtensionHandshaker handshaker =
                 new PerMessageDeflateClientExtensionHandshaker(6, true, 10, true, true);
 
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(CLIENT_MAX_WINDOW, "12");
         parameters.put(SERVER_MAX_WINDOW, "10");
         parameters.put(CLIENT_NO_CONTEXT, null);
@@ -101,7 +101,7 @@ public class PerMessageDeflateClientExtensionHandshakerTest {
         assertTrue(extension.newExtensionEncoder() instanceof PerMessageDeflateEncoder);
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(SERVER_MAX_WINDOW, "10");
         parameters.put(SERVER_NO_CONTEXT, null);
 
@@ -116,7 +116,7 @@ public class PerMessageDeflateClientExtensionHandshakerTest {
         assertTrue(extension.newExtensionEncoder() instanceof PerMessageDeflateEncoder);
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
 
         // execute
         extension = handshaker.handshakeExtension(
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java
index a837c4993b..8691b1d23b 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java
@@ -56,7 +56,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest {
         assertTrue(data.parameters().isEmpty());
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(CLIENT_MAX_WINDOW, null);
         parameters.put(CLIENT_NO_CONTEXT, null);
 
@@ -78,7 +78,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest {
         assertTrue(data.parameters().isEmpty());
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(SERVER_MAX_WINDOW, "12");
         parameters.put(SERVER_NO_CONTEXT, null);
 
@@ -100,7 +100,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest {
         PerMessageDeflateServerExtensionHandshaker handshaker =
                 new PerMessageDeflateServerExtensionHandshaker(6, true, 10, true, true);
 
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(CLIENT_MAX_WINDOW, null);
         parameters.put(SERVER_MAX_WINDOW, "12");
         parameters.put(CLIENT_NO_CONTEXT, null);
@@ -129,7 +129,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest {
         assertTrue(data.parameters().containsKey(SERVER_MAX_WINDOW));
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
         parameters.put(SERVER_MAX_WINDOW, "12");
         parameters.put(SERVER_NO_CONTEXT, null);
 
@@ -154,7 +154,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest {
         assertTrue(data.parameters().containsKey(SERVER_NO_CONTEXT));
 
         // initialize
-        parameters = new HashMap<String, String>();
+        parameters = new HashMap<>();
 
         // execute
         extension = handshaker.handshakeExtension(
diff --git a/codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java
index d8f247e2c2..964ec15254 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java
@@ -48,7 +48,7 @@ public class SpdyFrameDecoderTest {
     }
 
     private final class TestSpdyFrameDecoderDelegate implements SpdyFrameDecoderDelegate {
-        private final Queue<ByteBuf> buffers = new ArrayDeque<ByteBuf>();
+        private final Queue<ByteBuf> buffers = new ArrayDeque<>();
 
         @Override
         public void readDataFrame(int streamId, boolean last, ByteBuf data) {
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Connection.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Connection.java
index 8590e06fa2..504184b676 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Connection.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Connection.java
@@ -78,7 +78,7 @@ public class DefaultHttp2Connection implements Http2Connection {
      * (local/remote flow controller and {@link StreamByteDistributor}) and we leave room for 1 extra.
      * We could be more aggressive but the ArrayList resize will double the size if we are too small.
      */
-    final List<Listener> listeners = new ArrayList<Listener>(4);
+    final List<Listener> listeners = new ArrayList<>(4);
     final ActiveStreams activeStreams;
     Promise<Void> closePromise;
 
@@ -102,8 +102,8 @@ public class DefaultHttp2Connection implements Http2Connection {
         // in response to any locally enforced limits being exceeded [2].
         // [1] https://tools.ietf.org/html/rfc7540#section-5.1.2
         // [2] https://tools.ietf.org/html/rfc7540#section-8.2.2
-        localEndpoint = new DefaultEndpoint<Http2LocalFlowController>(server, server ? MAX_VALUE : maxReservedStreams);
-        remoteEndpoint = new DefaultEndpoint<Http2RemoteFlowController>(!server, maxReservedStreams);
+        localEndpoint = new DefaultEndpoint<>(server, server ? MAX_VALUE : maxReservedStreams);
+        remoteEndpoint = new DefaultEndpoint<>(!server, maxReservedStreams);
 
         // Add the connection stream to the map.
         streamMap.put(connectionStream.id(), connectionStream);
@@ -127,7 +127,7 @@ public class DefaultHttp2Connection implements Http2Connection {
             } else if ((promise instanceof ChannelPromise) && ((ChannelPromise) closePromise).isVoid()) {
                 closePromise = promise;
             } else {
-                closePromise.addListener(new UnaryPromiseNotifier<Void>(promise));
+                closePromise.addListener(new UnaryPromiseNotifier<>(promise));
             }
         } else {
             closePromise = promise;
@@ -926,8 +926,8 @@ public class DefaultHttp2Connection implements Http2Connection {
      */
     private final class ActiveStreams {
         private final List<Listener> listeners;
-        private final Queue<Event> pendingEvents = new ArrayDeque<Event>(4);
-        private final Set<Http2Stream> streams = new LinkedHashSet<Http2Stream>();
+        private final Queue<Event> pendingEvents = new ArrayDeque<>(4);
+        private final Set<Http2Stream> streams = new LinkedHashSet<>();
         private int pendingIterations;
 
         public ActiveStreams(List<Listener> listeners) {
@@ -1055,7 +1055,7 @@ public class DefaultHttp2Connection implements Http2Connection {
          * (local/remote flow controller and {@link StreamByteDistributor}) and we leave room for 1 extra.
          * We could be more aggressive but the ArrayList resize will double the size if we are too small.
          */
-        final List<DefaultPropertyKey> keys = new ArrayList<DefaultPropertyKey>(4);
+        final List<DefaultPropertyKey> keys = new ArrayList<>(4);
 
         /**
          * Registers a new property key.
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java
index ce90e24342..2254f1fb90 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java
@@ -43,7 +43,7 @@ public class DefaultHttp2ConnectionEncoder implements Http2ConnectionEncoder {
     private Http2LifecycleManager lifecycleManager;
     // We prefer ArrayDeque to LinkedList because later will produce more GC.
     // This initial capacity is plenty for SETTINGS traffic.
-    private final ArrayDeque<Http2Settings> outstandingLocalSettingsQueue = new ArrayDeque<Http2Settings>(4);
+    private final ArrayDeque<Http2Settings> outstandingLocalSettingsQueue = new ArrayDeque<>(4);
 
     public DefaultHttp2ConnectionEncoder(Http2Connection connection, Http2FrameWriter frameWriter) {
         this.connection = checkNotNull(connection, "connection");
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java
index 217cf8dc25..0742c3657a 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java
@@ -287,7 +287,7 @@ public class DefaultHttp2RemoteFlowController implements Http2RemoteFlowControll
 
         FlowState(Http2Stream stream) {
             this.stream = stream;
-            pendingWriteQueue = new ArrayDeque<FlowControlled>(2);
+            pendingWriteQueue = new ArrayDeque<>(2);
         }
 
         /**
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java
index 9621daf2e0..38c321d6e0 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java
@@ -170,7 +170,7 @@ final class HpackStaticTable {
     private static CharSequenceMap<Integer> createMap() {
         int length = STATIC_TABLE.size();
         @SuppressWarnings("unchecked")
-        CharSequenceMap<Integer> ret = new CharSequenceMap<Integer>(true,
+        CharSequenceMap<Integer> ret = new CharSequenceMap<>(true,
                 UnsupportedValueConverter.<Integer>instance(), length);
         // Iterate through the static table in reverse order to
         // save the smallest index for a given name in the map.
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java
index 258f871eb8..092ab085dc 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java
@@ -275,7 +275,7 @@ public class Http2Exception extends Exception {
 
         public CompositeStreamException(Http2Error error, int initialCapacity) {
             super(error, ShutdownHint.NO_SHUTDOWN);
-            exceptions = new ArrayList<StreamException>(initialCapacity);
+            exceptions = new ArrayList<>(initialCapacity);
         }
 
         public void add(StreamException e) {
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java
index f0999bf644..dda910020d 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java
@@ -62,7 +62,7 @@ public interface Http2Headers extends Headers<CharSequence, CharSequence, Http2H
 
         private final AsciiString value;
         private final boolean requestOnly;
-        private static final CharSequenceMap<PseudoHeaderName> PSEUDO_HEADERS = new CharSequenceMap<PseudoHeaderName>();
+        private static final CharSequenceMap<PseudoHeaderName> PSEUDO_HEADERS = new CharSequenceMap<>();
 
         static {
             for (PseudoHeaderName pseudoHeader : PseudoHeaderName.values()) {
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2MultiplexCodec.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2MultiplexCodec.java
index b766bd2be6..b6649b5c21 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2MultiplexCodec.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2MultiplexCodec.java
@@ -790,7 +790,7 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
                 }
             } else {
                 if (inboundBuffer == null) {
-                    inboundBuffer = new ArrayDeque<Object>(4);
+                    inboundBuffer = new ArrayDeque<>(4);
                 }
                 inboundBuffer.add(frame);
             }
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2SecurityUtil.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2SecurityUtil.java
index 6c08feeaf0..0ecd2c058e 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2SecurityUtil.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2SecurityUtil.java
@@ -67,7 +67,7 @@ public final class Http2SecurityUtil {
             ));
 
     static {
-        CIPHERS = Collections.unmodifiableList(new ArrayList<String>(CIPHERS_JAVA_MOZILLA_MODERN_SECURITY));
+        CIPHERS = Collections.unmodifiableList(new ArrayList<>(CIPHERS_JAVA_MOZILLA_MODERN_SECURITY));
     }
 
     private Http2SecurityUtil() { }
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java
index c3f078f748..118be6c7b6 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java
@@ -40,8 +40,8 @@ import java.util.Map;
 public final class Http2StreamChannelBootstrap {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(Http2StreamChannelBootstrap.class);
 
-    private final Map<ChannelOption<?>, Object> options = new LinkedHashMap<ChannelOption<?>, Object>();
-    private final Map<AttributeKey<?>, Object> attrs = new LinkedHashMap<AttributeKey<?>, Object>();
+    private final Map<ChannelOption<?>, Object> options = new LinkedHashMap<>();
+    private final Map<AttributeKey<?>, Object> attrs = new LinkedHashMap<>();
     private final Channel channel;
     private volatile ChannelHandler handler;
 
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java
index 5f808db8df..79ab054166 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java
@@ -72,7 +72,7 @@ public final class HttpConversionUtil {
      * The set of headers that should not be directly copied when converting headers from HTTP to HTTP/2.
      */
     private static final CharSequenceMap<AsciiString> HTTP_TO_HTTP2_HEADER_BLACKLIST =
-            new CharSequenceMap<AsciiString>();
+            new CharSequenceMap<>();
     static {
         HTTP_TO_HTTP2_HEADER_BLACKLIST.add(CONNECTION, EMPTY_STRING);
         @SuppressWarnings("deprecation")
@@ -424,7 +424,7 @@ public final class HttpConversionUtil {
     private static CharSequenceMap<AsciiString> toLowercaseMap(Iterator<? extends CharSequence> valuesIter,
                                                                int arraySizeHint) {
         UnsupportedValueConverter<AsciiString> valueConverter = UnsupportedValueConverter.<AsciiString>instance();
-        CharSequenceMap<AsciiString> result = new CharSequenceMap<AsciiString>(true, valueConverter, arraySizeHint);
+        CharSequenceMap<AsciiString> result = new CharSequenceMap<>(true, valueConverter, arraySizeHint);
 
         while (valuesIter.hasNext()) {
             AsciiString lowerCased = AsciiString.of(valuesIter.next()).toLowerCase();
@@ -590,9 +590,9 @@ public final class HttpConversionUtil {
          * Translations from HTTP/2 header name to the HTTP/1.x equivalent.
          */
         private static final CharSequenceMap<AsciiString>
-            REQUEST_HEADER_TRANSLATIONS = new CharSequenceMap<AsciiString>();
+            REQUEST_HEADER_TRANSLATIONS = new CharSequenceMap<>();
         private static final CharSequenceMap<AsciiString>
-            RESPONSE_HEADER_TRANSLATIONS = new CharSequenceMap<AsciiString>();
+            RESPONSE_HEADER_TRANSLATIONS = new CharSequenceMap<>();
         static {
             RESPONSE_HEADER_TRANSLATIONS.add(Http2Headers.PseudoHeaderName.AUTHORITY.value(),
                             HttpHeaderNames.HOST);
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java
index b74a5661cf..83633768df 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java
@@ -199,7 +199,7 @@ public final class ReadOnlyHttp2Headers implements Http2Headers {
     @Override
     public List<CharSequence> getAll(CharSequence name) {
         final int nameHash = AsciiString.hashCode(name);
-        List<CharSequence> values = new ArrayList<CharSequence>();
+        List<CharSequence> values = new ArrayList<>();
 
         final int pseudoHeadersEnd = pseudoHeaders.length - 1;
         for (int i = 0; i < pseudoHeadersEnd; i += 2) {
@@ -501,7 +501,7 @@ public final class ReadOnlyHttp2Headers implements Http2Headers {
         if (isEmpty()) {
             return Collections.emptySet();
         }
-        Set<CharSequence> names = new LinkedHashSet<CharSequence>(size());
+        Set<CharSequence> names = new LinkedHashSet<>(size());
         final int pseudoHeadersEnd = pseudoHeaders.length - 1;
         for (int i = 0; i < pseudoHeadersEnd; i += 2) {
             names.add(pseudoHeaders[i]);
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/StreamBufferingEncoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/StreamBufferingEncoder.java
index 60a5588db4..2120520b88 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/StreamBufferingEncoder.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/StreamBufferingEncoder.java
@@ -103,7 +103,7 @@ public class StreamBufferingEncoder extends DecoratingHttp2ConnectionEncoder {
      * Buffer for any streams and corresponding frames that could not be created due to the maximum
      * concurrent stream limit being hit.
      */
-    private final TreeMap<Integer, PendingStream> pendingStreams = new TreeMap<Integer, PendingStream>();
+    private final TreeMap<Integer, PendingStream> pendingStreams = new TreeMap<>();
     private int maxConcurrentStreams;
     private boolean closed;
 
@@ -274,7 +274,7 @@ public class StreamBufferingEncoder extends DecoratingHttp2ConnectionEncoder {
     private static final class PendingStream {
         final ChannelHandlerContext ctx;
         final int streamId;
-        final Queue<Frame> frames = new ArrayDeque<Frame>(2);
+        final Queue<Frame> frames = new ArrayDeque<>(2);
 
         PendingStream(ChannelHandlerContext ctx, int streamId) {
             this.ctx = ctx;
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/UniformStreamByteDistributor.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/UniformStreamByteDistributor.java
index 421d3488b2..f02484f1ed 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/UniformStreamByteDistributor.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/UniformStreamByteDistributor.java
@@ -36,7 +36,7 @@ import static java.lang.Math.min;
 @UnstableApi
 public final class UniformStreamByteDistributor implements StreamByteDistributor {
     private final Http2Connection.PropertyKey stateKey;
-    private final Deque<State> queue = new ArrayDeque<State>(4);
+    private final Deque<State> queue = new ArrayDeque<>(4);
 
     /**
      * The minimum number of bytes that we will attempt to allocate to a stream. This is to
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java
index 461c3a72a3..4c996d3f55 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java
@@ -105,7 +105,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
             stateOnlyMap = new IntObjectHashMap<State>(maxStateOnlySize);
             // +2 because we may exceed the limit by 2 if a new dependency has no associated Http2Stream object. We need
             // to create the State objects to put them into the dependency tree, which then impacts priority.
-            stateOnlyRemovalQueue = new DefaultPriorityQueue<State>(StateOnlyComparator.INSTANCE, maxStateOnlySize + 2);
+            stateOnlyRemovalQueue = new DefaultPriorityQueue<>(StateOnlyComparator.INSTANCE, maxStateOnlySize + 2);
         }
         this.maxStateOnlySize = maxStateOnlySize;
 
@@ -122,7 +122,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
                 if (state == null) {
                     state = new State(stream);
                     // Only the stream which was just added will change parents. So we only need an array of size 1.
-                    List<ParentChangedEvent> events = new ArrayList<ParentChangedEvent>(1);
+                    List<ParentChangedEvent> events = new ArrayList<>(1);
                     connectionState.takeChild(state, false, events);
                     notifyParentChanged(events);
                 } else {
@@ -221,7 +221,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
             stateOnlyRemovalQueue.add(newParent);
             stateOnlyMap.put(parentStreamId, newParent);
             // Only the stream which was just added will change parents. So we only need an array of size 1.
-            List<ParentChangedEvent> events = new ArrayList<ParentChangedEvent>(1);
+            List<ParentChangedEvent> events = new ArrayList<>(1);
             connectionState.takeChild(newParent, false, events);
             notifyParentChanged(events);
         }
@@ -236,10 +236,10 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
         if (newParent != state.parent || (exclusive && newParent.children.size() != 1)) {
             final List<ParentChangedEvent> events;
             if (newParent.isDescendantOf(state)) {
-                events = new ArrayList<ParentChangedEvent>(2 + (exclusive ? newParent.children.size() : 0));
+                events = new ArrayList<>(2 + (exclusive ? newParent.children.size() : 0));
                 state.parent.takeChild(newParent, false, events);
             } else {
-                events = new ArrayList<ParentChangedEvent>(1 + (exclusive ? newParent.children.size() : 0));
+                events = new ArrayList<>(1 + (exclusive ? newParent.children.size() : 0));
             }
             newParent.takeChild(state, exclusive, events);
             notifyParentChanged(events);
@@ -487,7 +487,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
         State(int streamId, Http2Stream stream, int initialSize) {
             this.stream = stream;
             this.streamId = streamId;
-            pseudoTimeQueue = new DefaultPriorityQueue<State>(StatePseudoTimeComparator.INSTANCE, initialSize);
+            pseudoTimeQueue = new DefaultPriorityQueue<>(StatePseudoTimeComparator.INSTANCE, initialSize);
         }
 
         boolean isDescendantOf(State state) {
@@ -547,7 +547,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib
          */
         void removeChild(State child) {
             if (children.remove(child.streamId) != null) {
-                List<ParentChangedEvent> events = new ArrayList<ParentChangedEvent>(1 + child.children.size());
+                List<ParentChangedEvent> events = new ArrayList<>(1 + child.children.size());
                 events.add(new ParentChangedEvent(child, child.parent));
                 child.setParent(null);
 
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/CleartextHttp2ServerUpgradeHandlerTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/CleartextHttp2ServerUpgradeHandlerTest.java
index a544054b66..49b65fa61a 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/CleartextHttp2ServerUpgradeHandlerTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/CleartextHttp2ServerUpgradeHandlerTest.java
@@ -70,7 +70,7 @@ public class CleartextHttp2ServerUpgradeHandlerTest {
             }
         };
 
-        userEvents = new ArrayList<Object>();
+        userEvents = new ArrayList<>();
 
         HttpServerCodec httpServerCodec = new HttpServerCodec();
         HttpServerUpgradeHandler upgradeHandler = new HttpServerUpgradeHandler(httpServerCodec, upgradeCodecFactory);
@@ -213,7 +213,7 @@ public class CleartextHttp2ServerUpgradeHandlerTest {
         };
         http2ConnectionHandler = http2Codec;
 
-        userEvents = new ArrayList<Object>();
+        userEvents = new ArrayList<>();
 
         HttpServerCodec httpServerCodec = new HttpServerCodec();
         HttpServerUpgradeHandler upgradeHandler = new HttpServerUpgradeHandler(httpServerCodec, upgradeCodecFactory);
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoderTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoderTest.java
index 9ca7b1fee1..2cda78d8c2 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoderTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoderTest.java
@@ -150,8 +150,8 @@ public class DefaultHttp2ConnectionEncoderTest {
                 return ((ChannelPromise) in.getArguments()[4]).setSuccess();
             }
         }).when(writer).writeGoAway(eq(ctx), anyInt(), anyInt(), any(ByteBuf.class), any(ChannelPromise.class));
-        writtenData = new ArrayList<String>();
-        writtenPadding = new ArrayList<Integer>();
+        writtenData = new ArrayList<>();
+        writtenPadding = new ArrayList<>();
         when(writer.writeData(eq(ctx), anyInt(), any(ByteBuf.class), anyInt(), anyBoolean(),
                 any(ChannelPromise.class))).then(new Answer<ChannelFuture>() {
                     @Override
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/HashCollisionTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/HashCollisionTest.java
index 4fe437a737..9cd8d9bd07 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/HashCollisionTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/HashCollisionTest.java
@@ -43,7 +43,7 @@ public final class HashCollisionTest {
 
     public static void main(String[] args) throws IllegalAccessException, IOException, URISyntaxException {
         // Big initial size for when all name sources are pulled in.
-        List<CharSequence> strings = new ArrayList<CharSequence>(350000);
+        List<CharSequence> strings = new ArrayList<>(350000);
         addHttpHeaderNames(strings);
         addHttpHeaderValues(strings);
         addHttp2HeaderNames(strings);
@@ -118,14 +118,14 @@ public final class HashCollisionTest {
 
     private static Map<Integer, List<CharSequence>> calculateDuplicates(List<CharSequence> strings,
                                                                         Function<CharSequence, Integer> hasher) {
-        Map<Integer, List<CharSequence>> hashResults = new HashMap<Integer, List<CharSequence>>();
-        Set<Integer> duplicateHashCodes = new HashSet<Integer>();
+        Map<Integer, List<CharSequence>> hashResults = new HashMap<>();
+        Set<Integer> duplicateHashCodes = new HashSet<>();
 
         for (CharSequence str : strings) {
             Integer hash = hasher.apply(str);
             List<CharSequence> results = hashResults.get(hash);
             if (results == null) {
-                results = new ArrayList<CharSequence>(1);
+                results = new ArrayList<>(1);
                 hashResults.put(hash, results);
             } else {
                 duplicateHashCodes.add(hash);
@@ -137,9 +137,9 @@ public final class HashCollisionTest {
             return Collections.emptyMap();
         }
         Map<Integer, List<CharSequence>> duplicates =
-                new HashMap<Integer, List<CharSequence>>(duplicateHashCodes.size());
+                new HashMap<>(duplicateHashCodes.size());
         for (Integer duplicateHashCode : duplicateHashCodes) {
-            List<CharSequence> realDups = new ArrayList<CharSequence>(2);
+            List<CharSequence> realDups = new ArrayList<>(2);
             Iterator<CharSequence> itr = hashResults.get(duplicateHashCode).iterator();
             // there should be at least 2 elements in the list ... bcz there may be duplicates
             realDups.add(itr.next());
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTest.java
index fe9fa32601..5238611d39 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTest.java
@@ -61,7 +61,7 @@ public class HpackTest {
             throw new NullPointerException("files");
         }
 
-        ArrayList<Object[]> data = new ArrayList<Object[]>();
+        ArrayList<Object[]> data = new ArrayList<>();
         for (File file : files) {
             data.add(new Object[]{file.getName()});
         }
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java
index 33faa50f62..a4dca23a09 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java
@@ -95,7 +95,7 @@ final class HpackTestCase {
                                 "\nACTUAL:\n" + StringUtil.toHexString(actual));
             }
 
-            List<HpackHeaderField> actualDynamicTable = new ArrayList<HpackHeaderField>();
+            List<HpackHeaderField> actualDynamicTable = new ArrayList<>();
             for (int index = 0; index < hpackEncoder.length(); index++) {
                 actualDynamicTable.add(hpackEncoder.getHeaderField(index));
             }
@@ -123,7 +123,7 @@ final class HpackTestCase {
 
             List<HpackHeaderField> actualHeaders = decode(hpackDecoder, headerBlock.encodedBytes);
 
-            List<HpackHeaderField> expectedHeaders = new ArrayList<HpackHeaderField>();
+            List<HpackHeaderField> expectedHeaders = new ArrayList<>();
             for (HpackHeaderField h : headerBlock.getHeaders()) {
                 expectedHeaders.add(new HpackHeaderField(h.name, h.value));
             }
@@ -134,7 +134,7 @@ final class HpackTestCase {
                                 "\nACTUAL:\n" + actualHeaders);
             }
 
-            List<HpackHeaderField> actualDynamicTable = new ArrayList<HpackHeaderField>();
+            List<HpackHeaderField> actualDynamicTable = new ArrayList<>();
             for (int index = 0; index < hpackDecoder.length(); index++) {
                 actualDynamicTable.add(hpackDecoder.getHeaderField(index));
             }
@@ -212,7 +212,7 @@ final class HpackTestCase {
     private static List<HpackHeaderField> decode(HpackDecoder hpackDecoder, byte[] expected) throws Exception {
         ByteBuf in = Unpooled.wrappedBuffer(expected);
         try {
-            List<HpackHeaderField> headers = new ArrayList<HpackHeaderField>();
+            List<HpackHeaderField> headers = new ArrayList<>();
             TestHeaderListener listener = new TestHeaderListener(headers);
             hpackDecoder.decode(0, in, listener, true);
             return headers;
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
index 25e3c6ceaf..e6699bb5f5 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
@@ -238,9 +238,9 @@ public class Http2ConnectionRoundtripTest {
         final CountDownLatch serverRevHeadersLatch = new CountDownLatch(1);
         final CountDownLatch clientHeadersLatch = new CountDownLatch(1);
         final CountDownLatch clientDataWrite = new CountDownLatch(1);
-        final AtomicReference<Throwable> clientHeadersWriteException = new AtomicReference<Throwable>();
-        final AtomicReference<Throwable> clientHeadersWriteException2 = new AtomicReference<Throwable>();
-        final AtomicReference<Throwable> clientDataWriteException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> clientHeadersWriteException = new AtomicReference<>();
+        final AtomicReference<Throwable> clientHeadersWriteException2 = new AtomicReference<>();
+        final AtomicReference<Throwable> clientDataWriteException = new AtomicReference<>();
 
         final Http2Headers headers = dummyHeaders();
 
@@ -520,7 +520,7 @@ public class Http2ConnectionRoundtripTest {
 
         final CountDownLatch serverGotRstLatch = new CountDownLatch(1);
         final CountDownLatch serverWriteHeadersLatch = new CountDownLatch(1);
-        final AtomicReference<Throwable> serverWriteHeadersCauseRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> serverWriteHeadersCauseRef = new AtomicReference<>();
 
         final Http2Headers headers = dummyHeaders();
         final int streamId = 3;
@@ -907,7 +907,7 @@ public class Http2ConnectionRoundtripTest {
         verify(clientListener).onGoAwayRead(any(ChannelHandlerContext.class), eq(3), eq(NO_ERROR.code()),
                 any(ByteBuf.class));
 
-        final AtomicReference<ChannelFuture> clientWriteAfterGoAwayFutureRef = new AtomicReference<ChannelFuture>();
+        final AtomicReference<ChannelFuture> clientWriteAfterGoAwayFutureRef = new AtomicReference<>();
         final CountDownLatch clientWriteAfterGoAwayLatch = new CountDownLatch(1);
         runInChannel(clientChannel, new Http2Runnable() {
             @Override
@@ -962,7 +962,7 @@ public class Http2ConnectionRoundtripTest {
         setServerGracefulShutdownTime(10000);
 
         final Http2Headers headers = dummyHeaders();
-        final AtomicReference<ChannelFuture> clientWriteAfterGoAwayFutureRef = new AtomicReference<ChannelFuture>();
+        final AtomicReference<ChannelFuture> clientWriteAfterGoAwayFutureRef = new AtomicReference<>();
         final CountDownLatch clientWriteAfterGoAwayLatch = new CountDownLatch(1);
         doAnswer(new Answer<Void>() {
             @Override
@@ -1189,7 +1189,7 @@ public class Http2ConnectionRoundtripTest {
         sb = new ServerBootstrap();
         cb = new Bootstrap();
 
-        final AtomicReference<Http2ConnectionHandler> serverHandlerRef = new AtomicReference<Http2ConnectionHandler>();
+        final AtomicReference<Http2ConnectionHandler> serverHandlerRef = new AtomicReference<>();
         final CountDownLatch serverInitLatch = new CountDownLatch(1);
         sb.group(new LocalEventLoopGroup());
         sb.channel(LocalServerChannel.class);
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameCodecTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameCodecTest.java
index 27d13cf50b..8800368b67 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameCodecTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameCodecTest.java
@@ -570,7 +570,7 @@ public class Http2FrameCodecTest {
         assertNotNull(stream);
         assertFalse(isStreamIdValid(stream.id()));
 
-        final Promise<Void> listenerExecuted = new DefaultPromise<Void>(GlobalEventExecutor.INSTANCE);
+        final Promise<Void> listenerExecuted = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
 
         channel.writeAndFlush(new DefaultHttp2HeadersFrame(new DefaultHttp2Headers(), false).stream(stream))
                .addListener(new ChannelFutureListener() {
@@ -734,7 +734,7 @@ public class Http2FrameCodecTest {
         @SuppressWarnings("unused")
         Http2FrameStream idleStream = frameCodec.newStream();
 
-        final Set<Http2FrameStream> activeStreams = new HashSet<Http2FrameStream>();
+        final Set<Http2FrameStream> activeStreams = new HashSet<>();
         frameCodec.forEachActiveStream(new Http2FrameStreamVisitor() {
             @Override
             public boolean visit(Http2FrameStream stream) {
@@ -745,7 +745,7 @@ public class Http2FrameCodecTest {
 
         assertEquals(2, activeStreams.size());
 
-        Set<Http2FrameStream> expectedStreams = new HashSet<Http2FrameStream>();
+        Set<Http2FrameStream> expectedStreams = new HashSet<>();
         expectedStreams.add(activeInbond);
         expectedStreams.add(activeOutbound);
         assertEquals(expectedStreams, activeStreams);
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
index cf938a1332..dc7348004a 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
@@ -88,7 +88,7 @@ public class Http2FrameRoundtripTest {
 
     private Http2FrameWriter writer;
     private Http2FrameReader reader;
-    private final List<ByteBuf> needReleasing = new LinkedList<ByteBuf>();
+    private final List<ByteBuf> needReleasing = new LinkedList<>();
 
     @Before
     public void setup() throws Exception {
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java
index 7788e6dd64..20d6c4b937 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java
@@ -155,7 +155,7 @@ public class Http2MultiplexCodecTest {
 
     private Http2StreamChannel newInboundStream(int streamId, boolean endStream,
                                                 AtomicInteger maxReads, final ChannelHandler childHandler) {
-        final AtomicReference<Http2StreamChannel> streamChannelRef = new AtomicReference<Http2StreamChannel>();
+        final AtomicReference<Http2StreamChannel> streamChannelRef = new AtomicReference<>();
         childChannelInitializer.maxReads = maxReads;
         childChannelInitializer.handler = new ChannelInboundHandlerAdapter() {
             @Override
@@ -595,7 +595,7 @@ public class Http2MultiplexCodecTest {
 
     @Test
     public void channelClosedWhenWriteFutureFails() {
-        final Queue<ChannelPromise> writePromises = new ArrayDeque<ChannelPromise>();
+        final Queue<ChannelPromise> writePromises = new ArrayDeque<>();
 
         LastInboundHandler inboundHandler = new LastInboundHandler();
         Http2StreamChannel childChannel = newInboundStream(3, false, inboundHandler);
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2StreamFrameToHttpObjectCodecTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2StreamFrameToHttpObjectCodecTest.java
index 393a4060ef..e04c6db56d 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2StreamFrameToHttpObjectCodecTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2StreamFrameToHttpObjectCodecTest.java
@@ -446,7 +446,7 @@ public class Http2StreamFrameToHttpObjectCodecTest {
 
     @Test
     public void testEncodeHttpsSchemeWhenSslHandlerExists() throws Exception {
-        final Queue<Http2StreamFrame> frames = new ConcurrentLinkedQueue<Http2StreamFrame>();
+        final Queue<Http2StreamFrame> frames = new ConcurrentLinkedQueue<>();
 
         final SslContext ctx = SslContextBuilder.forClient().sslProvider(SslProvider.JDK).build();
         EmbeddedChannel ch = new EmbeddedChannel(ctx.newHandler(ByteBufAllocator.DEFAULT),
@@ -875,7 +875,7 @@ public class Http2StreamFrameToHttpObjectCodecTest {
 
     @Test
     public void testIsSharableBetweenChannels() throws Exception {
-        final Queue<Http2StreamFrame> frames = new ConcurrentLinkedQueue<Http2StreamFrame>();
+        final Queue<Http2StreamFrame> frames = new ConcurrentLinkedQueue<>();
         final ChannelHandler sharedHandler = new Http2StreamFrameToHttpObjectCodec(false);
 
         final SslContext ctx = SslContextBuilder.forClient().sslProvider(SslProvider.JDK).build();
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2TestUtil.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2TestUtil.java
index f660381237..75ca0f4893 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2TestUtil.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2TestUtil.java
@@ -572,7 +572,7 @@ public final class Http2TestUtil {
             }
         };
 
-        final ConcurrentLinkedQueue<ByteBuf> buffers = new ConcurrentLinkedQueue<ByteBuf>();
+        final ConcurrentLinkedQueue<ByteBuf> buffers = new ConcurrentLinkedQueue<>();
 
         Http2FrameWriter frameWriter = Mockito.mock(Http2FrameWriter.class);
         doAnswer(new Answer() {
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerTest.java
index b5925df741..c9eb9eca6d 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerTest.java
@@ -335,7 +335,7 @@ public class HttpToHttp2ConnectionHandlerTest {
     @Test
     public void testRequestWithBody() throws Exception {
         final String text = "foooooogoooo";
-        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<String>());
+        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<>());
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock in) throws Throwable {
@@ -378,7 +378,7 @@ public class HttpToHttp2ConnectionHandlerTest {
     @Test
     public void testRequestWithBodyAndTrailingHeaders() throws Exception {
         final String text = "foooooogoooo";
-        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<String>());
+        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<>());
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock in) throws Throwable {
@@ -430,7 +430,7 @@ public class HttpToHttp2ConnectionHandlerTest {
     public void testChunkedRequestWithBodyAndTrailingHeaders() throws Exception {
         final String text = "foooooo";
         final String text2 = "goooo";
-        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<String>());
+        final List<String> receivedBuffers = Collections.synchronizedList(new ArrayList<>());
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock in) throws Throwable {
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java
index 38f400af14..a3278c9b80 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java
@@ -34,7 +34,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
  * Channel handler that allows to easily access inbound messages.
  */
 public class LastInboundHandler extends ChannelDuplexHandler {
-    private final List<Object> queue = new ArrayList<Object>();
+    private final List<Object> queue = new ArrayList<>();
     private final Consumer<ChannelHandlerContext> channelReadCompleteConsumer;
     private Throwable lastException;
     private ChannelHandlerContext ctx;
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/StreamBufferingEncoderTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/StreamBufferingEncoderTest.java
index 15dc168b4d..6a42e37d45 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/StreamBufferingEncoderTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/StreamBufferingEncoderTest.java
@@ -240,7 +240,7 @@ public class StreamBufferingEncoderTest {
         setMaxConcurrentStreams(5);
 
         int streamId = 3;
-        List<ChannelFuture> futures = new ArrayList<ChannelFuture>();
+        List<ChannelFuture> futures = new ArrayList<>();
         for (int i = 0; i < 9; i++) {
             futures.add(encoderWriteHeaders(streamId, newPromise()));
             streamId += 2;
diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java
index 802dc196f9..735b3542ca 100644
--- a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java
+++ b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java
@@ -34,7 +34,7 @@ public enum MqttConnectReturnCode {
     private static final Map<Byte, MqttConnectReturnCode> VALUE_TO_CODE_MAP;
 
     static {
-        final Map<Byte, MqttConnectReturnCode> valueMap = new HashMap<Byte, MqttConnectReturnCode>();
+        final Map<Byte, MqttConnectReturnCode> valueMap = new HashMap<>();
         for (MqttConnectReturnCode code: values()) {
             valueMap.put(code.byteValue, code);
         }
diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java
index e93d34bde1..db1234ae1c 100644
--- a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java
+++ b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java
@@ -201,9 +201,9 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
             case PINGRESP:
             case DISCONNECT:
                 // Empty variable header
-                return new Result<Object>(null, 0);
+                return new Result<>(null, 0);
         }
-        return new Result<Object>(null, 0); //should never reach here
+        return new Result<>(null, 0); //should never reach here
     }
 
     private static Result<MqttConnectVariableHeader> decodeConnectionVariableHeader(ByteBuf buffer) {
@@ -247,7 +247,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
                 willFlag,
                 cleanSession,
                 keepAlive.value);
-        return new Result<MqttConnectVariableHeader>(mqttConnectVariableHeader, numberOfBytesConsumed);
+        return new Result<>(mqttConnectVariableHeader, numberOfBytesConsumed);
     }
 
     private static Result<MqttConnAckVariableHeader> decodeConnAckVariableHeader(ByteBuf buffer) {
@@ -256,12 +256,12 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         final int numberOfBytesConsumed = 2;
         final MqttConnAckVariableHeader mqttConnAckVariableHeader =
                 new MqttConnAckVariableHeader(MqttConnectReturnCode.valueOf(returnCode), sessionPresent);
-        return new Result<MqttConnAckVariableHeader>(mqttConnAckVariableHeader, numberOfBytesConsumed);
+        return new Result<>(mqttConnAckVariableHeader, numberOfBytesConsumed);
     }
 
     private static Result<MqttMessageIdVariableHeader> decodeMessageIdVariableHeader(ByteBuf buffer) {
         final Result<Integer> messageId = decodeMessageId(buffer);
-        return new Result<MqttMessageIdVariableHeader>(
+        return new Result<>(
                 MqttMessageIdVariableHeader.from(messageId.value),
                 messageId.numberOfBytesConsumed);
     }
@@ -283,7 +283,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         }
         final MqttPublishVariableHeader mqttPublishVariableHeader =
                 new MqttPublishVariableHeader(decodedTopic.value, messageId);
-        return new Result<MqttPublishVariableHeader>(mqttPublishVariableHeader, numberOfBytesConsumed);
+        return new Result<>(mqttPublishVariableHeader, numberOfBytesConsumed);
     }
 
     private static Result<Integer> decodeMessageId(ByteBuf buffer) {
@@ -326,7 +326,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
 
             default:
                 // unknown payload , no byte consumed
-                return new Result<Object>(null, 0);
+                return new Result<>(null, 0);
         }
     }
 
@@ -368,13 +368,13 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
                         decodedWillMessage != null ? decodedWillMessage.value : null,
                         decodedUserName != null ? decodedUserName.value : null,
                         decodedPassword != null ? decodedPassword.value : null);
-        return new Result<MqttConnectPayload>(mqttConnectPayload, numberOfBytesConsumed);
+        return new Result<>(mqttConnectPayload, numberOfBytesConsumed);
     }
 
     private static Result<MqttSubscribePayload> decodeSubscribePayload(
             ByteBuf buffer,
             int bytesRemainingInVariablePart) {
-        final List<MqttTopicSubscription> subscribeTopics = new ArrayList<MqttTopicSubscription>();
+        final List<MqttTopicSubscription> subscribeTopics = new ArrayList<>();
         int numberOfBytesConsumed = 0;
         while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
             final Result<String> decodedTopicName = decodeString(buffer);
@@ -383,13 +383,13 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
             numberOfBytesConsumed++;
             subscribeTopics.add(new MqttTopicSubscription(decodedTopicName.value, MqttQoS.valueOf(qos)));
         }
-        return new Result<MqttSubscribePayload>(new MqttSubscribePayload(subscribeTopics), numberOfBytesConsumed);
+        return new Result<>(new MqttSubscribePayload(subscribeTopics), numberOfBytesConsumed);
     }
 
     private static Result<MqttSubAckPayload> decodeSubackPayload(
             ByteBuf buffer,
             int bytesRemainingInVariablePart) {
-        final List<Integer> grantedQos = new ArrayList<Integer>();
+        final List<Integer> grantedQos = new ArrayList<>();
         int numberOfBytesConsumed = 0;
         while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
             int qos = buffer.readUnsignedByte();
@@ -399,27 +399,27 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
             numberOfBytesConsumed++;
             grantedQos.add(qos);
         }
-        return new Result<MqttSubAckPayload>(new MqttSubAckPayload(grantedQos), numberOfBytesConsumed);
+        return new Result<>(new MqttSubAckPayload(grantedQos), numberOfBytesConsumed);
     }
 
     private static Result<MqttUnsubscribePayload> decodeUnsubscribePayload(
             ByteBuf buffer,
             int bytesRemainingInVariablePart) {
-        final List<String> unsubscribeTopics = new ArrayList<String>();
+        final List<String> unsubscribeTopics = new ArrayList<>();
         int numberOfBytesConsumed = 0;
         while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
             final Result<String> decodedTopicName = decodeString(buffer);
             numberOfBytesConsumed += decodedTopicName.numberOfBytesConsumed;
             unsubscribeTopics.add(decodedTopicName.value);
         }
-        return new Result<MqttUnsubscribePayload>(
+        return new Result<>(
                 new MqttUnsubscribePayload(unsubscribeTopics),
                 numberOfBytesConsumed);
     }
 
     private static Result<ByteBuf> decodePublishPayload(ByteBuf buffer, int bytesRemainingInVariablePart) {
         ByteBuf b = buffer.readRetainedSlice(bytesRemainingInVariablePart);
-        return new Result<ByteBuf>(b, bytesRemainingInVariablePart);
+        return new Result<>(b, bytesRemainingInVariablePart);
     }
 
     private static Result<String> decodeString(ByteBuf buffer) {
@@ -433,12 +433,12 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         if (size < minBytes || size > maxBytes) {
             buffer.skipBytes(size);
             numberOfBytesConsumed += size;
-            return new Result<String>(null, numberOfBytesConsumed);
+            return new Result<>(null, numberOfBytesConsumed);
         }
         String s = buffer.toString(buffer.readerIndex(), size, CharsetUtil.UTF_8);
         buffer.skipBytes(size);
         numberOfBytesConsumed += size;
-        return new Result<String>(s, numberOfBytesConsumed);
+        return new Result<>(s, numberOfBytesConsumed);
     }
 
     private static Result<byte[]> decodeByteArray(ByteBuf buffer) {
@@ -446,7 +446,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         int size = decodedSize.value;
         byte[] bytes = new byte[size];
         buffer.readBytes(bytes);
-        return new Result<byte[]>(bytes, decodedSize.numberOfBytesConsumed + size);
+        return new Result<>(bytes, decodedSize.numberOfBytesConsumed + size);
     }
 
     private static Result<Integer> decodeMsbLsb(ByteBuf buffer) {
@@ -461,7 +461,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         if (result < min || result > max) {
             result = -1;
         }
-        return new Result<Integer>(result, numberOfBytesConsumed);
+        return new Result<>(result, numberOfBytesConsumed);
     }
 
     private static final class Result<T> {
diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java
index 2bb0eaa3eb..01b9bb5304 100644
--- a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java
+++ b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java
@@ -200,7 +200,7 @@ public final class MqttMessageBuilders {
 
         public SubscribeBuilder addSubscription(MqttQoS qos, String topic) {
             if (subscriptions == null) {
-                subscriptions = new ArrayList<MqttTopicSubscription>(5);
+                subscriptions = new ArrayList<>(5);
             }
             subscriptions.add(new MqttTopicSubscription(topic, qos));
             return this;
@@ -230,7 +230,7 @@ public final class MqttMessageBuilders {
 
         public UnsubscribeBuilder addTopicFilter(String topic) {
             if (topicFilters == null) {
-                topicFilters = new ArrayList<String>(5);
+                topicFilters = new ArrayList<>(5);
             }
             topicFilters.add(topic);
             return this;
diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttSubAckPayload.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttSubAckPayload.java
index 0e8c909ba4..6b658f808e 100644
--- a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttSubAckPayload.java
+++ b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttSubAckPayload.java
@@ -34,7 +34,7 @@ public class MqttSubAckPayload {
             throw new NullPointerException("grantedQoSLevels");
         }
 
-        List<Integer> list = new ArrayList<Integer>(grantedQoSLevels.length);
+        List<Integer> list = new ArrayList<>(grantedQoSLevels.length);
         for (int v: grantedQoSLevels) {
             list.add(v);
         }
@@ -45,7 +45,7 @@ public class MqttSubAckPayload {
         if (grantedQoSLevels == null) {
             throw new NullPointerException("grantedQoSLevels");
         }
-        List<Integer> list = new ArrayList<Integer>();
+        List<Integer> list = new ArrayList<>();
         for (Integer v: grantedQoSLevels) {
             if (v == null) {
                 break;
diff --git a/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java b/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java
index 927334cb1d..db6fbcf5b6 100644
--- a/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java
+++ b/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java
@@ -74,7 +74,7 @@ public class MqttCodecTest {
         final MqttConnectMessage message = createConnectMessage(MqttVersion.MQTT_3_1);
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -91,7 +91,7 @@ public class MqttCodecTest {
         final MqttConnectMessage message = createConnectMessage(MqttVersion.MQTT_3_1_1);
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -110,7 +110,7 @@ public class MqttCodecTest {
         try {
             // Set the reserved flag in the CONNECT Packet to 1
             byteBuf.setByte(9, byteBuf.getByte(9) | 0x1);
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoder.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -141,7 +141,7 @@ public class MqttCodecTest {
         final MqttConnAckMessage message = createConnAckMessage();
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -156,7 +156,7 @@ public class MqttCodecTest {
         final MqttPublishMessage message = createPublishMessage();
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -192,7 +192,7 @@ public class MqttCodecTest {
         final MqttSubscribeMessage message = createSubscribeMessage();
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -208,7 +208,7 @@ public class MqttCodecTest {
         final MqttSubAckMessage message = createSubAckMessage();
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -230,7 +230,7 @@ public class MqttCodecTest {
 
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        List<Object> out = new LinkedList<Object>();
+        List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -248,7 +248,7 @@ public class MqttCodecTest {
         final MqttUnsubscribeMessage message = createUnsubscribeMessage();
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -287,7 +287,7 @@ public class MqttCodecTest {
         try {
             // setting an invalid message type (15, reserved and forbidden by MQTT 3.1.1 spec)
             byteBuf.setByte(0, 0xF0);
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoder.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -308,7 +308,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -330,7 +330,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -352,7 +352,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -371,7 +371,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -393,7 +393,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -414,7 +414,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -435,7 +435,7 @@ public class MqttCodecTest {
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
         try {
-            final List<Object> out = new LinkedList<Object>();
+            final List<Object> out = new LinkedList<>();
             mqttDecoderLimitedMessageSize.decode(ctx, byteBuf, out);
 
             assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -454,7 +454,7 @@ public class MqttCodecTest {
         MqttMessage message = createMessageWithFixedHeader(messageType);
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -469,7 +469,7 @@ public class MqttCodecTest {
 
         ByteBuf byteBuf = MqttEncoder.doEncode(ALLOCATOR, message);
 
-        final List<Object> out = new LinkedList<Object>();
+        final List<Object> out = new LinkedList<>();
         mqttDecoder.decode(ctx, byteBuf, out);
 
         assertEquals("Expected one object but got " + out.size(), 1, out.size());
@@ -541,7 +541,7 @@ public class MqttCodecTest {
                 new MqttFixedHeader(MqttMessageType.SUBSCRIBE, false, MqttQoS.AT_LEAST_ONCE, true, 0);
         MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(12345);
 
-        List<MqttTopicSubscription> topicSubscriptions = new LinkedList<MqttTopicSubscription>();
+        List<MqttTopicSubscription> topicSubscriptions = new LinkedList<>();
         topicSubscriptions.add(new MqttTopicSubscription("/abc", MqttQoS.AT_LEAST_ONCE));
         topicSubscriptions.add(new MqttTopicSubscription("/def", MqttQoS.AT_LEAST_ONCE));
         topicSubscriptions.add(new MqttTopicSubscription("/xyz", MqttQoS.EXACTLY_ONCE));
@@ -563,7 +563,7 @@ public class MqttCodecTest {
                 new MqttFixedHeader(MqttMessageType.UNSUBSCRIBE, false, MqttQoS.AT_LEAST_ONCE, true, 0);
         MqttMessageIdVariableHeader mqttMessageIdVariableHeader = MqttMessageIdVariableHeader.from(12345);
 
-        List<String> topics = new LinkedList<String>();
+        List<String> topics = new LinkedList<>();
         topics.add("/abc");
         topics.add("/def");
         topics.add("/xyz");
diff --git a/codec-redis/src/main/java/io/netty/handler/codec/redis/FixedRedisMessagePool.java b/codec-redis/src/main/java/io/netty/handler/codec/redis/FixedRedisMessagePool.java
index 0508f2e3dc..e1fe69a3fd 100644
--- a/codec-redis/src/main/java/io/netty/handler/codec/redis/FixedRedisMessagePool.java
+++ b/codec-redis/src/main/java/io/netty/handler/codec/redis/FixedRedisMessagePool.java
@@ -83,8 +83,8 @@ public final class FixedRedisMessagePool implements RedisMessagePool {
      * Creates a {@link FixedRedisMessagePool} instance.
      */
     private FixedRedisMessagePool() {
-        byteBufToSimpleStrings = new HashMap<ByteBuf, SimpleStringRedisMessage>(DEFAULT_SIMPLE_STRINGS.length, 1.0f);
-        stringToSimpleStrings = new HashMap<String, SimpleStringRedisMessage>(DEFAULT_SIMPLE_STRINGS.length, 1.0f);
+        byteBufToSimpleStrings = new HashMap<>(DEFAULT_SIMPLE_STRINGS.length, 1.0f);
+        stringToSimpleStrings = new HashMap<>(DEFAULT_SIMPLE_STRINGS.length, 1.0f);
         for (String message : DEFAULT_SIMPLE_STRINGS) {
             ByteBuf key = Unpooled.unmodifiableBuffer(
                     Unpooled.unreleasableBuffer(Unpooled.wrappedBuffer(message.getBytes(CharsetUtil.UTF_8))));
@@ -93,8 +93,8 @@ public final class FixedRedisMessagePool implements RedisMessagePool {
             stringToSimpleStrings.put(message, cached);
         }
 
-        byteBufToErrors = new HashMap<ByteBuf, ErrorRedisMessage>(DEFAULT_ERRORS.length, 1.0f);
-        stringToErrors = new HashMap<String, ErrorRedisMessage>(DEFAULT_ERRORS.length, 1.0f);
+        byteBufToErrors = new HashMap<>(DEFAULT_ERRORS.length, 1.0f);
+        stringToErrors = new HashMap<>(DEFAULT_ERRORS.length, 1.0f);
         for (String message : DEFAULT_ERRORS) {
             ByteBuf key = Unpooled.unmodifiableBuffer(
                     Unpooled.unreleasableBuffer(Unpooled.wrappedBuffer(message.getBytes(CharsetUtil.UTF_8))));
@@ -103,7 +103,7 @@ public final class FixedRedisMessagePool implements RedisMessagePool {
             stringToErrors.put(message, cached);
         }
 
-        byteBufToIntegers = new HashMap<ByteBuf, IntegerRedisMessage>(SIZE_CACHED_INTEGER_NUMBER, 1.0f);
+        byteBufToIntegers = new HashMap<>(SIZE_CACHED_INTEGER_NUMBER, 1.0f);
         longToIntegers = new LongObjectHashMap<IntegerRedisMessage>(SIZE_CACHED_INTEGER_NUMBER, 1.0f);
         longToByteBufs = new LongObjectHashMap<byte[]>(SIZE_CACHED_INTEGER_NUMBER, 1.0f);
         for (long value = MIN_CACHED_INTEGER_NUMBER; value < MAX_CACHED_INTEGER_NUMBER; value++) {
diff --git a/codec-redis/src/main/java/io/netty/handler/codec/redis/RedisArrayAggregator.java b/codec-redis/src/main/java/io/netty/handler/codec/redis/RedisArrayAggregator.java
index d189ab2ea9..513a0a1bdd 100644
--- a/codec-redis/src/main/java/io/netty/handler/codec/redis/RedisArrayAggregator.java
+++ b/codec-redis/src/main/java/io/netty/handler/codec/redis/RedisArrayAggregator.java
@@ -33,7 +33,7 @@ import java.util.List;
 @UnstableApi
 public final class RedisArrayAggregator extends MessageToMessageDecoder<RedisMessage> {
 
-    private final Deque<AggregateState> depths = new ArrayDeque<AggregateState>(4);
+    private final Deque<AggregateState> depths = new ArrayDeque<>(4);
 
     @Override
     protected void decode(ChannelHandlerContext ctx, RedisMessage msg, List<Object> out) throws Exception {
@@ -87,7 +87,7 @@ public final class RedisArrayAggregator extends MessageToMessageDecoder<RedisMes
         private final List<RedisMessage> children;
         AggregateState(int length) {
             this.length = length;
-            this.children = new ArrayList<RedisMessage>(length);
+            this.children = new ArrayList<>(length);
         }
     }
 }
diff --git a/codec-redis/src/test/java/io/netty/handler/codec/redis/RedisEncoderTest.java b/codec-redis/src/test/java/io/netty/handler/codec/redis/RedisEncoderTest.java
index 926b62116a..9e4f88d26d 100644
--- a/codec-redis/src/test/java/io/netty/handler/codec/redis/RedisEncoderTest.java
+++ b/codec-redis/src/test/java/io/netty/handler/codec/redis/RedisEncoderTest.java
@@ -127,7 +127,7 @@ public class RedisEncoderTest {
 
     @Test
     public void shouldEncodeSimpleArray() {
-        List<RedisMessage> children = new ArrayList<RedisMessage>();
+        List<RedisMessage> children = new ArrayList<>();
         children.add(new FullBulkStringRedisMessage(byteBufOf("foo").retain()));
         children.add(new FullBulkStringRedisMessage(byteBufOf("bar").retain()));
         RedisMessage msg = new ArrayRedisMessage(children);
@@ -166,10 +166,10 @@ public class RedisEncoderTest {
 
     @Test
     public void shouldEncodeNestedArray() {
-        List<RedisMessage> grandChildren = new ArrayList<RedisMessage>();
+        List<RedisMessage> grandChildren = new ArrayList<>();
         grandChildren.add(new FullBulkStringRedisMessage(byteBufOf("bar")));
         grandChildren.add(new IntegerRedisMessage(-1234L));
-        List<RedisMessage> children = new ArrayList<RedisMessage>();
+        List<RedisMessage> children = new ArrayList<>();
         children.add(new SimpleStringRedisMessage("foo"));
         children.add(new ArrayRedisMessage(grandChildren));
         RedisMessage msg = new ArrayRedisMessage(children);
diff --git a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpCommand.java b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpCommand.java
index 63ba3f5847..da1d9b5ace 100644
--- a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpCommand.java
+++ b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpCommand.java
@@ -41,7 +41,7 @@ public final class SmtpCommand {
     public static final SmtpCommand HELP = new SmtpCommand(AsciiString.cached("HELP"));
     public static final SmtpCommand QUIT = new SmtpCommand(AsciiString.cached("QUIT"));
 
-    private static final Map<String, SmtpCommand> COMMANDS = new HashMap<String, SmtpCommand>();
+    private static final Map<String, SmtpCommand> COMMANDS = new HashMap<>();
     static {
         COMMANDS.put(EHLO.name().toString(), EHLO);
         COMMANDS.put(HELO.name().toString(), HELO);
diff --git a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java
index 2c42c5d69e..cd217f34d8 100644
--- a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java
+++ b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java
@@ -92,7 +92,7 @@ public final class SmtpRequests {
             return new DefaultSmtpRequest(SmtpCommand.MAIL,
                                           sender != null ? "FROM:<" + sender + '>' : FROM_NULL_SENDER);
         } else {
-            List<CharSequence> params = new ArrayList<CharSequence>(mailParameters.length + 1);
+            List<CharSequence> params = new ArrayList<>(mailParameters.length + 1);
             params.add(sender != null? "FROM:<" + sender + '>' : FROM_NULL_SENDER);
             for (CharSequence param : mailParameters) {
                 params.add(param);
@@ -109,7 +109,7 @@ public final class SmtpRequests {
         if (rcptParameters == null || rcptParameters.length == 0) {
             return new DefaultSmtpRequest(SmtpCommand.RCPT, "TO:<" + recipient + '>');
         } else {
-            List<CharSequence> params = new ArrayList<CharSequence>(rcptParameters.length + 1);
+            List<CharSequence> params = new ArrayList<>(rcptParameters.length + 1);
             params.add("TO:<" + recipient + '>');
             for (CharSequence param : rcptParameters) {
                 params.add(param);
diff --git a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpResponseDecoder.java b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpResponseDecoder.java
index eadea32654..96c75636dd 100644
--- a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpResponseDecoder.java
+++ b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpResponseDecoder.java
@@ -82,7 +82,7 @@ public final class SmtpResponseDecoder extends LineBasedFrameDecoder {
                     if (details == null) {
                         // Using initial capacity as it is very unlikely that we will receive a multi-line response
                         // with more then 3 lines.
-                        this.details = details = new ArrayList<CharSequence>(4);
+                        this.details = details = new ArrayList<>(4);
                     }
                     details.add(detail);
                 }
diff --git a/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
index e866d876cc..aeb8176a8f 100644
--- a/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
+++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
@@ -48,7 +48,7 @@ public class SocksInitRequestDecoder extends ReplayingDecoder<State> {
                 final byte authSchemeNum = byteBuf.readByte();
                 final List<SocksAuthScheme> authSchemes;
                 if (authSchemeNum > 0) {
-                    authSchemes = new ArrayList<SocksAuthScheme>(authSchemeNum);
+                    authSchemes = new ArrayList<>(authSchemeNum);
                     for (int i = 0; i < authSchemeNum; i++) {
                         authSchemes.add(SocksAuthScheme.valueOf(byteBuf.readByte()));
                     }
diff --git a/codec-socks/src/main/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java
index 0610e04993..3c7cf3eee9 100755
--- a/codec-socks/src/main/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java
+++ b/codec-socks/src/main/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java
@@ -34,7 +34,7 @@ public class DefaultSocks5InitialRequest extends AbstractSocks5Message implement
             throw new NullPointerException("authMethods");
         }
 
-        List<Socks5AuthMethod> list = new ArrayList<Socks5AuthMethod>(authMethods.length);
+        List<Socks5AuthMethod> list = new ArrayList<>(authMethods.length);
         for (Socks5AuthMethod m: authMethods) {
             if (m == null) {
                 break;
@@ -54,7 +54,7 @@ public class DefaultSocks5InitialRequest extends AbstractSocks5Message implement
             throw new NullPointerException("authSchemes");
         }
 
-        List<Socks5AuthMethod> list = new ArrayList<Socks5AuthMethod>();
+        List<Socks5AuthMethod> list = new ArrayList<>();
         for (Socks5AuthMethod m: authMethods) {
             if (m == null) {
                 break;
diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java
index 885e814a09..138bd7c1a2 100644
--- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java
+++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java
@@ -28,7 +28,7 @@ public abstract class XmlElement {
     private final String namespace;
     private final String prefix;
 
-    private final List<XmlNamespace> namespaces = new LinkedList<XmlNamespace>();
+    private final List<XmlNamespace> namespaces = new LinkedList<>();
 
     protected XmlElement(String name, String namespace, String prefix) {
         this.name = name;
diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java
index 17d603eb4c..12479dddd7 100644
--- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java
+++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java
@@ -23,7 +23,7 @@ import java.util.List;
  */
 public class XmlElementStart extends XmlElement {
 
-    private final List<XmlAttribute> attributes = new LinkedList<XmlAttribute>();
+    private final List<XmlAttribute> attributes = new LinkedList<>();
 
     public XmlElementStart(String name, String namespace, String prefix) {
         super(name, namespace, prefix);
diff --git a/codec/src/main/java/io/netty/handler/codec/DefaultHeaders.java b/codec/src/main/java/io/netty/handler/codec/DefaultHeaders.java
index df7266d9e8..3fdc325bdf 100644
--- a/codec/src/main/java/io/netty/handler/codec/DefaultHeaders.java
+++ b/codec/src/main/java/io/netty/handler/codec/DefaultHeaders.java
@@ -110,7 +110,7 @@ public class DefaultHeaders<K, V, T extends Headers<K, V, T>> implements Headers
         // than the length of this array, and we want the mask to be > 0.
         entries = new DefaultHeaders.HeaderEntry[findNextPositivePowerOfTwo(max(2, min(arraySizeHint, 128)))];
         hashMask = (byte) (entries.length - 1);
-        head = new HeaderEntry<K, V>();
+        head = new HeaderEntry<>();
     }
 
     @Override
@@ -160,7 +160,7 @@ public class DefaultHeaders<K, V, T extends Headers<K, V, T>> implements Headers
     public List<V> getAll(K name) {
         checkNotNull(name, "name");
 
-        LinkedList<V> values = new LinkedList<V>();
+        LinkedList<V> values = new LinkedList<>();
 
         int h = hashingStrategy.hashCode(name);
         int i = index(h);
@@ -281,7 +281,7 @@ public class DefaultHeaders<K, V, T extends Headers<K, V, T>> implements Headers
         if (isEmpty()) {
             return Collections.emptySet();
         }
-        Set<K> names = new LinkedHashSet<K>(size());
+        Set<K> names = new LinkedHashSet<>(size());
         HeaderEntry<K, V> e = head.after;
         while (e != head) {
             names.add(e.getKey());
@@ -958,7 +958,7 @@ public class DefaultHeaders<K, V, T extends Headers<K, V, T>> implements Headers
     }
 
     protected HeaderEntry<K, V> newHeaderEntry(int h, K name, V value, HeaderEntry<K, V> next) {
-        return new HeaderEntry<K, V>(h, name, value, next, head);
+        return new HeaderEntry<>(h, name, value, next, head);
     }
 
     protected ValueConverter<V> valueConverter() {
@@ -1021,7 +1021,7 @@ public class DefaultHeaders<K, V, T extends Headers<K, V, T>> implements Headers
      * Returns a deep copy of this instance.
      */
     public DefaultHeaders<K, V, T> copy() {
-        DefaultHeaders<K, V, T> copy = new DefaultHeaders<K, V, T>(
+        DefaultHeaders<K, V, T> copy = new DefaultHeaders<>(
                 hashingStrategy, valueConverter, nameValidator, entries.length);
         copy.addImpl(this);
         return copy;
diff --git a/codec/src/main/java/io/netty/handler/codec/HeadersUtils.java b/codec/src/main/java/io/netty/handler/codec/HeadersUtils.java
index 0123cf2e43..385ba157bd 100644
--- a/codec/src/main/java/io/netty/handler/codec/HeadersUtils.java
+++ b/codec/src/main/java/io/netty/handler/codec/HeadersUtils.java
@@ -232,7 +232,7 @@ public final class HeadersUtils {
 
         @Override
         public Iterator<String> iterator() {
-            return new StringIterator<T>(allNames.iterator());
+            return new StringIterator<>(allNames.iterator());
         }
 
         @Override
diff --git a/codec/src/main/java/io/netty/handler/codec/ProtocolDetectionResult.java b/codec/src/main/java/io/netty/handler/codec/ProtocolDetectionResult.java
index d4b435939c..f06a331a9a 100644
--- a/codec/src/main/java/io/netty/handler/codec/ProtocolDetectionResult.java
+++ b/codec/src/main/java/io/netty/handler/codec/ProtocolDetectionResult.java
@@ -55,7 +55,7 @@ public final class ProtocolDetectionResult<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T> ProtocolDetectionResult<T> detected(T protocol) {
-        return new ProtocolDetectionResult<T>(ProtocolDetectionState.DETECTED, checkNotNull(protocol, "protocol"));
+        return new ProtocolDetectionResult<>(ProtocolDetectionState.DETECTED, checkNotNull(protocol, "protocol"));
     }
 
     private ProtocolDetectionResult(ProtocolDetectionState state, T result) {
diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java b/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java
index ce13601491..c0a9fb3bc5 100644
--- a/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java
+++ b/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java
@@ -28,7 +28,7 @@ import org.jboss.marshalling.MarshallingConfiguration;
  * many small {@link Object}'s and your actual Thread count is not to big
  */
 public class ThreadLocalMarshallerProvider implements MarshallerProvider {
-    private final FastThreadLocal<Marshaller> marshallers = new FastThreadLocal<Marshaller>();
+    private final FastThreadLocal<Marshaller> marshallers = new FastThreadLocal<>();
 
     private final MarshallerFactory factory;
     private final MarshallingConfiguration config;
diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java b/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
index 080d48921a..6575507a6d 100644
--- a/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
+++ b/codec/src/main/java/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
@@ -28,7 +28,7 @@ import org.jboss.marshalling.Unmarshaller;
  * many small {@link Object}'s.
  */
 public class ThreadLocalUnmarshallerProvider implements UnmarshallerProvider {
-    private final FastThreadLocal<Unmarshaller> unmarshallers = new FastThreadLocal<Unmarshaller>();
+    private final FastThreadLocal<Unmarshaller> unmarshallers = new FastThreadLocal<>();
 
     private final MarshallerFactory factory;
     private final MarshallingConfiguration config;
diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
index 32250ada80..0f65af4fce 100644
--- a/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
+++ b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
@@ -41,7 +41,7 @@ public final class ClassResolvers {
     public static ClassResolver weakCachingResolver(ClassLoader classLoader) {
         return new CachingClassResolver(
                 new ClassLoaderClassResolver(defaultClassLoader(classLoader)),
-                new WeakReferenceMap<String, Class<?>>(new HashMap<String, Reference<Class<?>>>()));
+                new WeakReferenceMap<>(new HashMap<>()));
     }
 
     /**
@@ -54,7 +54,7 @@ public final class ClassResolvers {
     public static ClassResolver softCachingResolver(ClassLoader classLoader) {
         return new CachingClassResolver(
                 new ClassLoaderClassResolver(defaultClassLoader(classLoader)),
-                new SoftReferenceMap<String, Class<?>>(new HashMap<String, Reference<Class<?>>>()));
+                new SoftReferenceMap<>(new HashMap<>()));
     }
 
     /**
@@ -67,7 +67,7 @@ public final class ClassResolvers {
     public static ClassResolver weakCachingConcurrentResolver(ClassLoader classLoader) {
         return new CachingClassResolver(
                 new ClassLoaderClassResolver(defaultClassLoader(classLoader)),
-                new WeakReferenceMap<String, Class<?>>(
+                new WeakReferenceMap<>(
                         PlatformDependent.<String, Reference<Class<?>>>newConcurrentHashMap()));
     }
 
@@ -81,7 +81,7 @@ public final class ClassResolvers {
     public static ClassResolver softCachingConcurrentResolver(ClassLoader classLoader) {
         return new CachingClassResolver(
                 new ClassLoaderClassResolver(defaultClassLoader(classLoader)),
-                new SoftReferenceMap<String, Class<?>>(
+                new SoftReferenceMap<>(
                         PlatformDependent.<String, Reference<Class<?>>>newConcurrentHashMap()));
     }
 
diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
index dcc8fe5af7..c0ac4fcd68 100644
--- a/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
+++ b/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
@@ -27,7 +27,7 @@ final class SoftReferenceMap<K, V> extends ReferenceMap<K, V> {
 
     @Override
     Reference<V> fold(V value) {
-        return new SoftReference<V>(value);
+        return new SoftReference<>(value);
     }
 
 }
diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
index 00e720fbcc..52a213044e 100644
--- a/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
+++ b/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
@@ -27,7 +27,7 @@ final class WeakReferenceMap<K, V> extends ReferenceMap<K, V> {
 
     @Override
     Reference<V> fold(V value) {
-        return new WeakReference<V>(value);
+        return new WeakReference<>(value);
     }
 
 }
diff --git a/codec/src/test/java/io/netty/handler/codec/ByteToMessageDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/ByteToMessageDecoderTest.java
index 93dd2218ac..f6982fcafe 100644
--- a/codec/src/test/java/io/netty/handler/codec/ByteToMessageDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/ByteToMessageDecoderTest.java
@@ -159,7 +159,7 @@ public class ByteToMessageDecoderTest {
 
     @Test
     public void testFireChannelReadCompleteOnInactive() throws InterruptedException {
-        final BlockingQueue<Integer> queue = new LinkedBlockingDeque<Integer>();
+        final BlockingQueue<Integer> queue = new LinkedBlockingDeque<>();
         final ByteBuf buf = Unpooled.buffer().writeBytes(new byte[] {'a', 'b'});
         EmbeddedChannel channel = new EmbeddedChannel(new ByteToMessageDecoder() {
             @Override
diff --git a/codec/src/test/java/io/netty/handler/codec/DatagramPacketEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/DatagramPacketEncoderTest.java
index fdf1cac63f..9c04c7156f 100644
--- a/codec/src/test/java/io/netty/handler/codec/DatagramPacketEncoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/DatagramPacketEncoderTest.java
@@ -54,7 +54,7 @@ public class DatagramPacketEncoderTest {
         InetSocketAddress recipient = SocketUtils.socketAddress("127.0.0.1", 10000);
         InetSocketAddress sender = SocketUtils.socketAddress("127.0.0.1", 20000);
         assertTrue(channel.writeOutbound(
-                new DefaultAddressedEnvelope<String, InetSocketAddress>("netty", recipient, sender)));
+                new DefaultAddressedEnvelope<>("netty", recipient, sender)));
         DatagramPacket packet = channel.readOutbound();
         try {
             assertEquals("netty", packet.content().toString(CharsetUtil.UTF_8));
@@ -70,7 +70,7 @@ public class DatagramPacketEncoderTest {
         InetSocketAddress recipient = SocketUtils.socketAddress("127.0.0.1", 10000);
         InetSocketAddress sender = SocketUtils.socketAddress("127.0.0.1", 20000);
         DefaultAddressedEnvelope<Long, InetSocketAddress> envelope =
-                new DefaultAddressedEnvelope<Long, InetSocketAddress>(1L, recipient, sender);
+                new DefaultAddressedEnvelope<>(1L, recipient, sender);
         assertTrue(channel.writeOutbound(envelope));
         DefaultAddressedEnvelope<Long, InetSocketAddress> output = channel.readOutbound();
         try {
@@ -102,7 +102,7 @@ public class DatagramPacketEncoderTest {
                 new TestMessageToMessageEncoder(sharable);
 
         DatagramPacketEncoder<AddressedEnvelope<ByteBuf, InetSocketAddress>> encoder =
-                new DatagramPacketEncoder<AddressedEnvelope<ByteBuf, InetSocketAddress>>(wrapped);
+                new DatagramPacketEncoder<>(wrapped);
         assertEquals(wrapped.isSharable(), encoder.isSharable());
     }
 
diff --git a/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java b/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java
index 073872bf10..8e4dd1700d 100644
--- a/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java
@@ -117,7 +117,7 @@ public class DefaultHeadersTest {
         headers.add(of("name"), of("value3"));
         assertEquals(3, headers.size());
 
-        List<CharSequence> values = new ArrayList<CharSequence>();
+        List<CharSequence> values = new ArrayList<>();
         Iterator<CharSequence> itr = headers.valueIterator(of("name"));
         while (itr.hasNext()) {
             values.add(itr.next());
@@ -130,7 +130,7 @@ public class DefaultHeadersTest {
     public void multipleValuesPerNameIteratorEmpty() {
         TestDefaultHeaders headers = newInstance();
 
-        List<CharSequence> values = new ArrayList<CharSequence>();
+        List<CharSequence> values = new ArrayList<>();
         Iterator<CharSequence> itr = headers.valueIterator(of("name"));
         while (itr.hasNext()) {
             values.add(itr.next());
diff --git a/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
index 5a7e878805..b384700dea 100644
--- a/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
@@ -209,7 +209,7 @@ public class ReplayingDecoderTest {
 
     @Test
     public void testFireChannelReadCompleteOnInactive() throws InterruptedException {
-        final BlockingQueue<Integer> queue = new LinkedBlockingDeque<Integer>();
+        final BlockingQueue<Integer> queue = new LinkedBlockingDeque<>();
         final ByteBuf buf = Unpooled.buffer().writeBytes(new byte[]{'a', 'b'});
         EmbeddedChannel channel = new EmbeddedChannel(new ReplayingDecoder<Integer>() {
 
@@ -255,7 +255,7 @@ public class ReplayingDecoderTest {
 
     @Test
     public void testChannelInputShutdownEvent() {
-        final AtomicReference<Error> error = new AtomicReference<Error>();
+        final AtomicReference<Error> error = new AtomicReference<>();
 
         EmbeddedChannel channel = new EmbeddedChannel(new ReplayingDecoder<Integer>(0) {
             private boolean decoded;
diff --git a/codec/src/test/java/io/netty/handler/codec/compression/Lz4FrameEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/Lz4FrameEncoderTest.java
index dabe5a6d95..7068644aff 100644
--- a/codec/src/test/java/io/netty/handler/codec/compression/Lz4FrameEncoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/compression/Lz4FrameEncoderTest.java
@@ -244,7 +244,7 @@ public class Lz4FrameEncoderTest extends AbstractEncoderTest {
         Channel serverChannel = null;
         Channel clientChannel = null;
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> writeFailCauseRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> writeFailCauseRef = new AtomicReference<>();
         try {
             ServerBootstrap sb = new ServerBootstrap();
             sb.group(group);
diff --git a/codec/src/test/java/io/netty/handler/codec/compression/LzmaFrameEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/LzmaFrameEncoderTest.java
index 08c67101e4..294126650e 100644
--- a/codec/src/test/java/io/netty/handler/codec/compression/LzmaFrameEncoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/compression/LzmaFrameEncoderTest.java
@@ -47,7 +47,7 @@ public class LzmaFrameEncoderTest extends AbstractEncoderTest {
 
     @Override
     protected void testCompressionOfBatchedFlow(final ByteBuf data) throws Exception {
-        List<Integer> originalLengths = new ArrayList<Integer>();
+        List<Integer> originalLengths = new ArrayList<>();
         final int dataLength = data.readableBytes();
         int written = 0, length = rand.nextInt(50);
         while (written + length < dataLength) {
diff --git a/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
index 8fca1bba01..00cc2995b0 100644
--- a/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
@@ -164,7 +164,7 @@ public class XmlFrameDecoderTest {
         } catch (Exception e) {
             cause = e;
         }
-        List<Object> actual = new ArrayList<Object>();
+        List<Object> actual = new ArrayList<>();
         for (;;) {
             ByteBuf buf = ch.readInbound();
             if (buf == null) {
@@ -179,7 +179,7 @@ public class XmlFrameDecoderTest {
         }
 
         try {
-            List<Object> expectedList = new ArrayList<Object>();
+            List<Object> expectedList = new ArrayList<>();
             Collections.addAll(expectedList, expected);
             assertThat(actual, is(expectedList));
         } finally {
diff --git a/common/src/main/java/io/netty/util/AttributeKey.java b/common/src/main/java/io/netty/util/AttributeKey.java
index e4dabded93..ebe63ac166 100644
--- a/common/src/main/java/io/netty/util/AttributeKey.java
+++ b/common/src/main/java/io/netty/util/AttributeKey.java
@@ -27,7 +27,7 @@ public final class AttributeKey<T> extends AbstractConstant<AttributeKey<T>> {
     private static final ConstantPool<AttributeKey<Object>> pool = new ConstantPool<AttributeKey<Object>>() {
         @Override
         protected AttributeKey<Object> newConstant(int id, String name) {
-            return new AttributeKey<Object>(id, name);
+            return new AttributeKey<>(id, name);
         }
     };
 
diff --git a/common/src/main/java/io/netty/util/DefaultAttributeMap.java b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
index c685e4d0b2..df20dfd27f 100644
--- a/common/src/main/java/io/netty/util/DefaultAttributeMap.java
+++ b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
@@ -45,7 +45,7 @@ public class DefaultAttributeMap implements AttributeMap {
         AtomicReferenceArray<DefaultAttribute<?>> attributes = this.attributes;
         if (attributes == null) {
             // Not using ConcurrentHashMap due to high memory consumption.
-            attributes = new AtomicReferenceArray<DefaultAttribute<?>>(BUCKET_SIZE);
+            attributes = new AtomicReferenceArray<>(BUCKET_SIZE);
 
             if (!updater.compareAndSet(this, null, attributes)) {
                 attributes = this.attributes;
@@ -58,7 +58,7 @@ public class DefaultAttributeMap implements AttributeMap {
             // No head exists yet which means we may be able to add the attribute without synchronization and just
             // use compare and set. At worst we need to fallback to synchronization and waste two allocations.
             head = new DefaultAttribute();
-            DefaultAttribute<T> attr = new DefaultAttribute<T>(head, key);
+            DefaultAttribute<T> attr = new DefaultAttribute<>(head, key);
             head.next = attr;
             attr.prev = head;
             if (attributes.compareAndSet(i, null, head)) {
@@ -74,7 +74,7 @@ public class DefaultAttributeMap implements AttributeMap {
             for (;;) {
                 DefaultAttribute<?> next = curr.next;
                 if (next == null) {
-                    DefaultAttribute<T> attr = new DefaultAttribute<T>(head, key);
+                    DefaultAttribute<T> attr = new DefaultAttribute<>(head, key);
                     curr.next = attr;
                     attr.prev = curr;
                     return attr;
diff --git a/common/src/main/java/io/netty/util/DomainMappingBuilder.java b/common/src/main/java/io/netty/util/DomainMappingBuilder.java
index e0dcf7dafb..1c1220a033 100644
--- a/common/src/main/java/io/netty/util/DomainMappingBuilder.java
+++ b/common/src/main/java/io/netty/util/DomainMappingBuilder.java
@@ -34,7 +34,7 @@ public final class DomainMappingBuilder<V> {
      *                     when nothing matches the input
      */
     public DomainMappingBuilder(V defaultValue) {
-        builder = new DomainNameMappingBuilder<V>(defaultValue);
+        builder = new DomainNameMappingBuilder<>(defaultValue);
     }
 
     /**
@@ -45,7 +45,7 @@ public final class DomainMappingBuilder<V> {
      *                        when nothing matches the input
      */
     public DomainMappingBuilder(int initialCapacity, V defaultValue) {
-        builder = new DomainNameMappingBuilder<V>(initialCapacity, defaultValue);
+        builder = new DomainNameMappingBuilder<>(initialCapacity, defaultValue);
     }
 
     /**
diff --git a/common/src/main/java/io/netty/util/DomainNameMapping.java b/common/src/main/java/io/netty/util/DomainNameMapping.java
index d1734aa712..562acea602 100644
--- a/common/src/main/java/io/netty/util/DomainNameMapping.java
+++ b/common/src/main/java/io/netty/util/DomainNameMapping.java
@@ -62,7 +62,7 @@ public class DomainNameMapping<V> implements Mapping<String, V> {
      */
     @Deprecated
     public DomainNameMapping(int initialCapacity, V defaultValue) {
-        this(new LinkedHashMap<String, V>(initialCapacity), defaultValue);
+        this(new LinkedHashMap<>(initialCapacity), defaultValue);
     }
 
     DomainNameMapping(Map<String, V> map, V defaultValue) {
diff --git a/common/src/main/java/io/netty/util/DomainNameMappingBuilder.java b/common/src/main/java/io/netty/util/DomainNameMappingBuilder.java
index 4bf360c5fa..bcd64b78fd 100644
--- a/common/src/main/java/io/netty/util/DomainNameMappingBuilder.java
+++ b/common/src/main/java/io/netty/util/DomainNameMappingBuilder.java
@@ -52,7 +52,7 @@ public final class DomainNameMappingBuilder<V> {
      */
     public DomainNameMappingBuilder(int initialCapacity, V defaultValue) {
         this.defaultValue = checkNotNull(defaultValue, "defaultValue");
-        map = new LinkedHashMap<String, V>(initialCapacity);
+        map = new LinkedHashMap<>(initialCapacity);
     }
 
     /**
@@ -79,7 +79,7 @@ public final class DomainNameMappingBuilder<V> {
      * @return new {@link DomainNameMapping} instance
      */
     public DomainNameMapping<V> build() {
-        return new ImmutableDomainNameMapping<V>(defaultValue, map);
+        return new ImmutableDomainNameMapping<>(defaultValue, map);
     }
 
     /**
@@ -108,7 +108,7 @@ public final class DomainNameMappingBuilder<V> {
             domainNamePatterns = new String[numberOfMappings];
             values = (V[]) new Object[numberOfMappings];
 
-            final Map<String, V> mapCopy = new LinkedHashMap<String, V>(map.size());
+            final Map<String, V> mapCopy = new LinkedHashMap<>(map.size());
             int index = 0;
             for (Map.Entry<String, V> mapping : mappings) {
                 final String hostname = normalizeHostname(mapping.getKey());
diff --git a/common/src/main/java/io/netty/util/HashedWheelTimer.java b/common/src/main/java/io/netty/util/HashedWheelTimer.java
index e8e72b6387..324c1d1670 100644
--- a/common/src/main/java/io/netty/util/HashedWheelTimer.java
+++ b/common/src/main/java/io/netty/util/HashedWheelTimer.java
@@ -458,7 +458,7 @@ public class HashedWheelTimer implements Timer {
     }
 
     private final class Worker implements Runnable {
-        private final Set<Timeout> unprocessedTimeouts = new HashSet<Timeout>();
+        private final Set<Timeout> unprocessedTimeouts = new HashSet<>();
 
         private long tick;
 
diff --git a/common/src/main/java/io/netty/util/NetUtil.java b/common/src/main/java/io/netty/util/NetUtil.java
index 7da245b48c..35b60fbfac 100644
--- a/common/src/main/java/io/netty/util/NetUtil.java
+++ b/common/src/main/java/io/netty/util/NetUtil.java
@@ -163,7 +163,7 @@ public final class NetUtil {
         LOCALHOST6 = localhost6;
 
         // Retrieve the list of available network interfaces.
-        List<NetworkInterface> ifaces = new ArrayList<NetworkInterface>();
+        List<NetworkInterface> ifaces = new ArrayList<>();
         try {
             Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             if (interfaces != null) {
diff --git a/common/src/main/java/io/netty/util/Recycler.java b/common/src/main/java/io/netty/util/Recycler.java
index 87b182e6be..2bf8642502 100644
--- a/common/src/main/java/io/netty/util/Recycler.java
+++ b/common/src/main/java/io/netty/util/Recycler.java
@@ -111,7 +111,7 @@ public abstract class Recycler<T> {
     private final FastThreadLocal<Stack<T>> threadLocal = new FastThreadLocal<Stack<T>>() {
         @Override
         protected Stack<T> initialValue() {
-            return new Stack<T>(Recycler.this, Thread.currentThread(), maxCapacityPerThread, maxSharedCapacityFactor,
+            return new Stack<>(Recycler.this, Thread.currentThread(), maxCapacityPerThread, maxSharedCapacityFactor,
                     ratioMask, maxDelayedQueuesPerThread);
         }
 
@@ -230,7 +230,7 @@ public abstract class Recycler<T> {
             new FastThreadLocal<Map<Stack<?>, WeakOrderQueue>>() {
         @Override
         protected Map<Stack<?>, WeakOrderQueue> initialValue() {
-            return new WeakHashMap<Stack<?>, WeakOrderQueue>();
+            return new WeakHashMap<>();
         }
     };
 
@@ -322,7 +322,7 @@ public abstract class Recycler<T> {
             // Stack itself GCed.
             head = new Head(stack.availableSharedCapacity);
             head.link = tail;
-            owner = new WeakReference<Thread>(thread);
+            owner = new WeakReference<>(thread);
         }
 
         static WeakOrderQueue newQueue(Stack<?> stack, Thread thread) {
@@ -473,7 +473,7 @@ public abstract class Recycler<T> {
         Stack(Recycler<T> parent, Thread thread, int maxCapacity, int maxSharedCapacityFactor,
               int ratioMask, int maxDelayedQueues) {
             this.parent = parent;
-            threadRef = new WeakReference<Thread>(thread);
+            threadRef = new WeakReference<>(thread);
             this.maxCapacity = maxCapacity;
             availableSharedCapacity = new AtomicInteger(max(maxCapacity / maxSharedCapacityFactor, LINK_CAPACITY));
             elements = new DefaultHandle[min(INITIAL_CAPACITY, maxCapacity)];
@@ -655,7 +655,7 @@ public abstract class Recycler<T> {
         }
 
         DefaultHandle<T> newHandle() {
-            return new DefaultHandle<T>(this);
+            return new DefaultHandle<>(this);
         }
     }
 }
diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetector.java b/common/src/main/java/io/netty/util/ResourceLeakDetector.java
index 436d793669..5dfc799d32 100644
--- a/common/src/main/java/io/netty/util/ResourceLeakDetector.java
+++ b/common/src/main/java/io/netty/util/ResourceLeakDetector.java
@@ -165,9 +165,9 @@ public class ResourceLeakDetector<T> {
 
     /** the collection of active resources */
     private final Set<DefaultResourceLeak<?>> allLeaks =
-            Collections.newSetFromMap(new ConcurrentHashMap<DefaultResourceLeak<?>, Boolean>());
+            Collections.newSetFromMap(new ConcurrentHashMap<>());
 
-    private final ReferenceQueue<Object> refQueue = new ReferenceQueue<Object>();
+    private final ReferenceQueue<Object> refQueue = new ReferenceQueue<>();
     private final ConcurrentMap<String, Boolean> reportedLeaks = PlatformDependent.newConcurrentHashMap();
 
     private final String resourceType;
@@ -520,7 +520,7 @@ public class ResourceLeakDetector<T> {
             buf.append("Recent access records: ").append(NEWLINE);
 
             int i = 1;
-            Set<String> seen = new HashSet<String>(present);
+            Set<String> seen = new HashSet<>(present);
             for (; oldHead != Record.BOTTOM; oldHead = oldHead.next) {
                 String s = oldHead.toString();
                 if (seen.add(s)) {
@@ -558,10 +558,10 @@ public class ResourceLeakDetector<T> {
     }
 
     private static final AtomicReference<String[]> excludedMethods =
-            new AtomicReference<String[]>(EmptyArrays.EMPTY_STRINGS);
+            new AtomicReference<>(EmptyArrays.EMPTY_STRINGS);
 
     public static void addExclusions(Class clz, String ... methodNames) {
-        Set<String> nameSet = new HashSet<String>(Arrays.asList(methodNames));
+        Set<String> nameSet = new HashSet<>(Arrays.asList(methodNames));
         // Use loop rather than lookup. This avoids knowing the parameters, and doesn't have to handle
         // NoSuchMethodException.
         for (Method method : clz.getDeclaredMethods()) {
diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java b/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java
index 65f1fc8c65..2290477bdb 100644
--- a/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java
+++ b/common/src/main/java/io/netty/util/ResourceLeakDetectorFactory.java
@@ -175,8 +175,8 @@ public abstract class ResourceLeakDetectorFactory {
                 }
             }
 
-            ResourceLeakDetector<T> resourceLeakDetector = new ResourceLeakDetector<T>(resource, samplingInterval,
-                                                                                       maxActive);
+            ResourceLeakDetector<T> resourceLeakDetector = new ResourceLeakDetector<>(resource, samplingInterval,
+                    maxActive);
             logger.debug("Loaded default ResourceLeakDetector: {}", resourceLeakDetector);
             return resourceLeakDetector;
         }
@@ -198,7 +198,7 @@ public abstract class ResourceLeakDetectorFactory {
                 }
             }
 
-            ResourceLeakDetector<T> resourceLeakDetector = new ResourceLeakDetector<T>(resource, samplingInterval);
+            ResourceLeakDetector<T> resourceLeakDetector = new ResourceLeakDetector<>(resource, samplingInterval);
             logger.debug("Loaded default ResourceLeakDetector: {}", resourceLeakDetector);
             return resourceLeakDetector;
         }
diff --git a/common/src/main/java/io/netty/util/ThreadDeathWatcher.java b/common/src/main/java/io/netty/util/ThreadDeathWatcher.java
index 8e755edae6..d0579715c0 100644
--- a/common/src/main/java/io/netty/util/ThreadDeathWatcher.java
+++ b/common/src/main/java/io/netty/util/ThreadDeathWatcher.java
@@ -51,7 +51,7 @@ public final class ThreadDeathWatcher {
 
     // Use a MPMC queue as we may end up checking isEmpty() from multiple threads which may not be allowed to do
     // concurrently depending on the implementation of it in a MPSC queue.
-    private static final Queue<Entry> pendingEntries = new ConcurrentLinkedQueue<Entry>();
+    private static final Queue<Entry> pendingEntries = new ConcurrentLinkedQueue<>();
     private static final Watcher watcher = new Watcher();
     private static final AtomicBoolean started = new AtomicBoolean();
     private static volatile Thread watcherThread;
@@ -154,7 +154,7 @@ public final class ThreadDeathWatcher {
 
     private static final class Watcher implements Runnable {
 
-        private final List<Entry> watchees = new ArrayList<Entry>();
+        private final List<Entry> watchees = new ArrayList<>();
 
         @Override
         public void run() {
diff --git a/common/src/main/java/io/netty/util/Version.java b/common/src/main/java/io/netty/util/Version.java
index a0a07545ed..c722b5962d 100644
--- a/common/src/main/java/io/netty/util/Version.java
+++ b/common/src/main/java/io/netty/util/Version.java
@@ -82,7 +82,7 @@ public final class Version {
         }
 
         // Collect all artifactIds.
-        Set<String> artifactIds = new HashSet<String>();
+        Set<String> artifactIds = new HashSet<>();
         for (Object o: props.keySet()) {
             String k = (String) o;
 
@@ -106,7 +106,7 @@ public final class Version {
             artifactIds.add(artifactId);
         }
 
-        Map<String, Version> versions = new TreeMap<String, Version>();
+        Map<String, Version> versions = new TreeMap<>();
         for (String artifactId: artifactIds) {
             versions.put(
                     artifactId,
diff --git a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
index 6cfccbd3ae..a4f8247afd 100644
--- a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
@@ -91,22 +91,22 @@ public abstract class AbstractEventExecutor extends AbstractExecutorService impl
 
     @Override
     public <V> Promise<V> newPromise() {
-        return new DefaultPromise<V>(this);
+        return new DefaultPromise<>(this);
     }
 
     @Override
     public <V> ProgressivePromise<V> newProgressivePromise() {
-        return new DefaultProgressivePromise<V>(this);
+        return new DefaultProgressivePromise<>(this);
     }
 
     @Override
     public <V> Future<V> newSucceededFuture(V result) {
-        return new SucceededFuture<V>(this, result);
+        return new SucceededFuture<>(this, result);
     }
 
     @Override
     public <V> Future<V> newFailedFuture(Throwable cause) {
-        return new FailedFuture<V>(this, cause);
+        return new FailedFuture<>(this, cause);
     }
 
     @Override
@@ -126,12 +126,12 @@ public abstract class AbstractEventExecutor extends AbstractExecutorService impl
 
     @Override
     protected final <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
-        return new PromiseTask<T>(this, runnable, value);
+        return new PromiseTask<>(this, runnable, value);
     }
 
     @Override
     protected final <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
-        return new PromiseTask<T>(this, callable);
+        return new PromiseTask<>(this, callable);
     }
 
     @Override
diff --git a/common/src/main/java/io/netty/util/concurrent/AbstractScheduledEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/AbstractScheduledEventExecutor.java
index 41430c708c..252f885174 100644
--- a/common/src/main/java/io/netty/util/concurrent/AbstractScheduledEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/AbstractScheduledEventExecutor.java
@@ -53,7 +53,7 @@ public abstract class AbstractScheduledEventExecutor extends AbstractEventExecut
 
     PriorityQueue<ScheduledFutureTask<?>> scheduledTaskQueue() {
         if (scheduledTaskQueue == null) {
-            scheduledTaskQueue = new DefaultPriorityQueue<ScheduledFutureTask<?>>(
+            scheduledTaskQueue = new DefaultPriorityQueue<>(
                     SCHEDULED_FUTURE_TASK_COMPARATOR,
                     // Use same initial capacity as java.util.PriorityQueue
                     11);
@@ -165,7 +165,7 @@ public abstract class AbstractScheduledEventExecutor extends AbstractEventExecut
         }
         validateScheduled0(delay, unit);
 
-        return schedule(new ScheduledFutureTask<V>(
+        return schedule(new ScheduledFutureTask<>(
                 this, callable, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
     }
 
@@ -184,7 +184,7 @@ public abstract class AbstractScheduledEventExecutor extends AbstractEventExecut
         validateScheduled0(initialDelay, unit);
         validateScheduled0(period, unit);
 
-        return schedule(new ScheduledFutureTask<Void>(
+        return schedule(new ScheduledFutureTask<>(
                 this, Executors.<Void>callable(command, null),
                 ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), unit.toNanos(period)));
     }
@@ -205,7 +205,7 @@ public abstract class AbstractScheduledEventExecutor extends AbstractEventExecut
         validateScheduled0(initialDelay, unit);
         validateScheduled0(delay, unit);
 
-        return schedule(new ScheduledFutureTask<Void>(
+        return schedule(new ScheduledFutureTask<>(
                 this, Executors.<Void>callable(command, null),
                 ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), -unit.toNanos(delay)));
     }
diff --git a/common/src/main/java/io/netty/util/concurrent/FastThreadLocal.java b/common/src/main/java/io/netty/util/concurrent/FastThreadLocal.java
index 9d808c7f45..16205f7d68 100644
--- a/common/src/main/java/io/netty/util/concurrent/FastThreadLocal.java
+++ b/common/src/main/java/io/netty/util/concurrent/FastThreadLocal.java
@@ -99,7 +99,7 @@ public class FastThreadLocal<V> {
         Object v = threadLocalMap.indexedVariable(variablesToRemoveIndex);
         Set<FastThreadLocal<?>> variablesToRemove;
         if (v == InternalThreadLocalMap.UNSET || v == null) {
-            variablesToRemove = Collections.newSetFromMap(new IdentityHashMap<FastThreadLocal<?>, Boolean>());
+            variablesToRemove = Collections.newSetFromMap(new IdentityHashMap<>());
             threadLocalMap.setIndexedVariable(variablesToRemoveIndex, variablesToRemove);
         } else {
             variablesToRemove = (Set<FastThreadLocal<?>>) v;
diff --git a/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
index 7e2527d981..f049bd7d10 100644
--- a/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
@@ -42,8 +42,8 @@ public final class GlobalEventExecutor extends AbstractScheduledEventExecutor {
 
     public static final GlobalEventExecutor INSTANCE = new GlobalEventExecutor();
 
-    final BlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<Runnable>();
-    final ScheduledFutureTask<Void> quietPeriodTask = new ScheduledFutureTask<Void>(
+    final BlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<>();
+    final ScheduledFutureTask<Void> quietPeriodTask = new ScheduledFutureTask<>(
             this, Executors.<Void>callable(new Runnable() {
         @Override
         public void run() {
@@ -61,7 +61,7 @@ public final class GlobalEventExecutor extends AbstractScheduledEventExecutor {
     private final AtomicBoolean started = new AtomicBoolean();
     volatile Thread thread;
 
-    private final Future<?> terminationFuture = new FailedFuture<Object>(this, new UnsupportedOperationException());
+    private final Future<?> terminationFuture = new FailedFuture<>(this, new UnsupportedOperationException());
 
     private GlobalEventExecutor() {
         scheduledTaskQueue().add(quietPeriodTask);
diff --git a/common/src/main/java/io/netty/util/concurrent/ImmediateEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/ImmediateEventExecutor.java
index f952cf21c8..8f81e29865 100644
--- a/common/src/main/java/io/netty/util/concurrent/ImmediateEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/ImmediateEventExecutor.java
@@ -38,7 +38,7 @@ public final class ImmediateEventExecutor extends AbstractEventExecutor {
     private static final FastThreadLocal<Queue<Runnable>> DELAYED_RUNNABLES = new FastThreadLocal<Queue<Runnable>>() {
         @Override
         protected Queue<Runnable> initialValue() throws Exception {
-            return new ArrayDeque<Runnable>();
+            return new ArrayDeque<>();
         }
     };
     /**
@@ -51,7 +51,7 @@ public final class ImmediateEventExecutor extends AbstractEventExecutor {
         }
     };
 
-    private final Future<?> terminationFuture = new FailedFuture<Object>(
+    private final Future<?> terminationFuture = new FailedFuture<>(
             GlobalEventExecutor.INSTANCE, new UnsupportedOperationException());
 
     private ImmediateEventExecutor() { }
@@ -130,12 +130,12 @@ public final class ImmediateEventExecutor extends AbstractEventExecutor {
 
     @Override
     public <V> Promise<V> newPromise() {
-        return new ImmediatePromise<V>(this);
+        return new ImmediatePromise<>(this);
     }
 
     @Override
     public <V> ProgressivePromise<V> newProgressivePromise() {
-        return new ImmediateProgressivePromise<V>(this);
+        return new ImmediateProgressivePromise<>(this);
     }
 
     static class ImmediatePromise<V> extends DefaultPromise<V> {
diff --git a/common/src/main/java/io/netty/util/concurrent/MultithreadEventExecutorGroup.java b/common/src/main/java/io/netty/util/concurrent/MultithreadEventExecutorGroup.java
index 1665638cc0..d300108eba 100644
--- a/common/src/main/java/io/netty/util/concurrent/MultithreadEventExecutorGroup.java
+++ b/common/src/main/java/io/netty/util/concurrent/MultithreadEventExecutorGroup.java
@@ -123,7 +123,7 @@ public abstract class MultithreadEventExecutorGroup extends AbstractEventExecuto
             e.terminationFuture().addListener(terminationListener);
         }
 
-        Set<EventExecutor> childrenSet = new LinkedHashSet<EventExecutor>(children.length);
+        Set<EventExecutor> childrenSet = new LinkedHashSet<>(children.length);
         Collections.addAll(childrenSet, children);
         readonlyChildren = Collections.unmodifiableSet(childrenSet);
     }
diff --git a/common/src/main/java/io/netty/util/concurrent/PromiseAggregator.java b/common/src/main/java/io/netty/util/concurrent/PromiseAggregator.java
index 7d908c0379..0788b73532 100644
--- a/common/src/main/java/io/netty/util/concurrent/PromiseAggregator.java
+++ b/common/src/main/java/io/netty/util/concurrent/PromiseAggregator.java
@@ -77,7 +77,7 @@ public class PromiseAggregator<V, F extends Future<V>> implements GenericFutureL
                 } else {
                     size = 2;
                 }
-                pendingPromises = new LinkedHashSet<Promise<V>>(size);
+                pendingPromises = new LinkedHashSet<>(size);
             }
             for (Promise<V> p : promises) {
                 if (p == null) {
diff --git a/common/src/main/java/io/netty/util/concurrent/PromiseTask.java b/common/src/main/java/io/netty/util/concurrent/PromiseTask.java
index 8cb23c7861..c9c054125f 100644
--- a/common/src/main/java/io/netty/util/concurrent/PromiseTask.java
+++ b/common/src/main/java/io/netty/util/concurrent/PromiseTask.java
@@ -21,7 +21,7 @@ import java.util.concurrent.RunnableFuture;
 class PromiseTask<V> extends DefaultPromise<V> implements RunnableFuture<V> {
 
     static <T> Callable<T> toCallable(Runnable runnable, T result) {
-        return new RunnableAdapter<T>(runnable, result);
+        return new RunnableAdapter<>(runnable, result);
     }
 
     private static final class RunnableAdapter<T> implements Callable<T> {
diff --git a/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
index 24e8f17c95..5896576ce5 100644
--- a/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
@@ -88,7 +88,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
     private volatile boolean interrupted;
 
     private final Semaphore threadLock = new Semaphore(0);
-    private final Set<Runnable> shutdownHooks = new LinkedHashSet<Runnable>();
+    private final Set<Runnable> shutdownHooks = new LinkedHashSet<>();
     private final boolean addTaskWakesUp;
     private final int maxPendingTasks;
     private final RejectedExecutionHandler rejectedExecutionHandler;
@@ -181,7 +181,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
      * implementation that does not support blocking operations at all.
      */
     protected Queue<Runnable> newTaskQueue(int maxPendingTasks) {
-        return new LinkedBlockingQueue<Runnable>(maxPendingTasks);
+        return new LinkedBlockingQueue<>(maxPendingTasks);
     }
 
     /**
@@ -509,7 +509,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
         boolean ran = false;
         // Note shutdown hooks can add / remove shutdown hooks.
         while (!shutdownHooks.isEmpty()) {
-            List<Runnable> copy = new ArrayList<Runnable>(shutdownHooks);
+            List<Runnable> copy = new ArrayList<>(shutdownHooks);
             shutdownHooks.clear();
             for (Runnable task: copy) {
                 try {
diff --git a/common/src/main/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java
index 4ed94da537..463bc657c5 100644
--- a/common/src/main/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java
+++ b/common/src/main/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java
@@ -99,22 +99,22 @@ public final class UnorderedThreadPoolEventExecutor extends ScheduledThreadPoolE
 
     @Override
     public <V> Promise<V> newPromise() {
-        return new DefaultPromise<V>(this);
+        return new DefaultPromise<>(this);
     }
 
     @Override
     public <V> ProgressivePromise<V> newProgressivePromise() {
-        return new DefaultProgressivePromise<V>(this);
+        return new DefaultProgressivePromise<>(this);
     }
 
     @Override
     public <V> Future<V> newSucceededFuture(V result) {
-        return new SucceededFuture<V>(this, result);
+        return new SucceededFuture<>(this, result);
     }
 
     @Override
     public <V> Future<V> newFailedFuture(Throwable cause) {
-        return new FailedFuture<V>(this, cause);
+        return new FailedFuture<>(this, cause);
     }
 
     @Override
@@ -161,12 +161,12 @@ public final class UnorderedThreadPoolEventExecutor extends ScheduledThreadPoolE
     @Override
     protected <V> RunnableScheduledFuture<V> decorateTask(Runnable runnable, RunnableScheduledFuture<V> task) {
         return runnable instanceof NonNotifyRunnable ?
-                task : new RunnableScheduledFutureTask<V>(this, runnable, task);
+                task : new RunnableScheduledFutureTask<>(this, runnable, task);
     }
 
     @Override
     protected <V> RunnableScheduledFuture<V> decorateTask(Callable<V> callable, RunnableScheduledFuture<V> task) {
-        return new RunnableScheduledFutureTask<V>(this, callable, task);
+        return new RunnableScheduledFutureTask<>(this, callable, task);
     }
 
     @Override
diff --git a/common/src/main/java/io/netty/util/internal/EmptyPriorityQueue.java b/common/src/main/java/io/netty/util/internal/EmptyPriorityQueue.java
index 983cb1fcda..6ae9955ea0 100644
--- a/common/src/main/java/io/netty/util/internal/EmptyPriorityQueue.java
+++ b/common/src/main/java/io/netty/util/internal/EmptyPriorityQueue.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 public final class EmptyPriorityQueue<T> implements PriorityQueue<T> {
-    private static final PriorityQueue<Object> INSTANCE = new EmptyPriorityQueue<Object>();
+    private static final PriorityQueue<Object> INSTANCE = new EmptyPriorityQueue<>();
 
     private EmptyPriorityQueue() {
     }
diff --git a/common/src/main/java/io/netty/util/internal/MacAddressUtil.java b/common/src/main/java/io/netty/util/internal/MacAddressUtil.java
index fbb8dfbda8..363c55f010 100644
--- a/common/src/main/java/io/netty/util/internal/MacAddressUtil.java
+++ b/common/src/main/java/io/netty/util/internal/MacAddressUtil.java
@@ -50,7 +50,7 @@ public final class MacAddressUtil {
         InetAddress bestInetAddr = NetUtil.LOCALHOST4;
 
         // Retrieve the list of available network interfaces.
-        Map<NetworkInterface, InetAddress> ifaces = new LinkedHashMap<NetworkInterface, InetAddress>();
+        Map<NetworkInterface, InetAddress> ifaces = new LinkedHashMap<>();
         try {
             Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             if (interfaces != null) {
diff --git a/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java b/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java
index 31b4a465fa..71c2438930 100644
--- a/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java
+++ b/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java
@@ -90,7 +90,7 @@ public final class NativeLibraryLoader {
      *         if none of the given libraries load successfully.
      */
     public static void loadFirstAvailable(ClassLoader loader, String... names) {
-        List<Throwable> suppressed = new ArrayList<Throwable>();
+        List<Throwable> suppressed = new ArrayList<>();
         for (String name : names) {
             try {
                 load(name, loader);
@@ -130,7 +130,7 @@ public final class NativeLibraryLoader {
         // Adjust expected name to support shading of native libraries.
         String packagePrefix = calculatePackagePrefix().replace('.', '_');
         String name = packagePrefix + originalName;
-        List<Throwable> suppressed = new ArrayList<Throwable>();
+        List<Throwable> suppressed = new ArrayList<>();
         try {
             // first try to load from java.library.path
             loadLibrary(loader, name, false);
diff --git a/common/src/main/java/io/netty/util/internal/StringUtil.java b/common/src/main/java/io/netty/util/internal/StringUtil.java
index e81a024ddc..e033137b1b 100644
--- a/common/src/main/java/io/netty/util/internal/StringUtil.java
+++ b/common/src/main/java/io/netty/util/internal/StringUtil.java
@@ -435,7 +435,7 @@ public final class StringUtil {
      * @return {@link List} the list of unescaped fields
      */
     public static List<CharSequence> unescapeCsvFields(CharSequence value) {
-        List<CharSequence> unescaped = new ArrayList<CharSequence>(2);
+        List<CharSequence> unescaped = new ArrayList<>(2);
         StringBuilder current = InternalThreadLocalMap.get().stringBuilder();
         boolean quoted = false;
         int last = value.length() - 1;
diff --git a/common/src/main/java/io/netty/util/internal/TypeParameterMatcher.java b/common/src/main/java/io/netty/util/internal/TypeParameterMatcher.java
index 87481586a6..93af19f4a6 100644
--- a/common/src/main/java/io/netty/util/internal/TypeParameterMatcher.java
+++ b/common/src/main/java/io/netty/util/internal/TypeParameterMatcher.java
@@ -59,7 +59,7 @@ public abstract class TypeParameterMatcher {
 
         Map<String, TypeParameterMatcher> map = findCache.get(thisClass);
         if (map == null) {
-            map = new HashMap<String, TypeParameterMatcher>();
+            map = new HashMap<>();
             findCache.put(thisClass, map);
         }
 
diff --git a/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java
index fed8cd0106..b6bfea4ba9 100644
--- a/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java
+++ b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java
@@ -289,7 +289,7 @@ final class MessageFormatter {
             return;
         }
         if (seenSet == null) {
-            seenSet = new HashSet<Object[]>(a.length);
+            seenSet = new HashSet<>(a.length);
         }
         if (seenSet.add(a)) {
             deeplyAppendParameter(sbuf, a[0], seenSet);
diff --git a/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java b/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java
index 26762355fe..7eb5f1bc40 100644
--- a/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java
+++ b/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java
@@ -86,7 +86,7 @@ public class AbstractReferenceCountedTest {
     @Test(timeout = 30000)
     public void testRetainFromMultipleThreadsThrowsReferenceCountException() throws Exception {
         int threads = 4;
-        Queue<Future<?>> futures = new ArrayDeque<Future<?>>(threads);
+        Queue<Future<?>> futures = new ArrayDeque<>(threads);
         ExecutorService service = Executors.newFixedThreadPool(threads);
         final AtomicInteger refCountExceptions = new AtomicInteger();
 
@@ -134,7 +134,7 @@ public class AbstractReferenceCountedTest {
     @Test(timeout = 30000)
     public void testReleaseFromMultipleThreadsThrowsReferenceCountException() throws Exception {
         int threads = 4;
-        Queue<Future<?>> futures = new ArrayDeque<Future<?>>(threads);
+        Queue<Future<?>> futures = new ArrayDeque<>(threads);
         ExecutorService service = Executors.newFixedThreadPool(threads);
         final AtomicInteger refCountExceptions = new AtomicInteger();
 
diff --git a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java b/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java
index 0f2468aed6..be1bea8d62 100644
--- a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java
+++ b/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java
@@ -79,8 +79,8 @@ public class AsciiStringMemoryTest {
 
     @Test
     public void forEachTest() throws Exception {
-        final AtomicReference<Integer> aCount = new AtomicReference<Integer>(0);
-        final AtomicReference<Integer> bCount = new AtomicReference<Integer>(0);
+        final AtomicReference<Integer> aCount = new AtomicReference<>(0);
+        final AtomicReference<Integer> bCount = new AtomicReference<>(0);
         aAsciiString.forEachByte(new ByteProcessor() {
             int i;
             @Override
@@ -117,8 +117,8 @@ public class AsciiStringMemoryTest {
 
     @Test
     public void forEachDescTest() throws Exception {
-        final AtomicReference<Integer> aCount = new AtomicReference<Integer>(0);
-        final AtomicReference<Integer> bCount = new AtomicReference<Integer>(0);
+        final AtomicReference<Integer> aCount = new AtomicReference<>(0);
+        final AtomicReference<Integer> bCount = new AtomicReference<>(0);
         aAsciiString.forEachByteDesc(new ByteProcessor() {
             int i = 1;
             @Override
diff --git a/common/src/test/java/io/netty/util/ConstantPoolTest.java b/common/src/test/java/io/netty/util/ConstantPoolTest.java
index a3fc4e7c1f..41c9cb8f0e 100644
--- a/common/src/test/java/io/netty/util/ConstantPoolTest.java
+++ b/common/src/test/java/io/netty/util/ConstantPoolTest.java
@@ -68,7 +68,7 @@ public class ConstantPoolTest {
         TestConstant d = pool.valueOf("d_delta");
         TestConstant e = pool.valueOf("e_epsilon");
 
-        Set<TestConstant> set = new TreeSet<TestConstant>();
+        Set<TestConstant> set = new TreeSet<>();
         set.add(b);
         set.add(c);
         set.add(e);
diff --git a/common/src/test/java/io/netty/util/DomainNameMappingTest.java b/common/src/test/java/io/netty/util/DomainNameMappingTest.java
index b8447964cd..a2b7023c67 100644
--- a/common/src/test/java/io/netty/util/DomainNameMappingTest.java
+++ b/common/src/test/java/io/netty/util/DomainNameMappingTest.java
@@ -34,17 +34,17 @@ public class DomainNameMappingTest {
 
     @Test(expected = NullPointerException.class)
     public void testNullDomainNamePatternsAreForbiddenInDeprecatedApi() {
-        new DomainNameMapping<String>("NotFound").add(null, "Some value");
+        new DomainNameMapping<>("NotFound").add(null, "Some value");
     }
 
     @Test(expected = NullPointerException.class)
     public void testNullValuesAreForbiddenInDeprecatedApi() {
-        new DomainNameMapping<String>("NotFound").add("Some key", null);
+        new DomainNameMapping<>("NotFound").add("Some key", null);
     }
 
     @Test
     public void testDefaultValueInDeprecatedApi() {
-        DomainNameMapping<String> mapping = new DomainNameMapping<String>("NotFound");
+        DomainNameMapping<String> mapping = new DomainNameMapping<>("NotFound");
 
         assertEquals("NotFound", mapping.map("not-existing"));
 
@@ -55,7 +55,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testStrictEqualityInDeprecatedApi() {
-        DomainNameMapping<String> mapping = new DomainNameMapping<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMapping<>("NotFound")
             .add("netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Downloads");
 
@@ -67,7 +67,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testWildcardMatchesAnyPrefixInDeprecatedApi() {
-        DomainNameMapping<String> mapping = new DomainNameMapping<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMapping<>("NotFound")
             .add("*.netty.io", "Netty");
 
         assertEquals("Netty", mapping.map("netty.io"));
@@ -80,13 +80,13 @@ public class DomainNameMappingTest {
     @Test
     public void testFirstMatchWinsInDeprecatedApi() {
         assertEquals("Netty",
-            new DomainNameMapping<String>("NotFound")
+                new DomainNameMapping<>("NotFound")
                 .add("*.netty.io", "Netty")
                 .add("downloads.netty.io", "Netty-Downloads")
                 .map("downloads.netty.io"));
 
         assertEquals("Netty-Downloads",
-            new DomainNameMapping<String>("NotFound")
+                new DomainNameMapping<>("NotFound")
                 .add("downloads.netty.io", "Netty-Downloads")
                 .add("*.netty.io", "Netty")
                 .map("downloads.netty.io"));
@@ -94,7 +94,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testToStringInDeprecatedApi() {
-        DomainNameMapping<String> mapping = new DomainNameMapping<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMapping<>("NotFound")
             .add("*.netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Downloads");
 
@@ -112,17 +112,17 @@ public class DomainNameMappingTest {
 
     @Test(expected = NullPointerException.class)
     public void testNullDomainNamePatternsAreForbidden() {
-        new DomainNameMappingBuilder<String>("NotFound").add(null, "Some value");
+        new DomainNameMappingBuilder<>("NotFound").add(null, "Some value");
     }
 
     @Test(expected = NullPointerException.class)
     public void testNullValuesAreForbidden() {
-        new DomainNameMappingBuilder<String>("NotFound").add("Some key", null);
+        new DomainNameMappingBuilder<>("NotFound").add("Some key", null);
     }
 
     @Test
     public void testDefaultValue() {
-        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<>("NotFound")
             .add("*.netty.io", "Netty")
             .build();
 
@@ -131,7 +131,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testStrictEquality() {
-        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<>("NotFound")
             .add("netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Downloads")
             .build();
@@ -144,7 +144,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testWildcardMatchesAnyPrefix() {
-        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<>("NotFound")
             .add("*.netty.io", "Netty")
             .build();
 
@@ -158,14 +158,14 @@ public class DomainNameMappingTest {
     @Test
     public void testFirstMatchWins() {
         assertEquals("Netty",
-            new DomainNameMappingBuilder<String>("NotFound")
+                new DomainNameMappingBuilder<>("NotFound")
                 .add("*.netty.io", "Netty")
                 .add("downloads.netty.io", "Netty-Downloads")
                 .build()
                 .map("downloads.netty.io"));
 
         assertEquals("Netty-Downloads",
-            new DomainNameMappingBuilder<String>("NotFound")
+                new DomainNameMappingBuilder<>("NotFound")
                 .add("downloads.netty.io", "Netty-Downloads")
                 .add("*.netty.io", "Netty")
                 .build()
@@ -174,7 +174,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testToString() {
-        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<>("NotFound")
             .add("*.netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Download")
             .build();
@@ -186,7 +186,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testAsMap() {
-        DomainNameMapping<String> mapping = new DomainNameMapping<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMapping<>("NotFound")
             .add("netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Downloads");
 
@@ -199,7 +199,7 @@ public class DomainNameMappingTest {
 
     @Test
     public void testAsMapWithImmutableDomainNameMapping() {
-        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<String>("NotFound")
+        DomainNameMapping<String> mapping = new DomainNameMappingBuilder<>("NotFound")
             .add("netty.io", "Netty")
             .add("downloads.netty.io", "Netty-Downloads")
             .build();
diff --git a/common/src/test/java/io/netty/util/HashedWheelTimerTest.java b/common/src/test/java/io/netty/util/HashedWheelTimerTest.java
index 2bf1c34819..76340a277f 100644
--- a/common/src/test/java/io/netty/util/HashedWheelTimerTest.java
+++ b/common/src/test/java/io/netty/util/HashedWheelTimerTest.java
@@ -138,7 +138,7 @@ public class HashedWheelTimerTest {
         int timeout = 125;
         int maxTimeout = 2 * (tickDuration + timeout);
         final HashedWheelTimer timer = new HashedWheelTimer(tickDuration, TimeUnit.MILLISECONDS);
-        final BlockingQueue<Long> queue = new LinkedBlockingQueue<Long>();
+        final BlockingQueue<Long> queue = new LinkedBlockingQueue<>();
 
         int scheduledTasks = 100000;
         for (int i = 0; i < scheduledTasks; i++) {
diff --git a/common/src/test/java/io/netty/util/NettyRuntimeTests.java b/common/src/test/java/io/netty/util/NettyRuntimeTests.java
index e66c6cc6ee..b69c85bff7 100644
--- a/common/src/test/java/io/netty/util/NettyRuntimeTests.java
+++ b/common/src/test/java/io/netty/util/NettyRuntimeTests.java
@@ -75,12 +75,12 @@ public class NettyRuntimeTests {
         final NettyRuntime.AvailableProcessorsHolder holder = new NettyRuntime.AvailableProcessorsHolder();
         final CyclicBarrier barrier = new CyclicBarrier(3);
 
-        final AtomicReference<IllegalStateException> firstReference = new AtomicReference<IllegalStateException>();
+        final AtomicReference<IllegalStateException> firstReference = new AtomicReference<>();
         final Runnable firstTarget = getRunnable(holder, barrier, firstReference);
         final Thread firstGet = new Thread(firstTarget);
         firstGet.start();
 
-        final AtomicReference<IllegalStateException> secondRefernce = new AtomicReference<IllegalStateException>();
+        final AtomicReference<IllegalStateException> secondRefernce = new AtomicReference<>();
         final Runnable secondTarget = getRunnable(holder, barrier, secondRefernce);
         final Thread secondGet = new Thread(secondTarget);
         secondGet.start();
@@ -130,7 +130,7 @@ public class NettyRuntimeTests {
         });
         get.start();
 
-        final AtomicReference<IllegalStateException> setException = new AtomicReference<IllegalStateException>();
+        final AtomicReference<IllegalStateException> setException = new AtomicReference<>();
         final Thread set = new Thread(new Runnable() {
             @Override
             public void run() {
diff --git a/common/src/test/java/io/netty/util/RecyclerTest.java b/common/src/test/java/io/netty/util/RecyclerTest.java
index e4bcbf1da4..c54c8a7b76 100644
--- a/common/src/test/java/io/netty/util/RecyclerTest.java
+++ b/common/src/test/java/io/netty/util/RecyclerTest.java
@@ -40,7 +40,7 @@ public class RecyclerTest {
     public void testThreadCanBeCollectedEvenIfHandledObjectIsReferenced() throws Exception {
         final Recycler<HandledObject> recycler = newRecycler(1024);
         final AtomicBoolean collected = new AtomicBoolean();
-        final AtomicReference<HandledObject> reference = new AtomicReference<HandledObject>();
+        final AtomicReference<HandledObject> reference = new AtomicReference<>();
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
@@ -85,7 +85,7 @@ public class RecyclerTest {
     public void testMultipleRecycleAtDifferentThread() throws InterruptedException {
         Recycler<HandledObject> recycler = newRecycler(1024);
         final HandledObject object = recycler.get();
-        final AtomicReference<IllegalStateException> exceptionStore = new AtomicReference<IllegalStateException>();
+        final AtomicReference<IllegalStateException> exceptionStore = new AtomicReference<>();
         final Thread thread1 = new Thread(new Runnable() {
             @Override
             public void run() {
diff --git a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java b/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java
index 9f947a6680..301d2ee39c 100644
--- a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java
+++ b/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java
@@ -28,13 +28,13 @@ public class ResourceLeakDetectorTest {
     @Test(timeout = 60000)
     public void testConcurrentUsage() throws Throwable {
         final AtomicBoolean finished = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         // With 50 threads issue #6087 is reproducible on every run.
         Thread[] threads = new Thread[50];
         final CyclicBarrier barrier = new CyclicBarrier(threads.length);
         for (int i = 0; i < threads.length; i++) {
             Thread t = new Thread(new Runnable() {
-                Queue<LeakAwareResource> resources = new ArrayDeque<LeakAwareResource>(100);
+                Queue<LeakAwareResource> resources = new ArrayDeque<>(100);
 
                 @Override
                 public void run() {
@@ -118,7 +118,7 @@ public class ResourceLeakDetectorTest {
 
     private static final class DefaultResource implements Resource {
         // Sample every allocation
-        static final TestResourceLeakDetector<Resource> detector = new TestResourceLeakDetector<Resource>(
+        static final TestResourceLeakDetector<Resource> detector = new TestResourceLeakDetector<>(
                 Resource.class, 1, Integer.MAX_VALUE);
 
         @Override
@@ -140,7 +140,7 @@ public class ResourceLeakDetectorTest {
 
     private static final class TestResourceLeakDetector<T> extends ResourceLeakDetector<T> {
 
-        private final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> error = new AtomicReference<>();
 
         TestResourceLeakDetector(Class<?> resourceType, int samplingInterval, long maxActive) {
             super(resourceType, samplingInterval, maxActive);
diff --git a/common/src/test/java/io/netty/util/ThreadDeathWatcherTest.java b/common/src/test/java/io/netty/util/ThreadDeathWatcherTest.java
index 7574274f64..ba9c218eb4 100644
--- a/common/src/test/java/io/netty/util/ThreadDeathWatcherTest.java
+++ b/common/src/test/java/io/netty/util/ThreadDeathWatcherTest.java
@@ -120,7 +120,7 @@ public class ThreadDeathWatcherTest {
     @Test(timeout = 2000)
     public void testThreadGroup() throws InterruptedException {
         final ThreadGroup group = new ThreadGroup("group");
-        final AtomicReference<ThreadGroup> capturedGroup = new AtomicReference<ThreadGroup>();
+        final AtomicReference<ThreadGroup> capturedGroup = new AtomicReference<>();
         final Thread thread = new Thread(group, new Runnable() {
             @Override
             public void run() {
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java b/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
index fd9a3e95d6..4cf11b0144 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
@@ -65,7 +65,7 @@ public class DefaultPromiseTest {
 
     @Test(expected = CancellationException.class)
     public void testCancellationExceptionIsThrownWhenBlockingGet() throws InterruptedException, ExecutionException {
-        final Promise<Void> promise = new DefaultPromise<Void>(ImmediateEventExecutor.INSTANCE);
+        final Promise<Void> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         promise.cancel(false);
         promise.get();
     }
@@ -73,7 +73,7 @@ public class DefaultPromiseTest {
     @Test(expected = CancellationException.class)
     public void testCancellationExceptionIsThrownWhenBlockingGetWithTimeout() throws InterruptedException,
             ExecutionException, TimeoutException {
-        final Promise<Void> promise = new DefaultPromise<Void>(ImmediateEventExecutor.INSTANCE);
+        final Promise<Void> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         promise.cancel(false);
         promise.get(1, TimeUnit.SECONDS);
     }
@@ -126,11 +126,11 @@ public class DefaultPromiseTest {
     public void testListenerNotifyOrder() throws Exception {
         EventExecutor executor = new TestEventExecutor();
         try {
-            final BlockingQueue<FutureListener<Void>> listeners = new LinkedBlockingQueue<FutureListener<Void>>();
+            final BlockingQueue<FutureListener<Void>> listeners = new LinkedBlockingQueue<>();
             int runs = 100000;
 
             for (int i = 0; i < runs; i++) {
-                final Promise<Void> promise = new DefaultPromise<Void>(executor);
+                final Promise<Void> promise = new DefaultPromise<>(executor);
                 final FutureListener<Void> listener1 = new FutureListener<Void>() {
                     @Override
                     public void operationComplete(Future<Void> future) throws Exception {
@@ -214,9 +214,9 @@ public class DefaultPromiseTest {
             executor = new TestEventExecutor();
 
             final int numberOfAttempts = 4096;
-            final Map<Thread, DefaultPromise<Void>> promises = new HashMap<Thread, DefaultPromise<Void>>();
+            final Map<Thread, DefaultPromise<Void>> promises = new HashMap<>();
             for (int i = 0; i < numberOfAttempts; i++) {
-                final DefaultPromise<Void> promise = new DefaultPromise<Void>(executor);
+                final DefaultPromise<Void> promise = new DefaultPromise<>(executor);
                 final Thread thread = new Thread(new Runnable() {
                     @Override
                     public void run() {
@@ -241,7 +241,7 @@ public class DefaultPromiseTest {
 
     @Test
     public void signalUncancellableCompletionValue() {
-        final Promise<Signal> promise = new DefaultPromise<Signal>(ImmediateEventExecutor.INSTANCE);
+        final Promise<Signal> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         promise.setSuccess(Signal.valueOf(DefaultPromise.class, "UNCANCELLABLE"));
         assertTrue(promise.isDone());
         assertTrue(promise.isSuccess());
@@ -249,7 +249,7 @@ public class DefaultPromiseTest {
 
     @Test
     public void signalSuccessCompletionValue() {
-        final Promise<Signal> promise = new DefaultPromise<Signal>(ImmediateEventExecutor.INSTANCE);
+        final Promise<Signal> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         promise.setSuccess(Signal.valueOf(DefaultPromise.class, "SUCCESS"));
         assertTrue(promise.isDone());
         assertTrue(promise.isSuccess());
@@ -257,7 +257,7 @@ public class DefaultPromiseTest {
 
     @Test
     public void setUncancellableGetNow() {
-        final Promise<String> promise = new DefaultPromise<String>(ImmediateEventExecutor.INSTANCE);
+        final Promise<String> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         assertNull(promise.getNow());
         assertTrue(promise.setUncancellable());
         assertNull(promise.getNow());
@@ -298,7 +298,7 @@ public class DefaultPromiseTest {
                                                          final CountDownLatch latch) {
         for (int i = 0; i < p.length; i ++) {
             final int finalI = i;
-            p[i] = new DefaultPromise<Void>(executor);
+            p[i] = new DefaultPromise<>(executor);
             p[i].addListener(new FutureListener<Void>() {
                 @Override
                 public void operationComplete(Future<Void> future) throws Exception {
@@ -340,7 +340,7 @@ public class DefaultPromiseTest {
                                                          final CountDownLatch latch) {
         for (int i = 0; i < p.length; i ++) {
             final int finalI = i;
-            p[i] = new DefaultPromise<Void>(executor);
+            p[i] = new DefaultPromise<>(executor);
             p[i].addListener(new FutureListener<Void>() {
                 @Override
                 public void operationComplete(Future<Void> future) throws Exception {
@@ -376,7 +376,7 @@ public class DefaultPromiseTest {
             final AtomicInteger state = new AtomicInteger();
             final CountDownLatch latch1 = new CountDownLatch(1);
             final CountDownLatch latch2 = new CountDownLatch(2);
-            final Promise<Void> promise = new DefaultPromise<Void>(executor);
+            final Promise<Void> promise = new DefaultPromise<>(executor);
 
             // Add a listener before completion so "lateListener" is used next time we add a listener.
             promise.addListener(new FutureListener<Void>() {
@@ -439,7 +439,7 @@ public class DefaultPromiseTest {
 
     private static void testPromiseListenerAddWhenComplete(Throwable cause) throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final Promise<Void> promise = new DefaultPromise<Void>(ImmediateEventExecutor.INSTANCE);
+        final Promise<Void> promise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         promise.addListener(new FutureListener<Void>() {
             @Override
             public void operationComplete(Future<Void> future) throws Exception {
@@ -469,7 +469,7 @@ public class DefaultPromiseTest {
                 latch.countDown();
             }
         };
-        final Promise<Void> promise = new DefaultPromise<Void>(executor);
+        final Promise<Void> promise = new DefaultPromise<>(executor);
         executor.execute(new Runnable() {
             @Override
             public void run() {
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java b/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java
index 8d788a2103..85d12d17cd 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java
@@ -53,7 +53,7 @@ public class DefaultThreadFactoryTest {
             });
 
             // holder for the thread factory, plays the role of a global singleton
-            final AtomicReference<DefaultThreadFactory> factory = new AtomicReference<DefaultThreadFactory>();
+            final AtomicReference<DefaultThreadFactory> factory = new AtomicReference<>();
             final AtomicInteger counter = new AtomicInteger();
             final Runnable task = new Runnable() {
                 @Override
@@ -62,7 +62,7 @@ public class DefaultThreadFactoryTest {
                 }
             };
 
-            final AtomicReference<Throwable> interrupted = new AtomicReference<Throwable>();
+            final AtomicReference<Throwable> interrupted = new AtomicReference<>();
 
             // create the thread factory, since we are running the thread group brother, the thread
             // factory will now forever be tied to that group
@@ -139,7 +139,7 @@ public class DefaultThreadFactoryTest {
                     @Override
                     public DefaultThreadFactory call() throws Exception {
                         final AtomicReference<DefaultThreadFactory> factory =
-                                new AtomicReference<DefaultThreadFactory>();
+                                new AtomicReference<>();
                         final Thread thread = new Thread(sticky, new Runnable() {
                             @Override
                             public void run() {
@@ -189,8 +189,8 @@ public class DefaultThreadFactoryTest {
     private static void runStickyThreadGroupTest(
             final Callable<DefaultThreadFactory> callable,
             final ThreadGroup expected) throws InterruptedException {
-        final AtomicReference<ThreadGroup> captured = new AtomicReference<ThreadGroup>();
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<ThreadGroup> captured = new AtomicReference<>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         final Thread first = new Thread(new ThreadGroup("wrong"), new Runnable() {
             @Override
@@ -223,8 +223,8 @@ public class DefaultThreadFactoryTest {
     @Test(timeout = 2000)
     public void testDefaultThreadFactoryNonStickyThreadGroupConstructor() throws InterruptedException {
 
-        final AtomicReference<DefaultThreadFactory> factory = new AtomicReference<DefaultThreadFactory>();
-        final AtomicReference<ThreadGroup> firstCaptured = new AtomicReference<ThreadGroup>();
+        final AtomicReference<DefaultThreadFactory> factory = new AtomicReference<>();
+        final AtomicReference<ThreadGroup> firstCaptured = new AtomicReference<>();
 
         final ThreadGroup firstGroup = new ThreadGroup("first");
         final Thread first = new Thread(firstGroup, new Runnable() {
@@ -244,7 +244,7 @@ public class DefaultThreadFactoryTest {
 
         assertEquals(firstGroup, firstCaptured.get());
 
-        final AtomicReference<ThreadGroup> secondCaptured = new AtomicReference<ThreadGroup>();
+        final AtomicReference<ThreadGroup> secondCaptured = new AtomicReference<>();
 
         final ThreadGroup secondGroup = new ThreadGroup("second");
         final Thread second = new Thread(secondGroup, new Runnable() {
diff --git a/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java b/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java
index 6457de297a..270d7624c4 100644
--- a/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java
@@ -58,7 +58,7 @@ public class FastThreadLocalTest {
 
     @Test(timeout = 10000)
     public void testRemoveAllFromFTLThread() throws Throwable {
-        final AtomicReference<Throwable> throwable = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> throwable = new AtomicReference<>();
         final Thread thread = new FastThreadLocalThread() {
             @Override
             public void run() {
@@ -81,7 +81,7 @@ public class FastThreadLocalTest {
 
     @Test
     public void testMultipleSetRemove() throws Exception {
-        final FastThreadLocal<String> threadLocal = new FastThreadLocal<String>();
+        final FastThreadLocal<String> threadLocal = new FastThreadLocal<>();
         final Runnable runnable = new Runnable() {
             @Override
             public void run() {
@@ -108,8 +108,8 @@ public class FastThreadLocalTest {
 
     @Test
     public void testMultipleSetRemove_multipleThreadLocal() throws Exception {
-        final FastThreadLocal<String> threadLocal = new FastThreadLocal<String>();
-        final FastThreadLocal<String> threadLocal2 = new FastThreadLocal<String>();
+        final FastThreadLocal<String> threadLocal = new FastThreadLocal<>();
+        final FastThreadLocal<String> threadLocal2 = new FastThreadLocal<>();
         final Runnable runnable = new Runnable() {
             @Override
             public void run() {
@@ -199,7 +199,7 @@ public class FastThreadLocalTest {
 
     private static final class TestFastThreadLocal extends FastThreadLocal<String> {
 
-        final AtomicReference<String> onRemovalCalled = new AtomicReference<String>();
+        final AtomicReference<String> onRemovalCalled = new AtomicReference<>();
 
         @Override
         protected String initialValue() throws Exception {
diff --git a/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java b/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java
index 35c2a59cd4..14eba7bcde 100644
--- a/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java
@@ -98,7 +98,7 @@ public class GlobalEventExecutorTest {
     @Test(timeout = 2000)
     public void testThreadGroup() throws InterruptedException {
         final ThreadGroup group = new ThreadGroup("group");
-        final AtomicReference<ThreadGroup> capturedGroup = new AtomicReference<ThreadGroup>();
+        final AtomicReference<ThreadGroup> capturedGroup = new AtomicReference<>();
         final Thread thread = new Thread(group, new Runnable() {
             @Override
             public void run() {
diff --git a/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java b/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java
index b32df7eb4f..d72a698166 100644
--- a/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java
@@ -46,7 +46,7 @@ public class NonStickyEventExecutorGroupTest {
 
     @Parameterized.Parameters(name = "{index}: maxTaskExecutePerRun = {0}")
     public static Collection<Object[]> data() throws Exception {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         params.add(new Object[] {64});
         params.add(new Object[] {256});
         params.add(new Object[] {1024});
@@ -65,8 +65,8 @@ public class NonStickyEventExecutorGroupTest {
         final NonStickyEventExecutorGroup nonStickyGroup = new NonStickyEventExecutorGroup(group, maxTaskExecutePerRun);
         try {
             final CountDownLatch startLatch = new CountDownLatch(1);
-            final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
-            List<Thread> threadList = new ArrayList<Thread>(threads);
+            final AtomicReference<Throwable> error = new AtomicReference<>();
+            List<Thread> threadList = new ArrayList<>(threads);
             for (int i = 0 ; i < threads; i++) {
                 Thread thread = new Thread(new Runnable() {
                     @Override
@@ -126,10 +126,10 @@ public class NonStickyEventExecutorGroupTest {
     private static void execute(EventExecutorGroup group, CountDownLatch startLatch) throws Throwable {
         EventExecutor executor = group.next();
         Assert.assertTrue(executor instanceof OrderedEventExecutor);
-        final AtomicReference<Throwable> cause = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> cause = new AtomicReference<>();
         final AtomicInteger last = new AtomicInteger();
         int tasks = 10000;
-        List<Future<?>> futures = new ArrayList<Future<?>>(tasks);
+        List<Future<?>> futures = new ArrayList<>(tasks);
         final CountDownLatch latch = new CountDownLatch(tasks);
         startLatch.await();
 
diff --git a/common/src/test/java/io/netty/util/concurrent/PromiseAggregatorTest.java b/common/src/test/java/io/netty/util/concurrent/PromiseAggregatorTest.java
index 06e3a017bf..38b7feb911 100644
--- a/common/src/test/java/io/netty/util/concurrent/PromiseAggregatorTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/PromiseAggregatorTest.java
@@ -40,7 +40,7 @@ public class PromiseAggregatorTest {
         @SuppressWarnings("unchecked")
         Promise<Void> p = mock(Promise.class);
         PromiseAggregator<Void, Future<Void>> a =
-                new PromiseAggregator<Void, Future<Void>>(p);
+                new PromiseAggregator<>(p);
         expectedException.expect(NullPointerException.class);
         a.add((Promise<Void>[]) null);
     }
@@ -50,7 +50,7 @@ public class PromiseAggregatorTest {
     public void testSuccessfulNoPending() throws Exception {
         Promise<Void> p = mock(Promise.class);
         PromiseAggregator<Void, Future<Void>> a =
-                new PromiseAggregator<Void, Future<Void>>(p);
+                new PromiseAggregator<>(p);
 
         Future<Void> future = mock(Future.class);
         when(p.setSuccess(null)).thenReturn(p);
@@ -66,7 +66,7 @@ public class PromiseAggregatorTest {
     public void testSuccessfulPending() throws Exception {
         Promise<Void> p = mock(Promise.class);
         PromiseAggregator<Void, Future<Void>> a =
-                new PromiseAggregator<Void, Future<Void>>(p);
+                new PromiseAggregator<>(p);
         Promise<Void> p1 = mock(Promise.class);
         Promise<Void> p2 = mock(Promise.class);
 
@@ -92,7 +92,7 @@ public class PromiseAggregatorTest {
     public void testFailedFutureFailPending() throws Exception {
         Promise<Void> p = mock(Promise.class);
         PromiseAggregator<Void, Future<Void>> a =
-                new PromiseAggregator<Void, Future<Void>>(p);
+                new PromiseAggregator<>(p);
         Promise<Void> p1 = mock(Promise.class);
         Promise<Void> p2 = mock(Promise.class);
         Throwable t = mock(Throwable.class);
@@ -119,7 +119,7 @@ public class PromiseAggregatorTest {
     public void testFailedFutureNoFailPending() throws Exception {
         Promise<Void> p = mock(Promise.class);
         PromiseAggregator<Void, Future<Void>> a =
-                new PromiseAggregator<Void, Future<Void>>(p, false);
+                new PromiseAggregator<>(p, false);
         Promise<Void> p1 = mock(Promise.class);
         Promise<Void> p2 = mock(Promise.class);
         Throwable t = mock(Throwable.class);
diff --git a/common/src/test/java/io/netty/util/concurrent/PromiseNotifierTest.java b/common/src/test/java/io/netty/util/concurrent/PromiseNotifierTest.java
index 600e868c69..29930cad5f 100644
--- a/common/src/test/java/io/netty/util/concurrent/PromiseNotifierTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/PromiseNotifierTest.java
@@ -30,14 +30,14 @@ public class PromiseNotifierTest {
     @Test
     public void testNullPromisesArray() {
         expectedException.expect(NullPointerException.class);
-        new PromiseNotifier<Void, Future<Void>>((Promise<Void>[]) null);
+        new PromiseNotifier<>((Promise<Void>[]) null);
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void testNullPromiseInArray() {
         expectedException.expect(IllegalArgumentException.class);
-        new PromiseNotifier<Void, Future<Void>>((Promise<Void>) null);
+        new PromiseNotifier<>((Promise<Void>) null);
     }
 
     @Test
@@ -49,7 +49,7 @@ public class PromiseNotifierTest {
 
         @SuppressWarnings("unchecked")
         PromiseNotifier<Void, Future<Void>> notifier =
-                new PromiseNotifier<Void, Future<Void>>(p1, p2);
+                new PromiseNotifier<>(p1, p2);
 
         @SuppressWarnings("unchecked")
         Future<Void> future = mock(Future.class);
@@ -72,7 +72,7 @@ public class PromiseNotifierTest {
 
         @SuppressWarnings("unchecked")
         PromiseNotifier<Void, Future<Void>> notifier =
-                new PromiseNotifier<Void, Future<Void>>(p1, p2);
+                new PromiseNotifier<>(p1, p2);
 
         @SuppressWarnings("unchecked")
         Future<Void> future = mock(Future.class);
diff --git a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java b/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java
index efb0eb015e..80e610ea00 100644
--- a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java
@@ -74,7 +74,7 @@ public class SingleThreadEventExecutorTest {
 
     @Test
     public void testThreadProperties() {
-        final AtomicReference<Thread> threadRef = new AtomicReference<Thread>();
+        final AtomicReference<Thread> threadRef = new AtomicReference<>();
         SingleThreadEventExecutor executor = new SingleThreadEventExecutor(
                 null, new DefaultThreadFactory("test"), false) {
             @Override
diff --git a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java b/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java
index b4adc8e99b..8ac391b0ed 100644
--- a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java
+++ b/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
 public class DefaultPriorityQueueTest {
     @Test
     public void testPoll() {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 0);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 0);
         assertEmptyQueue(queue);
 
         TestElement a = new TestElement(5);
@@ -79,7 +79,7 @@ public class DefaultPriorityQueueTest {
 
     @Test
     public void testClear() {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 0);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 0);
         assertEmptyQueue(queue);
 
         TestElement a = new TestElement(5);
@@ -111,7 +111,7 @@ public class DefaultPriorityQueueTest {
 
     @Test
     public void testClearIgnoringIndexes() {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 0);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 0);
         assertEmptyQueue(queue);
 
         TestElement a = new TestElement(5);
@@ -151,7 +151,7 @@ public class DefaultPriorityQueueTest {
     }
 
     private static void testRemoval(boolean typed) {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 4);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 4);
         assertEmptyQueue(queue);
 
         TestElement a = new TestElement(5);
@@ -200,7 +200,7 @@ public class DefaultPriorityQueueTest {
 
     @Test
     public void testZeroInitialSize() {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 0);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 0);
         assertEmptyQueue(queue);
         TestElement e = new TestElement(1);
         assertOffer(queue, e);
@@ -213,7 +213,7 @@ public class DefaultPriorityQueueTest {
 
     @Test
     public void testPriorityChange() {
-        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<TestElement>(TestElementComparator.INSTANCE, 0);
+        PriorityQueue<TestElement> queue = new DefaultPriorityQueue<>(TestElementComparator.INSTANCE, 0);
         assertEmptyQueue(queue);
         TestElement a = new TestElement(10);
         TestElement b = new TestElement(20);
@@ -243,7 +243,7 @@ public class DefaultPriorityQueueTest {
         f.value = 5;
         queue.priorityChanged(f);
 
-        List<TestElement> expectedOrderList = new ArrayList<TestElement>(queue.size());
+        List<TestElement> expectedOrderList = new ArrayList<>(queue.size());
         expectedOrderList.addAll(Arrays.asList(a, b, c, d, e, f));
         Collections.sort(expectedOrderList, TestElementComparator.INSTANCE);
 
diff --git a/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java b/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java
index 9a395eab25..aee49f99bb 100644
--- a/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java
+++ b/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java
@@ -32,7 +32,7 @@ public abstract class AbstractInternalLoggerTest<T> {
     protected String loggerName = "foo";
     protected T mockLog;
     protected InternalLogger logger;
-    protected final Map<String, Object> result = new HashMap<String, Object>();
+    protected final Map<String, Object> result = new HashMap<>();
 
     @SuppressWarnings("unchecked")
     protected <V> V getResult(String key) {
diff --git a/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
index 257eba81ae..e7037b3d68 100644
--- a/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
+++ b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
@@ -36,7 +36,7 @@ public class FactorialClientHandler extends SimpleChannelInboundHandler<BigInteg
     private ChannelHandlerContext ctx;
     private int receivedMessages;
     private int next = 1;
-    final BlockingQueue<BigInteger> answer = new LinkedBlockingQueue<BigInteger>();
+    final BlockingQueue<BigInteger> answer = new LinkedBlockingQueue<>();
 
     public BigInteger getFactorial() {
         boolean interrupted = false;
diff --git a/example/src/main/java/io/netty/example/http2/helloworld/client/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http2/helloworld/client/HttpResponseHandler.java
index 5ba8c9ebf2..1451e7348b 100644
--- a/example/src/main/java/io/netty/example/http2/helloworld/client/HttpResponseHandler.java
+++ b/example/src/main/java/io/netty/example/http2/helloworld/client/HttpResponseHandler.java
@@ -53,7 +53,7 @@ public class HttpResponseHandler extends SimpleChannelInboundHandler<FullHttpRes
      * @see HttpResponseHandler#awaitResponses(long, java.util.concurrent.TimeUnit)
      */
     public Entry<ChannelFuture, ChannelPromise> put(int streamId, ChannelFuture writeFuture, ChannelPromise promise) {
-        return streamidPromiseMap.put(streamId, new SimpleEntry<ChannelFuture, ChannelPromise>(writeFuture, promise));
+        return streamidPromiseMap.put(streamId, new SimpleEntry<>(writeFuture, promise));
     }
 
     /**
diff --git a/example/src/main/java/io/netty/example/http2/tiles/ImageCache.java b/example/src/main/java/io/netty/example/http2/tiles/ImageCache.java
index ad50d9f2e6..d9c0e451d5 100644
--- a/example/src/main/java/io/netty/example/http2/tiles/ImageCache.java
+++ b/example/src/main/java/io/netty/example/http2/tiles/ImageCache.java
@@ -31,7 +31,7 @@ public final class ImageCache {
 
     public static ImageCache INSTANCE = new ImageCache();
 
-    private final Map<String, ByteBuf> imageBank = new HashMap<String, ByteBuf>(200);
+    private final Map<String, ByteBuf> imageBank = new HashMap<>(200);
 
     private ImageCache() {
         init();
diff --git a/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
index 2f6580cb37..43d4db7ce2 100644
--- a/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
+++ b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
@@ -34,7 +34,7 @@ public class ObjectEchoClientHandler extends ChannelInboundHandlerAdapter {
      * Creates a client-side handler.
      */
     public ObjectEchoClientHandler() {
-        firstMessage = new ArrayList<Integer>(ObjectEchoClient.SIZE);
+        firstMessage = new ArrayList<>(ObjectEchoClient.SIZE);
         for (int i = 0; i < ObjectEchoClient.SIZE; i ++) {
             firstMessage.add(Integer.valueOf(i));
         }
diff --git a/example/src/main/java/io/netty/example/ocsp/OcspServerExample.java b/example/src/main/java/io/netty/example/ocsp/OcspServerExample.java
index 805126dc52..e28578dac1 100644
--- a/example/src/main/java/io/netty/example/ocsp/OcspServerExample.java
+++ b/example/src/main/java/io/netty/example/ocsp/OcspServerExample.java
@@ -183,7 +183,7 @@ public class OcspServerExample {
         JcaX509CertificateConverter converter = new JcaX509CertificateConverter()
                 .setProvider(new BouncyCastleProvider());
 
-        List<X509Certificate> dst = new ArrayList<X509Certificate>();
+        List<X509Certificate> dst = new ArrayList<>();
 
         PEMParser parser = new PEMParser(reader);
         try {
diff --git a/example/src/main/java/io/netty/example/redis/RedisClientHandler.java b/example/src/main/java/io/netty/example/redis/RedisClientHandler.java
index 89fb99c44d..b54bfee9ae 100644
--- a/example/src/main/java/io/netty/example/redis/RedisClientHandler.java
+++ b/example/src/main/java/io/netty/example/redis/RedisClientHandler.java
@@ -41,7 +41,7 @@ public class RedisClientHandler extends ChannelDuplexHandler {
     @Override
     public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
         String[] commands = ((String) msg).split("\\s+");
-        List<RedisMessage> children = new ArrayList<RedisMessage>(commands.length);
+        List<RedisMessage> children = new ArrayList<>(commands.length);
         for (String cmdString : commands) {
             children.add(new FullBulkStringRedisMessage(ByteBufUtil.writeUtf8(ctx.alloc(), cmdString)));
         }
diff --git a/example/src/main/java/io/netty/example/spdy/client/HttpResponseClientHandler.java b/example/src/main/java/io/netty/example/spdy/client/HttpResponseClientHandler.java
index 1b2c70e832..ac01cb1cd2 100644
--- a/example/src/main/java/io/netty/example/spdy/client/HttpResponseClientHandler.java
+++ b/example/src/main/java/io/netty/example/spdy/client/HttpResponseClientHandler.java
@@ -35,7 +35,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  */
 public class HttpResponseClientHandler extends SimpleChannelInboundHandler<HttpObject> {
 
-    private final BlockingQueue<ChannelFuture> queue = new LinkedBlockingQueue<ChannelFuture>();
+    private final BlockingQueue<ChannelFuture> queue = new LinkedBlockingQueue<>();
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
diff --git a/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java b/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java
index 3909624980..93574d7bf1 100644
--- a/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java
+++ b/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java
@@ -38,7 +38,7 @@ public class WorldClockClientHandler extends SimpleChannelInboundHandler<LocalTi
 
     // Stateful properties
     private volatile Channel channel;
-    private final BlockingQueue<LocalTimes> answer = new LinkedBlockingQueue<LocalTimes>();
+    private final BlockingQueue<LocalTimes> answer = new LinkedBlockingQueue<>();
 
     public WorldClockClientHandler() {
         super(false);
@@ -71,7 +71,7 @@ public class WorldClockClientHandler extends SimpleChannelInboundHandler<LocalTi
             Thread.currentThread().interrupt();
         }
 
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (LocalTime lt: localTimes.getLocalTimeList()) {
             result.add(
                     new Formatter().format(
diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java
index 6f0f325d64..465eb4c310 100644
--- a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java
+++ b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java
@@ -409,7 +409,7 @@ public class ProxyHandlerTest {
         );
 
         // Convert the test items to the list of constructor parameters.
-        List<Object[]> params = new ArrayList<Object[]>(items.size());
+        List<Object[]> params = new ArrayList<>(items.size());
         for (Object i: items) {
             params.add(new Object[] { i });
         }
@@ -454,8 +454,8 @@ public class ProxyHandlerTest {
 
     private static final class SuccessTestHandler extends SimpleChannelInboundHandler<Object> {
 
-        final Queue<String> received = new LinkedBlockingQueue<String>();
-        final Queue<Throwable> exceptions = new LinkedBlockingQueue<Throwable>();
+        final Queue<String> received = new LinkedBlockingQueue<>();
+        final Queue<Throwable> exceptions = new LinkedBlockingQueue<>();
         volatile int eventCount;
 
         private static void readIfNeeded(ChannelHandlerContext ctx) {
@@ -503,7 +503,7 @@ public class ProxyHandlerTest {
 
     private static final class FailureTestHandler extends SimpleChannelInboundHandler<Object> {
 
-        final Queue<Throwable> exceptions = new LinkedBlockingQueue<Throwable>();
+        final Queue<Throwable> exceptions = new LinkedBlockingQueue<>();
 
         /**
          * A latch that counts down when:
diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java
index b2a726d394..e305b9d0f3 100644
--- a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java
+++ b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java
@@ -52,7 +52,7 @@ abstract class ProxyServer {
     protected final InternalLogger logger = InternalLoggerFactory.getInstance(getClass());
 
     private final ServerSocketChannel ch;
-    private final Queue<Throwable> recordedExceptions = new LinkedBlockingQueue<Throwable>();
+    private final Queue<Throwable> recordedExceptions = new LinkedBlockingQueue<>();
     protected final TestMode testMode;
     protected final String username;
     protected final String password;
@@ -152,7 +152,7 @@ abstract class ProxyServer {
 
     protected abstract class IntermediaryHandler extends SimpleChannelInboundHandler<Object> {
 
-        private final Queue<Object> received = new ArrayDeque<Object>();
+        private final Queue<Object> received = new ArrayDeque<>();
 
         private boolean finished;
         private Channel backend;
diff --git a/handler/src/main/java/io/netty/handler/ssl/ApplicationProtocolUtil.java b/handler/src/main/java/io/netty/handler/ssl/ApplicationProtocolUtil.java
index 0581e9b2c2..edd2527c51 100644
--- a/handler/src/main/java/io/netty/handler/ssl/ApplicationProtocolUtil.java
+++ b/handler/src/main/java/io/netty/handler/ssl/ApplicationProtocolUtil.java
@@ -36,7 +36,7 @@ final class ApplicationProtocolUtil {
             return null;
         }
 
-        List<String> result = new ArrayList<String>(initialListSize);
+        List<String> result = new ArrayList<>(initialListSize);
         for (String p : protocols) {
             if (p == null || p.isEmpty()) {
                 throw new IllegalArgumentException("protocol cannot be null or empty");
@@ -60,7 +60,7 @@ final class ApplicationProtocolUtil {
             return null;
         }
 
-        List<String> result = new ArrayList<String>(initialListSize);
+        List<String> result = new ArrayList<>(initialListSize);
         for (String p : protocols) {
             if (p == null || p.isEmpty()) {
                 throw new IllegalArgumentException("protocol cannot be null or empty");
diff --git a/handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java b/handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java
index 94e951f7f5..616b0dbd80 100644
--- a/handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java
+++ b/handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java
@@ -102,13 +102,13 @@ final class CipherSuiteConverter {
     private static final Map<String, Map<String, String>> o2jTls13;
 
     static {
-        Map<String, String> j2oTls13Map = new HashMap<String, String>();
+        Map<String, String> j2oTls13Map = new HashMap<>();
         j2oTls13Map.put("TLS_AES_128_GCM_SHA256", "AEAD-AES128-GCM-SHA256");
         j2oTls13Map.put("TLS_AES_256_GCM_SHA384", "AEAD-AES256-GCM-SHA384");
         j2oTls13Map.put("TLS_CHACHA20_POLY1305_SHA256", "AEAD-CHACHA20-POLY1305-SHA256");
         j2oTls13 = Collections.unmodifiableMap(j2oTls13Map);
 
-        Map<String, Map<String, String>> o2jTls13Map = new HashMap<String, Map<String, String>>();
+        Map<String, Map<String, String>> o2jTls13Map = new HashMap<>();
         o2jTls13Map.put("TLS_AES_128_GCM_SHA256", singletonMap("TLS", "TLS_AES_128_GCM_SHA256"));
         o2jTls13Map.put("TLS_AES_256_GCM_SHA384", singletonMap("TLS", "TLS_AES_256_GCM_SHA384"));
         o2jTls13Map.put("TLS_CHACHA20_POLY1305_SHA256", singletonMap("TLS", "TLS_CHACHA20_POLY1305_SHA256"));
@@ -174,7 +174,7 @@ final class CipherSuiteConverter {
 
         // Cache the reverse mapping after stripping the protocol prefix (TLS_ or SSL_)
         final String javaCipherSuiteSuffix = javaCipherSuite.substring(4);
-        Map<String, String> p2j = new HashMap<String, String>(4);
+        Map<String, String> p2j = new HashMap<>(4);
         p2j.put("", javaCipherSuiteSuffix);
         p2j.put("SSL", "SSL_" + javaCipherSuiteSuffix);
         p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
@@ -317,7 +317,7 @@ final class CipherSuiteConverter {
         final String javaCipherSuiteTls = "TLS_" + javaCipherSuiteSuffix;
 
         // Cache the mapping.
-        final Map<String, String> p2j = new HashMap<String, String>(4);
+        final Map<String, String> p2j = new HashMap<>(4);
         p2j.put("", javaCipherSuiteSuffix);
         p2j.put("SSL", javaCipherSuiteSsl);
         p2j.put("TLS", javaCipherSuiteTls);
diff --git a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java
index d9767a7106..16b564b7dc 100644
--- a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java
@@ -139,7 +139,7 @@ abstract class ConscryptAlpnSslEngine extends JdkSslEngine {
 
             protocolSelector = checkNotNull(applicationNegotiator.protocolSelectorFactory()
                             .newSelector(this,
-                                    new LinkedHashSet<String>(applicationNegotiator.protocols())),
+                                    new LinkedHashSet<>(applicationNegotiator.protocols())),
                     "protocolSelector");
         }
 
diff --git a/handler/src/main/java/io/netty/handler/ssl/IdentityCipherSuiteFilter.java b/handler/src/main/java/io/netty/handler/ssl/IdentityCipherSuiteFilter.java
index 9f21981034..44ace74357 100644
--- a/handler/src/main/java/io/netty/handler/ssl/IdentityCipherSuiteFilter.java
+++ b/handler/src/main/java/io/netty/handler/ssl/IdentityCipherSuiteFilter.java
@@ -49,7 +49,7 @@ public final class IdentityCipherSuiteFilter implements CipherSuiteFilter {
                     defaultCiphers.toArray(new String[0]) :
                     supportedCiphers.toArray(new String[0]);
         } else {
-            List<String> newCiphers = new ArrayList<String>(supportedCiphers.size());
+            List<String> newCiphers = new ArrayList<>(supportedCiphers.size());
             for (String c : ciphers) {
                 if (c == null) {
                     break;
diff --git a/handler/src/main/java/io/netty/handler/ssl/Java8SslUtils.java b/handler/src/main/java/io/netty/handler/ssl/Java8SslUtils.java
index c47d965712..523ccacdcf 100644
--- a/handler/src/main/java/io/netty/handler/ssl/Java8SslUtils.java
+++ b/handler/src/main/java/io/netty/handler/ssl/Java8SslUtils.java
@@ -34,7 +34,7 @@ final class Java8SslUtils {
         if (names == null || names.isEmpty()) {
             return Collections.emptyList();
         }
-        List<String> strings = new ArrayList<String>(names.size());
+        List<String> strings = new ArrayList<>(names.size());
 
         for (SNIServerName serverName : names) {
             if (serverName instanceof SNIHostName) {
@@ -55,7 +55,7 @@ final class Java8SslUtils {
         if (names == null || names.isEmpty()) {
             return Collections.emptyList();
         }
-        List<SNIServerName> sniServerNames = new ArrayList<SNIServerName>(names.size());
+        List<SNIServerName> sniServerNames = new ArrayList<>(names.size());
         for (String name: names) {
             sniServerNames.add(new SNIHostName(name));
         }
diff --git a/handler/src/main/java/io/netty/handler/ssl/Java9SslEngine.java b/handler/src/main/java/io/netty/handler/ssl/Java9SslEngine.java
index 5910855b41..546868bff0 100644
--- a/handler/src/main/java/io/netty/handler/ssl/Java9SslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/Java9SslEngine.java
@@ -82,7 +82,7 @@ final class Java9SslEngine extends JdkSslEngine {
         if (isServer) {
             selectionListener = null;
             alpnSelector = new AlpnSelector(applicationNegotiator.protocolSelectorFactory().
-                    newSelector(this, new LinkedHashSet<String>(applicationNegotiator.protocols())));
+                    newSelector(this, new LinkedHashSet<>(applicationNegotiator.protocols())));
             Java9SslUtils.setHandshakeApplicationProtocolSelector(engine, alpnSelector);
         } else {
             selectionListener = applicationNegotiator.protocolListenerFactory()
diff --git a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
index d74bbdec98..00e3e2fba8 100644
--- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
@@ -83,11 +83,11 @@ public class JdkSslContext extends SslContext {
         SUPPORTED_CIPHERS = Collections.unmodifiableSet(supportedCiphers(engine));
         DEFAULT_CIPHERS = Collections.unmodifiableList(defaultCiphers(engine, SUPPORTED_CIPHERS));
 
-        List<String> ciphersNonTLSv13 = new ArrayList<String>(DEFAULT_CIPHERS);
+        List<String> ciphersNonTLSv13 = new ArrayList<>(DEFAULT_CIPHERS);
         ciphersNonTLSv13.removeAll(Arrays.asList(SslUtils.DEFAULT_TLSV13_CIPHER_SUITES));
         DEFAULT_CIPHERS_NON_TLSV13 = Collections.unmodifiableList(ciphersNonTLSv13);
 
-        Set<String> suppertedCiphersNonTLSv13 = new LinkedHashSet<String>(SUPPORTED_CIPHERS);
+        Set<String> suppertedCiphersNonTLSv13 = new LinkedHashSet<>(SUPPORTED_CIPHERS);
         suppertedCiphersNonTLSv13.removeAll(Arrays.asList(SslUtils.DEFAULT_TLSV13_CIPHER_SUITES));
         SUPPORTED_CIPHERS_NON_TLSV13 = Collections.unmodifiableSet(suppertedCiphersNonTLSv13);
 
@@ -100,11 +100,11 @@ public class JdkSslContext extends SslContext {
     private static String[] defaultProtocols(SSLEngine engine) {
         // Choose the sensible default list of protocols.
         final String[] supportedProtocols = engine.getSupportedProtocols();
-        Set<String> supportedProtocolsSet = new HashSet<String>(supportedProtocols.length);
+        Set<String> supportedProtocolsSet = new HashSet<>(supportedProtocols.length);
         for (int i = 0; i < supportedProtocols.length; ++i) {
             supportedProtocolsSet.add(supportedProtocols[i]);
         }
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         addIfSupported(
                 supportedProtocolsSet, protocols,
                 // Do not include TLSv1.3 for now by default.
@@ -119,7 +119,7 @@ public class JdkSslContext extends SslContext {
     private static Set<String> supportedCiphers(SSLEngine engine) {
         // Choose the sensible default list of cipher suites.
         final String[] supportedCiphers = engine.getSupportedCipherSuites();
-        Set<String> supportedCiphersSet = new LinkedHashSet<String>(supportedCiphers.length);
+        Set<String> supportedCiphersSet = new LinkedHashSet<>(supportedCiphers.length);
         for (int i = 0; i < supportedCiphers.length; ++i) {
             String supportedCipher = supportedCiphers[i];
             supportedCiphersSet.add(supportedCipher);
@@ -146,7 +146,7 @@ public class JdkSslContext extends SslContext {
     }
 
     private static List<String> defaultCiphers(SSLEngine engine, Set<String> supportedCiphers) {
-        List<String> ciphers = new ArrayList<String>();
+        List<String> ciphers = new ArrayList<>();
         addIfSupported(supportedCiphers, ciphers, DEFAULT_CIPHER_SUITES);
         useFallbackCiphersIfDefaultIsEmpty(ciphers, engine.getEnabledCipherSuites());
         return ciphers;
diff --git a/handler/src/main/java/io/netty/handler/ssl/JettyAlpnSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/JettyAlpnSslEngine.java
index ce9f14a57e..342b49b6e4 100644
--- a/handler/src/main/java/io/netty/handler/ssl/JettyAlpnSslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JettyAlpnSslEngine.java
@@ -117,7 +117,7 @@ abstract class JettyAlpnSslEngine extends JdkSslEngine {
             super(engine);
             checkNotNull(applicationNegotiator, "applicationNegotiator");
             final ProtocolSelector protocolSelector = checkNotNull(applicationNegotiator.protocolSelectorFactory()
-                            .newSelector(this, new LinkedHashSet<String>(applicationNegotiator.protocols())),
+                            .newSelector(this, new LinkedHashSet<>(applicationNegotiator.protocols())),
                     "protocolSelector");
             ALPN.put(engine, new ALPN.ServerProvider() {
                 @Override
diff --git a/handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java
index 77e7366e53..9e10465817 100644
--- a/handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java
@@ -82,7 +82,7 @@ final class JettyNpnSslEngine extends JdkSslEngine {
             });
         } else {
             final ProtocolSelector protocolSelector = checkNotNull(applicationNegotiator.protocolSelectorFactory()
-                    .newSelector(this, new LinkedHashSet<String>(applicationNegotiator.protocols())),
+                    .newSelector(this, new LinkedHashSet<>(applicationNegotiator.protocols())),
                     "protocolSelector");
             NextProtoNego.put(engine, new ClientProvider() {
                 @Override
diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSsl.java b/handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
index 78a528ff98..fa7f33a4b8 100644
--- a/handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
+++ b/handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
@@ -130,8 +130,8 @@ public final class OpenSsl {
         if (cause == null) {
             logger.debug("netty-tcnative using native library: {}", SSL.versionString());
 
-            final List<String> defaultCiphers = new ArrayList<String>();
-            final Set<String> availableOpenSslCipherSuites = new LinkedHashSet<String>(128);
+            final List<String> defaultCiphers = new ArrayList<>();
+            final Set<String> availableOpenSslCipherSuites = new LinkedHashSet<>(128);
             boolean supportsKeyManagerFactory = false;
             boolean useKeyManagerFactory = false;
             boolean supportsHostNameValidation = false;
@@ -226,7 +226,7 @@ public final class OpenSsl {
                 logger.warn("Failed to get the list of available OpenSSL cipher suites.", e);
             }
             AVAILABLE_OPENSSL_CIPHER_SUITES = Collections.unmodifiableSet(availableOpenSslCipherSuites);
-            final Set<String> availableJavaCipherSuites = new LinkedHashSet<String>(
+            final Set<String> availableJavaCipherSuites = new LinkedHashSet<>(
                     AVAILABLE_OPENSSL_CIPHER_SUITES.size() * 2);
             for (String cipher: AVAILABLE_OPENSSL_CIPHER_SUITES) {
                 // Included converted but also openssl cipher name
@@ -247,7 +247,7 @@ public final class OpenSsl {
 
             AVAILABLE_JAVA_CIPHER_SUITES = Collections.unmodifiableSet(availableJavaCipherSuites);
 
-            final Set<String> availableCipherSuites = new LinkedHashSet<String>(
+            final Set<String> availableCipherSuites = new LinkedHashSet<>(
                     AVAILABLE_OPENSSL_CIPHER_SUITES.size() + AVAILABLE_JAVA_CIPHER_SUITES.size());
             availableCipherSuites.addAll(AVAILABLE_OPENSSL_CIPHER_SUITES);
             availableCipherSuites.addAll(AVAILABLE_JAVA_CIPHER_SUITES);
@@ -257,7 +257,7 @@ public final class OpenSsl {
             SUPPORTS_HOSTNAME_VALIDATION = supportsHostNameValidation;
             USE_KEYMANAGER_FACTORY = useKeyManagerFactory;
 
-            Set<String> protocols = new LinkedHashSet<String>(6);
+            Set<String> protocols = new LinkedHashSet<>(6);
             // Seems like there is no way to explicitly disable SSLv2Hello in openssl so it is always enabled
             protocols.add(PROTOCOL_SSL_V2_HELLO);
             if (doesSupportProtocol(SSL.SSL_PROTOCOL_SSLV2, SSL.SSL_OP_NO_SSLv2)) {
@@ -510,7 +510,7 @@ public final class OpenSsl {
         String os = PlatformDependent.normalizedOs();
         String arch = PlatformDependent.normalizedArch();
 
-        Set<String> libNames = new LinkedHashSet<String>(4);
+        Set<String> libNames = new LinkedHashSet<>(4);
         String staticLibName = "netty_tcnative";
 
         // First, try loading the platform-specific library. Platform-specific
diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslCachingKeyMaterialProvider.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslCachingKeyMaterialProvider.java
index db8779bdbd..92a496cc1d 100644
--- a/handler/src/main/java/io/netty/handler/ssl/OpenSslCachingKeyMaterialProvider.java
+++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslCachingKeyMaterialProvider.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 final class OpenSslCachingKeyMaterialProvider extends OpenSslKeyMaterialProvider {
 
-    private final ConcurrentMap<String, OpenSslKeyMaterial> cache = new ConcurrentHashMap<String, OpenSslKeyMaterial>();
+    private final ConcurrentMap<String, OpenSslKeyMaterial> cache = new ConcurrentHashMap<>();
 
     OpenSslCachingKeyMaterialProvider(X509KeyManager keyManager, String password) {
         super(keyManager, password);
diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslKeyMaterialManager.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslKeyMaterialManager.java
index 9f0e0199ef..0e2e2c3fd2 100644
--- a/handler/src/main/java/io/netty/handler/ssl/OpenSslKeyMaterialManager.java
+++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslKeyMaterialManager.java
@@ -48,7 +48,7 @@ final class OpenSslKeyMaterialManager {
     static final String KEY_TYPE_EC_RSA = "EC_RSA";
 
     // key type mappings for types.
-    private static final Map<String, String> KEY_TYPES = new HashMap<String, String>();
+    private static final Map<String, String> KEY_TYPES = new HashMap<>();
     static {
         KEY_TYPES.put("RSA", KEY_TYPE_RSA);
         KEY_TYPES.put("DHE_RSA", KEY_TYPE_RSA);
@@ -68,7 +68,7 @@ final class OpenSslKeyMaterialManager {
     void setKeyMaterialServerSide(ReferenceCountedOpenSslEngine engine) throws SSLException {
         long ssl = engine.sslPointer();
         String[] authMethods = SSL.authenticationMethods(ssl);
-        Set<String> aliases = new HashSet<String>(authMethods.length);
+        Set<String> aliases = new HashSet<>(authMethods.length);
         for (String authMethod : authMethods) {
             String type = KEY_TYPES.get(authMethod);
             if (type != null) {
diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java
index 90d94cb656..4ae7557b86 100644
--- a/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java
+++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java
@@ -181,7 +181,7 @@ public final class OpenSslX509KeyManagerFactory extends KeyManagerFactory {
                 OpenSslPopulatedKeyMaterialProvider(
                         X509KeyManager keyManager, String password, Iterable<String> aliases) {
                     super(keyManager, password);
-                    materialMap = new HashMap<String, Object>();
+                    materialMap = new HashMap<>();
                     boolean initComplete = false;
                     try {
                         for (String alias: aliases) {
diff --git a/handler/src/main/java/io/netty/handler/ssl/PemReader.java b/handler/src/main/java/io/netty/handler/ssl/PemReader.java
index 4cddad9c91..091d859816 100644
--- a/handler/src/main/java/io/netty/handler/ssl/PemReader.java
+++ b/handler/src/main/java/io/netty/handler/ssl/PemReader.java
@@ -78,7 +78,7 @@ final class PemReader {
             throw new CertificateException("failed to read certificate input stream", e);
         }
 
-        List<ByteBuf> certs = new ArrayList<ByteBuf>();
+        List<ByteBuf> certs = new ArrayList<>();
         Matcher m = CERT_PATTERN.matcher(content);
         int start = 0;
         for (;;) {
diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java
index f508971f01..b562885e5e 100644
--- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java
+++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java
@@ -50,12 +50,12 @@ import javax.security.auth.x500.X500Principal;
 public final class ReferenceCountedOpenSslClientContext extends ReferenceCountedOpenSslContext {
     private static final InternalLogger logger =
             InternalLoggerFactory.getInstance(ReferenceCountedOpenSslClientContext.class);
-    private static final Set<String> SUPPORTED_KEY_TYPES = Collections.unmodifiableSet(new LinkedHashSet<String>(
+    private static final Set<String> SUPPORTED_KEY_TYPES = Collections.unmodifiableSet(new LinkedHashSet<>(
             Arrays.asList(OpenSslKeyMaterialManager.KEY_TYPE_RSA,
-                          OpenSslKeyMaterialManager.KEY_TYPE_DH_RSA,
-                          OpenSslKeyMaterialManager.KEY_TYPE_EC,
-                          OpenSslKeyMaterialManager.KEY_TYPE_EC_RSA,
-                          OpenSslKeyMaterialManager.KEY_TYPE_EC_EC)));
+                    OpenSslKeyMaterialManager.KEY_TYPE_DH_RSA,
+                    OpenSslKeyMaterialManager.KEY_TYPE_EC,
+                    OpenSslKeyMaterialManager.KEY_TYPE_EC_RSA,
+                    OpenSslKeyMaterialManager.KEY_TYPE_EC_EC)));
     private final OpenSslSessionContext sessionContext;
 
     ReferenceCountedOpenSslClientContext(X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory,
@@ -289,7 +289,7 @@ public final class ReferenceCountedOpenSslClientContext extends ReferenceCounted
                 // Try all of the supported key types.
                 return SUPPORTED_KEY_TYPES;
             }
-            Set<String> result = new HashSet<String>(clientCertificateTypes.length);
+            Set<String> result = new HashSet<>(clientCertificateTypes.length);
             for (byte keyTypeCode : clientCertificateTypes) {
                 String keyType = clientKeyType(keyTypeCode);
                 if (keyType == null) {
diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
index 4dba2ec522..9c1254c8f7 100644
--- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
@@ -289,7 +289,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
                                 if (algs == null) {
                                     peerSupportedSignatureAlgorithms = EmptyArrays.EMPTY_STRINGS;
                                 } else {
-                                    Set<String> algorithmList = new LinkedHashSet<String>(algs.length);
+                                    Set<String> algorithmList = new LinkedHashSet<>(algs.length);
                                     for (String alg: algs) {
                                         String converted = SignatureAlgorithmConverter.toJavaName(alg);
 
@@ -1397,7 +1397,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
         if (enabled == null) {
             return EmptyArrays.EMPTY_STRINGS;
         } else {
-            List<String> enabledList = new ArrayList<String>();
+            List<String> enabledList = new ArrayList<>();
             synchronized (this) {
                 for (int i = 0; i < enabled.length; i++) {
                     String mapped = toJavaCipherSuite(enabled[i]);
@@ -1455,7 +1455,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
 
     @Override
     public final String[] getEnabledProtocols() {
-        List<String> enabled = new ArrayList<String>(6);
+        List<String> enabled = new ArrayList<>(6);
         // Seems like there is no way to explicit disable SSLv2Hello in openssl so it is always enabled
         enabled.add(PROTOCOL_SSL_V2_HELLO);
 
@@ -2028,7 +2028,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
                 Map<String, Object> values = this.values;
                 if (values == null) {
                     // Use size of 2 to keep the memory overhead small
-                    values = this.values = new HashMap<String, Object>(2);
+                    values = this.values = new HashMap<>(2);
                 }
                 old = values.put(name, value);
             }
diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
index 1cb479533d..430364e1d1 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -1469,7 +1469,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
                 task.run();
             }
         } else {
-            final List<Runnable> tasks = new ArrayList<Runnable>(2);
+            final List<Runnable> tasks = new ArrayList<>(2);
             for (;;) {
                 final Runnable task = engine.getDelegatedTask();
                 if (task == null) {
@@ -1728,7 +1728,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
         if (!oldHandshakePromise.isDone()) {
             // There's no need to handshake because handshake is in progress already.
             // Merge the new promise into the old one.
-            oldHandshakePromise.addListener(new PromiseNotifier<Channel, Future<Channel>>(newHandshakePromise));
+            oldHandshakePromise.addListener(new PromiseNotifier<>(newHandshakePromise));
         } else {
             handshakePromise = newHandshakePromise;
             handshake();
diff --git a/handler/src/main/java/io/netty/handler/ssl/SslUtils.java b/handler/src/main/java/io/netty/handler/ssl/SslUtils.java
index e7640365ad..7f2204d9d4 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslUtils.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslUtils.java
@@ -42,10 +42,10 @@ import static java.util.Arrays.asList;
  */
 final class SslUtils {
     // See https://tools.ietf.org/html/rfc8446#appendix-B.4
-    static final Set<String> TLSV13_CIPHERS = Collections.unmodifiableSet(new LinkedHashSet<String>(
+    static final Set<String> TLSV13_CIPHERS = Collections.unmodifiableSet(new LinkedHashSet<>(
             asList("TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256",
-                          "TLS_AES_128_GCM_SHA256", "TLS_AES_128_CCM_8_SHA256",
-                          "TLS_AES_128_CCM_SHA256")));
+                    "TLS_AES_128_GCM_SHA256", "TLS_AES_128_CCM_8_SHA256",
+                    "TLS_AES_128_CCM_SHA256")));
     // Protocols
     static final String PROTOCOL_SSL_V2_HELLO = "SSLv2Hello";
     static final String PROTOCOL_SSL_V2 = "SSLv2";
@@ -108,7 +108,7 @@ final class SslUtils {
             DEFAULT_TLSV13_CIPHER_SUITES = EmptyArrays.EMPTY_STRINGS;
         }
 
-        List<String> defaultCiphers = new ArrayList<String>();
+        List<String> defaultCiphers = new ArrayList<>();
         // GCM (Galois/Counter Mode) requires JDK 8.
         defaultCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384");
         defaultCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256");
diff --git a/handler/src/main/java/io/netty/handler/ssl/SupportedCipherSuiteFilter.java b/handler/src/main/java/io/netty/handler/ssl/SupportedCipherSuiteFilter.java
index 265672309f..d4baea85a8 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SupportedCipherSuiteFilter.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SupportedCipherSuiteFilter.java
@@ -40,10 +40,10 @@ public final class SupportedCipherSuiteFilter implements CipherSuiteFilter {
 
         final List<String> newCiphers;
         if (ciphers == null) {
-            newCiphers = new ArrayList<String>(defaultCiphers.size());
+            newCiphers = new ArrayList<>(defaultCiphers.size());
             ciphers = defaultCiphers;
         } else {
-            newCiphers = new ArrayList<String>(supportedCiphers.size());
+            newCiphers = new ArrayList<>(supportedCiphers.size());
         }
         for (String c : ciphers) {
             if (c == null) {
diff --git a/handler/src/main/java/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java b/handler/src/main/java/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java
index 454334501e..94590ad3b7 100644
--- a/handler/src/main/java/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java
+++ b/handler/src/main/java/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java
@@ -160,7 +160,7 @@ public final class FingerprintTrustManagerFactory extends SimpleTrustManagerFact
             throw new NullPointerException("fingerprints");
         }
 
-        List<byte[]> list = new ArrayList<byte[]>(fingerprints.length);
+        List<byte[]> list = new ArrayList<>(fingerprints.length);
         for (byte[] f: fingerprints) {
             if (f == null) {
                 break;
@@ -180,7 +180,7 @@ public final class FingerprintTrustManagerFactory extends SimpleTrustManagerFact
             throw new NullPointerException("fingerprints");
         }
 
-        List<byte[]> list = new ArrayList<byte[]>();
+        List<byte[]> list = new ArrayList<>();
         for (String f: fingerprints) {
             if (f == null) {
                 break;
diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
index f39328dff7..47569e1b14 100644
--- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
+++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
@@ -70,7 +70,7 @@ public class ChunkedWriteHandler extends ChannelDuplexHandler {
     private static final InternalLogger logger =
         InternalLoggerFactory.getInstance(ChunkedWriteHandler.class);
 
-    private final Queue<PendingWrite> queue = new ArrayDeque<PendingWrite>();
+    private final Queue<PendingWrite> queue = new ArrayDeque<>();
     private volatile ChannelHandlerContext ctx;
     private PendingWrite currentWrite;
 
diff --git a/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
index 8074a6a344..bdf7aee9a2 100644
--- a/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
@@ -63,7 +63,7 @@ import java.util.concurrent.TimeUnit;
  * </ul>
  */
 public class ChannelTrafficShapingHandler extends AbstractTrafficShapingHandler {
-    private final ArrayDeque<ToSend> messagesQueue = new ArrayDeque<ToSend>();
+    private final ArrayDeque<ToSend> messagesQueue = new ArrayDeque<>();
     private long queueSize;
 
     /**
diff --git a/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java
index 02b1697d86..a850b8ac00 100644
--- a/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java
@@ -461,7 +461,7 @@ public class GlobalChannelTrafficShapingHandler extends AbstractTrafficShapingHa
         PerChannel perChannel = channelQueues.get(key);
         if (perChannel == null) {
             perChannel = new PerChannel();
-            perChannel.messagesQueue = new ArrayDeque<ToSend>();
+            perChannel.messagesQueue = new ArrayDeque<>();
             // Don't start it since managed through the Global one
             perChannel.channelTrafficCounter = new TrafficCounter(this, null, "ChannelTC" +
                     ctx.channel().hashCode(), checkInterval);
diff --git a/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
index ad624f85b8..9a516a670d 100644
--- a/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -243,7 +243,7 @@ public class GlobalTrafficShapingHandler extends AbstractTrafficShapingHandler {
         PerChannel perChannel = channelQueues.get(key);
         if (perChannel == null) {
             perChannel = new PerChannel();
-            perChannel.messagesQueue = new ArrayDeque<ToSend>();
+            perChannel.messagesQueue = new ArrayDeque<>();
             perChannel.queueSize = 0L;
             perChannel.lastReadTimestamp = TrafficCounter.milliSecondFromNano();
             perChannel.lastWriteTimestamp = perChannel.lastReadTimestamp;
diff --git a/handler/src/test/java/io/netty/handler/flow/FlowControlHandlerTest.java b/handler/src/test/java/io/netty/handler/flow/FlowControlHandlerTest.java
index a4effb1f01..57e3edeef2 100644
--- a/handler/src/test/java/io/netty/handler/flow/FlowControlHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/flow/FlowControlHandlerTest.java
@@ -158,7 +158,7 @@ public class FlowControlHandlerTest {
      */
     @Test
     public void testAutoReadingOff() throws Exception {
-        final Exchanger<Channel> peerRef = new Exchanger<Channel>();
+        final Exchanger<Channel> peerRef = new Exchanger<>();
         final CountDownLatch latch = new CountDownLatch(3);
 
         ChannelInboundHandlerAdapter handler = new ChannelInboundHandlerAdapter() {
@@ -237,7 +237,7 @@ public class FlowControlHandlerTest {
      */
     @Test
     public void testFlowToggleAutoRead() throws Exception {
-        final Exchanger<Channel> peerRef = new Exchanger<Channel>();
+        final Exchanger<Channel> peerRef = new Exchanger<>();
         final CountDownLatch msgRcvLatch1 = new CountDownLatch(1);
         final CountDownLatch msgRcvLatch2 = new CountDownLatch(1);
         final CountDownLatch msgRcvLatch3 = new CountDownLatch(1);
@@ -319,7 +319,7 @@ public class FlowControlHandlerTest {
      */
     @Test
     public void testFlowAutoReadOff() throws Exception {
-        final Exchanger<Channel> peerRef = new Exchanger<Channel>();
+        final Exchanger<Channel> peerRef = new Exchanger<>();
         final CountDownLatch msgRcvLatch1 = new CountDownLatch(1);
         final CountDownLatch msgRcvLatch2 = new CountDownLatch(2);
         final CountDownLatch msgRcvLatch3 = new CountDownLatch(3);
diff --git a/handler/src/test/java/io/netty/handler/logging/LoggingHandlerTest.java b/handler/src/test/java/io/netty/handler/logging/LoggingHandlerTest.java
index 28416888ba..1c25338490 100644
--- a/handler/src/test/java/io/netty/handler/logging/LoggingHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/logging/LoggingHandlerTest.java
@@ -57,7 +57,7 @@ public class LoggingHandlerTest {
     private static final Logger rootLogger = (Logger) LoggerFactory.getLogger(ROOT_LOGGER_NAME);
     private static final Logger logger = (Logger) LoggerFactory.getLogger(LOGGER_NAME);
 
-    private static final List<Appender<ILoggingEvent>> oldAppenders = new ArrayList<Appender<ILoggingEvent>>();
+    private static final List<Appender<ILoggingEvent>> oldAppenders = new ArrayList<>();
     /**
      * Custom logback appender which gets used to match on log messages.
      */
diff --git a/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java b/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java
index 2b4323bc16..26998b68de 100644
--- a/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java
@@ -68,7 +68,7 @@ public class CipherSuiteCanaryTest {
 
     @Parameters(name = "{index}: serverSslProvider = {0}, clientSslProvider = {1}, rfcCipherName = {2}")
     public static Collection<Object[]> parameters() {
-       List<Object[]> dst = new ArrayList<Object[]>();
+       List<Object[]> dst = new ArrayList<>();
        dst.addAll(expand("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256")); // DHE-RSA-AES128-GCM-SHA256
        return dst;
     }
@@ -253,7 +253,7 @@ public class CipherSuiteCanaryTest {
     }
 
     private static List<Object[]> expand(String rfcCipherName) {
-        List<Object[]> dst = new ArrayList<Object[]>();
+        List<Object[]> dst = new ArrayList<>();
         SslProvider[] sslProviders = SslProvider.values();
 
         for (int i = 0; i < sslProviders.length; i++) {
diff --git a/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java b/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java
index 0976264d7a..17daeb203f 100644
--- a/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java
@@ -33,7 +33,7 @@ public class ConscryptJdkSslEngineInteropTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
         }
diff --git a/handler/src/test/java/io/netty/handler/ssl/ConscryptSslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/ConscryptSslEngineTest.java
index 7d06840990..2003d40c7a 100644
--- a/handler/src/test/java/io/netty/handler/ssl/ConscryptSslEngineTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/ConscryptSslEngineTest.java
@@ -32,7 +32,7 @@ public class ConscryptSslEngineTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
         }
diff --git a/handler/src/test/java/io/netty/handler/ssl/IdentityCipherSuiteFilterTest.java b/handler/src/test/java/io/netty/handler/ssl/IdentityCipherSuiteFilterTest.java
index fd2dad8dc8..730dc20b91 100644
--- a/handler/src/test/java/io/netty/handler/ssl/IdentityCipherSuiteFilterTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/IdentityCipherSuiteFilterTest.java
@@ -29,7 +29,7 @@ public class IdentityCipherSuiteFilterTest {
     @Test
     public void regularInstanceDefaultsToDefaultCiphers() {
         List<String> defaultCiphers = Arrays.asList("FOO", "BAR");
-        Set<String> supportedCiphers = new HashSet<String>(Arrays.asList("BAZ", "QIX"));
+        Set<String> supportedCiphers = new HashSet<>(Arrays.asList("BAZ", "QIX"));
         String[] filtered = IdentityCipherSuiteFilter.INSTANCE
                 .filterCipherSuites(null, defaultCiphers, supportedCiphers);
         assertArrayEquals(defaultCiphers.toArray(), filtered);
@@ -38,7 +38,7 @@ public class IdentityCipherSuiteFilterTest {
     @Test
     public void alternativeInstanceDefaultsToSupportedCiphers() {
         List<String> defaultCiphers = Arrays.asList("FOO", "BAR");
-        Set<String> supportedCiphers = new HashSet<String>(Arrays.asList("BAZ", "QIX"));
+        Set<String> supportedCiphers = new HashSet<>(Arrays.asList("BAZ", "QIX"));
         String[] filtered = IdentityCipherSuiteFilter.INSTANCE_DEFAULTING_TO_SUPPORTED_CIPHERS
                 .filterCipherSuites(null, defaultCiphers, supportedCiphers);
         assertArrayEquals(supportedCiphers.toArray(), filtered);
diff --git a/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java b/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java
index 309490af59..82d94363f3 100644
--- a/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java
@@ -34,7 +34,7 @@ public class JdkConscryptSslEngineInteropTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
         }
diff --git a/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java b/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java
index 45b3c7e5e0..31e11c30b7 100644
--- a/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java
@@ -35,7 +35,7 @@ public class JdkOpenSslEngineInteroptTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
 
diff --git a/handler/src/test/java/io/netty/handler/ssl/JdkSslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/JdkSslEngineTest.java
index 74f000fd01..58408650c6 100644
--- a/handler/src/test/java/io/netty/handler/ssl/JdkSslEngineTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/JdkSslEngineTest.java
@@ -144,7 +144,7 @@ public class JdkSslEngineTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: providerType = {0}, bufferType = {1}, combo = {2}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (ProviderType providerType : ProviderType.values()) {
             for (BufferType bufferType : BufferType.values()) {
                 params.add(new Object[]{ providerType, bufferType, ProtocolCipherCombo.tlsv12()});
diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java
index 32be76781a..ea672a40a8 100644
--- a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java
@@ -69,7 +69,7 @@ public class OpenSslEngineTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
 
@@ -376,7 +376,7 @@ public class OpenSslEngineTest extends SSLEngineTest {
             handshake(clientEngine, serverEngine);
 
             ByteBuffer src = allocateBuffer(1024);
-            List<ByteBuffer> srcList = new ArrayList<ByteBuffer>();
+            List<ByteBuffer> srcList = new ArrayList<>();
             long srcsLen = 0;
             long maxLen = ((long) MAX_VALUE) * 2;
 
diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java
index df4e757e50..f57722cc80 100644
--- a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java
@@ -37,7 +37,7 @@ public class OpenSslJdkSslEngineInteroptTest extends SSLEngineTest {
 
     @Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}")
     public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (BufferType type: BufferType.values()) {
             params.add(new Object[] { type, ProtocolCipherCombo.tlsv12()});
 
diff --git a/handler/src/test/java/io/netty/handler/ssl/ParameterizedSslHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/ParameterizedSslHandlerTest.java
index 6d01a2673e..a647302a97 100644
--- a/handler/src/test/java/io/netty/handler/ssl/ParameterizedSslHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/ParameterizedSslHandlerTest.java
@@ -65,14 +65,14 @@ public class ParameterizedSslHandlerTest {
 
     @Parameterized.Parameters(name = "{index}: clientProvider={0}, {index}: serverProvider={1}")
     public static Collection<Object[]> data() {
-        List<SslProvider> providers = new ArrayList<SslProvider>(3);
+        List<SslProvider> providers = new ArrayList<>(3);
         if (OpenSsl.isAvailable()) {
             providers.add(SslProvider.OPENSSL);
             providers.add(SslProvider.OPENSSL_REFCNT);
         }
         providers.add(SslProvider.JDK);
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
 
         for (SslProvider cp: providers) {
             for (SslProvider sp: providers) {
@@ -413,7 +413,7 @@ public class ParameterizedSslHandlerTest {
                             SslHandler handler = sslServerCtx.newHandler(ch.alloc());
                             handler.setCloseNotifyReadTimeoutMillis(closeNotifyReadTimeout);
                             handler.sslCloseFuture().addListener(
-                                    new PromiseNotifier<Channel, Future<Channel>>(serverPromise));
+                                    new PromiseNotifier<>(serverPromise));
                             handler.handshakeFuture().addListener(new FutureListener<Channel>() {
                                 @Override
                                 public void operationComplete(Future<Channel> future) {
@@ -452,7 +452,7 @@ public class ParameterizedSslHandlerTest {
                             SslHandler handler = sslClientCtx.newHandler(ch.alloc());
                             handler.setCloseNotifyReadTimeoutMillis(closeNotifyReadTimeout);
                             handler.sslCloseFuture().addListener(
-                                    new PromiseNotifier<Channel, Future<Channel>>(clientPromise));
+                                    new PromiseNotifier<>(clientPromise));
                             handler.handshakeFuture().addListener(new FutureListener<Channel>() {
                                 @Override
                                 public void operationComplete(Future<Channel> future) {
diff --git a/handler/src/test/java/io/netty/handler/ssl/RenegotiateTest.java b/handler/src/test/java/io/netty/handler/ssl/RenegotiateTest.java
index a3a851cfcb..f62766e4ba 100644
--- a/handler/src/test/java/io/netty/handler/ssl/RenegotiateTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/RenegotiateTest.java
@@ -40,7 +40,7 @@ public abstract class RenegotiateTest {
 
     @Test(timeout = 30000)
     public void testRenegotiateServer() throws Throwable {
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(2);
         SelfSignedCertificate cert = new SelfSignedCertificate();
         EventLoopGroup group = new LocalEventLoopGroup();
diff --git a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
index 4104fbe294..a30897446c 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
@@ -2580,10 +2580,10 @@ public abstract class SSLEngineTest {
         SSLEngine server = wrapEngine(ctx.newEngine(UnpooledByteBufAllocator.DEFAULT));
 
         try {
-            Set<String> supported = new HashSet<String>(Arrays.asList(server.getSupportedProtocols()));
+            Set<String> supported = new HashSet<>(Arrays.asList(server.getSupportedProtocols()));
             if (supported.contains(protocol)) {
                 server.setEnabledProtocols(server.getSupportedProtocols());
-                assertEquals(supported, new HashSet<String>(Arrays.asList(server.getSupportedProtocols())));
+                assertEquals(supported, new HashSet<>(Arrays.asList(server.getSupportedProtocols())));
 
                 for (String disabled : disabledProtocols) {
                     supported.remove(disabled);
@@ -2593,7 +2593,7 @@ public abstract class SSLEngineTest {
                     return;
                 }
                 server.setEnabledProtocols(supported.toArray(new String[0]));
-                assertEquals(supported, new HashSet<String>(Arrays.asList(server.getEnabledProtocols())));
+                assertEquals(supported, new HashSet<>(Arrays.asList(server.getEnabledProtocols())));
                 server.setEnabledProtocols(server.getSupportedProtocols());
             }
         } finally {
@@ -2678,7 +2678,7 @@ public abstract class SSLEngineTest {
     @Test
     public void testInvalidCipher() throws Exception {
         SelfSignedCertificate cert = new SelfSignedCertificate();
-        List<String> cipherList = new ArrayList<String>();
+        List<String> cipherList = new ArrayList<>();
         Collections.addAll(cipherList, ((SSLSocketFactory) SSLSocketFactory.getDefault()).getDefaultCipherSuites());
         cipherList.add("InvalidCipher");
         SSLEngine server = null;
diff --git a/handler/src/test/java/io/netty/handler/ssl/SniClientJava8TestUtil.java b/handler/src/test/java/io/netty/handler/ssl/SniClientJava8TestUtil.java
index a44878868b..9f0beed452 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SniClientJava8TestUtil.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SniClientJava8TestUtil.java
@@ -281,7 +281,7 @@ final class SniClientJava8TestUtil {
 
                 @Override
                 protected KeyManager[] engineGetKeyManagers() {
-                    List<KeyManager> managers = new ArrayList<KeyManager>();
+                    List<KeyManager> managers = new ArrayList<>();
                     for (final KeyManager km: factory.getKeyManagers()) {
                         if (km instanceof X509ExtendedKeyManager) {
                             managers.add(new X509ExtendedKeyManager() {
diff --git a/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java b/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java
index 19298affd9..4aa23d2c58 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java
@@ -52,13 +52,13 @@ public class SniClientTest {
 
     @Parameters(name = "{index}: serverSslProvider = {0}, clientSslProvider = {1}")
     public static Collection<Object[]> parameters() {
-        List<SslProvider> providers = new ArrayList<SslProvider>(Arrays.asList(SslProvider.values()));
+        List<SslProvider> providers = new ArrayList<>(Arrays.asList(SslProvider.values()));
         if (!OpenSsl.isAvailable()) {
             providers.remove(SslProvider.OPENSSL);
             providers.remove(SslProvider.OPENSSL_REFCNT);
         }
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslProvider sp: providers) {
             for (SslProvider cp: providers) {
                 params.add(new Object[] { sp, cp });
diff --git a/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java
index 976821b936..87dbaaba3d 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java
@@ -126,7 +126,7 @@ public class SniHandlerTest {
 
     @Parameterized.Parameters(name = "{index}: sslProvider={0}")
     public static Iterable<?> data() {
-        List<SslProvider> params = new ArrayList<SslProvider>(3);
+        List<SslProvider> params = new ArrayList<>(3);
         if (OpenSsl.isAvailable()) {
             params.add(SslProvider.OPENSSL);
             params.add(SslProvider.OPENSSL_REFCNT);
@@ -146,8 +146,8 @@ public class SniHandlerTest {
         SslContext nettyContext = makeSslContext(provider, false);
         try {
             final AtomicReference<SslHandshakeCompletionEvent> evtRef =
-                    new AtomicReference<SslHandshakeCompletionEvent>();
-            SniHandler handler = new SniHandler(new DomainNameMappingBuilder<SslContext>(nettyContext).build());
+                    new AtomicReference<>();
+            SniHandler handler = new SniHandler(new DomainNameMappingBuilder<>(nettyContext).build());
             EmbeddedChannel ch = new EmbeddedChannel(handler, new ChannelInboundHandlerAdapter() {
                 @Override
                 public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
@@ -184,7 +184,7 @@ public class SniHandlerTest {
         SslContext leanContext2 = makeSslContext(provider, false);
 
         try {
-            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<SslContext>(nettyContext)
+            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<>(nettyContext)
                     .add("*.netty.io", nettyContext)
                     // input with custom cases
                     .add("*.LEANCLOUD.CN", leanContext)
@@ -193,7 +193,7 @@ public class SniHandlerTest {
                     .add("chat4.leancloud.cn", leanContext2)
                     .build();
 
-            final AtomicReference<SniCompletionEvent> evtRef = new AtomicReference<SniCompletionEvent>();
+            final AtomicReference<SniCompletionEvent> evtRef = new AtomicReference<>();
             SniHandler handler = new SniHandler(mapping);
             EmbeddedChannel ch = new EmbeddedChannel(handler, new ChannelInboundHandlerAdapter() {
                 @Override
@@ -247,7 +247,7 @@ public class SniHandlerTest {
         SslContext leanContext2 = makeSslContext(provider, false);
 
         try {
-            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<SslContext>(nettyContext)
+            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<>(nettyContext)
                     .add("*.netty.io", nettyContext)
                     // input with custom cases
                     .add("*.LEANCLOUD.CN", leanContext)
@@ -290,7 +290,7 @@ public class SniHandlerTest {
         SslContext leanContext2 = makeSslContext(provider, false);
 
         try {
-            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<SslContext>(nettyContext)
+            DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<>(nettyContext)
                     .add("*.netty.io", nettyContext)
                     // input with custom cases
                     .add("*.LEANCLOUD.CN", leanContext)
@@ -342,7 +342,7 @@ public class SniHandlerTest {
             final CountDownLatch serverApnDoneLatch = new CountDownLatch(1);
             final CountDownLatch clientApnDoneLatch = new CountDownLatch(1);
 
-            final DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<SslContext>(nettyContext)
+            final DomainNameMapping<SslContext> mapping = new DomainNameMappingBuilder<>(nettyContext)
                     .add("*.netty.io", nettyContext)
                     .add("sni.fake.site", sniContext).build();
             final SniHandler handler = new SniHandler(mapping);
diff --git a/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java b/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java
index 9f205825e5..f32243e85c 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java
@@ -66,8 +66,8 @@ public class SslErrorTest {
 
     @Parameterized.Parameters(name = "{index}: serverProvider = {0}, clientProvider = {1}, exception = {2}")
     public static Collection<Object[]> data() {
-        List<SslProvider> serverProviders = new ArrayList<SslProvider>(2);
-        List<SslProvider> clientProviders = new ArrayList<SslProvider>(3);
+        List<SslProvider> serverProviders = new ArrayList<>(2);
+        List<SslProvider> clientProviders = new ArrayList<>(3);
 
         if (OpenSsl.isAvailable()) {
             serverProviders.add(SslProvider.OPENSSL);
@@ -79,7 +79,7 @@ public class SslErrorTest {
         // alert all the time, sigh.....
         clientProviders.add(SslProvider.JDK);
 
-        List<CertificateException> exceptions = new ArrayList<CertificateException>(6);
+        List<CertificateException> exceptions = new ArrayList<>(6);
         exceptions.add(new CertificateExpiredException());
         exceptions.add(new CertificateNotYetValidException());
         exceptions.add(new CertificateRevokedException(
@@ -91,7 +91,7 @@ public class SslErrorTest {
         exceptions.add(newCertificateException(CertPathValidatorException.BasicReason.NOT_YET_VALID));
         exceptions.add(newCertificateException(CertPathValidatorException.BasicReason.REVOKED));
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslProvider serverProvider: serverProviders) {
             for (SslProvider clientProvider: clientProviders) {
                 for (CertificateException exception: exceptions) {
diff --git a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java
index 19f4728ff1..78da18e717 100644
--- a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java
@@ -420,7 +420,7 @@ public class SslHandlerTest {
     @Test(timeout = 5000)
     public void testEventsFired() throws Exception {
         SSLEngine engine = newServerModeSSLEngine();
-        final BlockingQueue<SslCompletionEvent> events = new LinkedBlockingQueue<SslCompletionEvent>();
+        final BlockingQueue<SslCompletionEvent> events = new LinkedBlockingQueue<>();
         EmbeddedChannel channel = new EmbeddedChannel(new SslHandler(engine), new ChannelInboundHandlerAdapter() {
             @Override
             public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
@@ -448,7 +448,7 @@ public class SslHandlerTest {
         final SslContext sslServerCtx = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build();
         final CountDownLatch latch = new CountDownLatch(2);
         final CountDownLatch latch2 = new CountDownLatch(2);
-        final BlockingQueue<Object> events = new LinkedBlockingQueue<Object>();
+        final BlockingQueue<Object> events = new LinkedBlockingQueue<>();
         Channel serverChannel = null;
         Channel clientChannel = null;
         EventLoopGroup group = new LocalEventLoopGroup();
@@ -630,7 +630,7 @@ public class SslHandlerTest {
                     });
             sc = sb.bind(address).syncUninterruptibly().channel();
 
-            final AtomicReference<SslHandler> sslHandlerRef = new AtomicReference<SslHandler>();
+            final AtomicReference<SslHandler> sslHandlerRef = new AtomicReference<>();
             Bootstrap b = new Bootstrap()
                     .group(group)
                     .channel(LocalChannel.class)
@@ -691,7 +691,7 @@ public class SslHandlerTest {
         Channel sc = null;
         Channel cc = null;
         final CountDownLatch activeLatch = new CountDownLatch(1);
-        final AtomicReference<AssertionError> errorRef = new AtomicReference<AssertionError>();
+        final AtomicReference<AssertionError> errorRef = new AtomicReference<>();
         final SslHandler sslHandler = sslClientCtx.newHandler(UnpooledByteBufAllocator.DEFAULT);
         try {
             sc = new ServerBootstrap()
diff --git a/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java b/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java
index 329218de7b..ddb6a5f0d9 100644
--- a/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java
@@ -208,7 +208,7 @@ public class OcspTest {
      * The Server provides an OCSP staple and the Client rejects it.
      */
     private static void testClientRejectingOcspStaple(SslProvider sslProvider) throws Exception {
-        final AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> causeRef = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
 
         ChannelInboundHandlerAdapter clientHandler = new ChannelInboundHandlerAdapter() {
@@ -298,7 +298,7 @@ public class OcspTest {
      * The exception should bubble up on the client side and the connection should get closed.
      */
     private static void testClientException(SslProvider sslProvider) throws Exception {
-        final AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> causeRef = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
 
         ChannelInboundHandlerAdapter clientHandler = new ChannelInboundHandlerAdapter() {
diff --git a/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java b/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java
index 0a5b627822..56891f6848 100644
--- a/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java
+++ b/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java
@@ -71,7 +71,7 @@ public class IdleStateHandlerTest {
 
         assertTrue("The number of expected events must be >= 1", expected.length >= 1);
 
-        final List<Object> events = new ArrayList<Object>();
+        final List<Object> events = new ArrayList<>();
         ChannelInboundHandlerAdapter handler = new ChannelInboundHandlerAdapter() {
             @Override
             public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
@@ -162,7 +162,7 @@ public class IdleStateHandlerTest {
     private static void anyNotIdle(TestableIdleStateHandler idleStateHandler,
                                    Action action, Object expected) throws Exception {
 
-        final List<Object> events = new ArrayList<Object>();
+        final List<Object> events = new ArrayList<>();
         ChannelInboundHandlerAdapter handler = new ChannelInboundHandlerAdapter() {
             @Override
             public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
@@ -222,7 +222,7 @@ public class IdleStateHandlerTest {
         TestableIdleStateHandler idleStateHandler = new TestableIdleStateHandler(
                 true, 0L, writerIdleTime, allIdleTime, TimeUnit.SECONDS);
 
-        final List<Object> events = new ArrayList<Object>();
+        final List<Object> events = new ArrayList<>();
         ChannelInboundHandlerAdapter handler = new ChannelInboundHandlerAdapter() {
             @Override
             public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
diff --git a/microbench/src/main/java/io/netty/buffer/CompositeByteBufRandomAccessBenchmark.java b/microbench/src/main/java/io/netty/buffer/CompositeByteBufRandomAccessBenchmark.java
index bb2d9283f0..fb40b17216 100644
--- a/microbench/src/main/java/io/netty/buffer/CompositeByteBufRandomAccessBenchmark.java
+++ b/microbench/src/main/java/io/netty/buffer/CompositeByteBufRandomAccessBenchmark.java
@@ -86,7 +86,7 @@ public class CompositeByteBufRandomAccessBenchmark extends AbstractMicrobenchmar
 
     private static ByteBuf newBufferSmallChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>(((length + 1) / 45) * 19);
+        List<ByteBuf> buffers = new ArrayList<>(((length + 1) / 45) * 19);
         for (int i = 0; i < length + 45; i += 45) {
             for (int j = 1; j <= 9; j++) {
                 buffers.add(EMPTY_BUFFER);
@@ -103,7 +103,7 @@ public class CompositeByteBufRandomAccessBenchmark extends AbstractMicrobenchmar
 
     private static ByteBuf newBufferLargeChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>((length + 1) / 512);
+        List<ByteBuf> buffers = new ArrayList<>((length + 1) / 512);
         for (int i = 0; i < length + 1536; i += 1536) {
             buffers.add(wrappedBuffer(new byte[512]));
             buffers.add(EMPTY_BUFFER);
diff --git a/microbench/src/main/java/io/netty/buffer/CompositeByteBufSequentialBenchmark.java b/microbench/src/main/java/io/netty/buffer/CompositeByteBufSequentialBenchmark.java
index 9ba6f19aa8..d8c009c00b 100644
--- a/microbench/src/main/java/io/netty/buffer/CompositeByteBufSequentialBenchmark.java
+++ b/microbench/src/main/java/io/netty/buffer/CompositeByteBufSequentialBenchmark.java
@@ -100,7 +100,7 @@ public class CompositeByteBufSequentialBenchmark extends AbstractMicrobenchmark
 
     private static ByteBuf newBufferSmallChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>(((length + 1) / 45) * 19);
+        List<ByteBuf> buffers = new ArrayList<>(((length + 1) / 45) * 19);
         for (int i = 0; i < length + 45; i += 45) {
             for (int j = 1; j <= 9; j++) {
                 buffers.add(EMPTY_BUFFER);
@@ -117,7 +117,7 @@ public class CompositeByteBufSequentialBenchmark extends AbstractMicrobenchmark
 
     private static ByteBuf newBufferLargeChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>((length + 1) / 512);
+        List<ByteBuf> buffers = new ArrayList<>((length + 1) / 512);
         for (int i = 0; i < length + 1536; i += 1536) {
             buffers.add(wrappedBuffer(new byte[512]));
             buffers.add(EMPTY_BUFFER);
diff --git a/microbench/src/main/java/io/netty/buffer/CompositeByteBufWriteOutBenchmark.java b/microbench/src/main/java/io/netty/buffer/CompositeByteBufWriteOutBenchmark.java
index e525c8cd0a..50b1fece8a 100644
--- a/microbench/src/main/java/io/netty/buffer/CompositeByteBufWriteOutBenchmark.java
+++ b/microbench/src/main/java/io/netty/buffer/CompositeByteBufWriteOutBenchmark.java
@@ -91,7 +91,7 @@ public class CompositeByteBufWriteOutBenchmark extends AbstractMicrobenchmark {
 
     private static ByteBuf[] makeSmallChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>(((length + 1) / 48) * 9);
+        List<ByteBuf> buffers = new ArrayList<>(((length + 1) / 48) * 9);
         for (int i = 0; i < length + 48; i += 48) {
             for (int j = 4; j <= 12; j++) {
                 buffers.add(wrappedBuffer(new byte[j]));
@@ -103,7 +103,7 @@ public class CompositeByteBufWriteOutBenchmark extends AbstractMicrobenchmark {
 
     private static ByteBuf[] makeLargeChunks(int length) {
 
-        List<ByteBuf> buffers = new ArrayList<ByteBuf>((length + 1) / 768);
+        List<ByteBuf> buffers = new ArrayList<>((length + 1) / 768);
         for (int i = 0; i < length + 1536; i += 1536) {
             buffers.add(wrappedBuffer(new byte[512]));
             buffers.add(wrappedBuffer(new byte[1024]));
diff --git a/microbench/src/main/java/io/netty/handler/codec/CodecOutputListBenchmark.java b/microbench/src/main/java/io/netty/handler/codec/CodecOutputListBenchmark.java
index d7d40307a5..326610b628 100644
--- a/microbench/src/main/java/io/netty/handler/codec/CodecOutputListBenchmark.java
+++ b/microbench/src/main/java/io/netty/handler/codec/CodecOutputListBenchmark.java
@@ -57,7 +57,7 @@ public class CodecOutputListBenchmark extends AbstractMicrobenchmark {
 
     @Benchmark
     public void arrayList() {
-        arrayList = new ArrayList<Object>(16);
+        arrayList = new ArrayList<>(16);
         benchmarkAddAndClear(arrayList, elements);
     }
 
diff --git a/microbench/src/main/java/io/netty/handler/codec/http/HttpMethodMapBenchmark.java b/microbench/src/main/java/io/netty/handler/codec/http/HttpMethodMapBenchmark.java
index 69dae0f4c9..ab2217d293 100644
--- a/microbench/src/main/java/io/netty/handler/codec/http/HttpMethodMapBenchmark.java
+++ b/microbench/src/main/java/io/netty/handler/codec/http/HttpMethodMapBenchmark.java
@@ -43,7 +43,7 @@ import static io.netty.util.internal.MathUtil.findNextPositivePowerOfTwo;
 @Measurement(iterations = 8)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 public class HttpMethodMapBenchmark extends AbstractMicrobenchmark {
-    private static final Map<String, HttpMethod> OLD_MAP = new HashMap<String, HttpMethod>();
+    private static final Map<String, HttpMethod> OLD_MAP = new HashMap<>();
     private static final SimpleStringMap<HttpMethod> NEW_MAP;
     private static final String[] KNOWN_METHODS;
     private static final String[] MIXED_METHODS;
@@ -98,16 +98,16 @@ public class HttpMethodMapBenchmark extends AbstractMicrobenchmark {
         OLD_MAP.put(TRACE.toString(), TRACE);
         OLD_MAP.put(CONNECT.toString(), CONNECT);
 
-        NEW_MAP = new SimpleStringMap<HttpMethod>(
-                new SimpleStringMap.Node<HttpMethod>(OPTIONS.toString(), OPTIONS),
-                new SimpleStringMap.Node<HttpMethod>(GET.toString(), GET),
-                new SimpleStringMap.Node<HttpMethod>(HEAD.toString(), HEAD),
-                new SimpleStringMap.Node<HttpMethod>(POST.toString(), POST),
-                new SimpleStringMap.Node<HttpMethod>(PUT.toString(), PUT),
-                new SimpleStringMap.Node<HttpMethod>(PATCH.toString(), PATCH),
-                new SimpleStringMap.Node<HttpMethod>(DELETE.toString(), DELETE),
-                new SimpleStringMap.Node<HttpMethod>(TRACE.toString(), TRACE),
-                new SimpleStringMap.Node<HttpMethod>(CONNECT.toString(), CONNECT));
+        NEW_MAP = new SimpleStringMap<>(
+                new SimpleStringMap.Node<>(OPTIONS.toString(), OPTIONS),
+                new SimpleStringMap.Node<>(GET.toString(), GET),
+                new SimpleStringMap.Node<>(HEAD.toString(), HEAD),
+                new SimpleStringMap.Node<>(POST.toString(), POST),
+                new SimpleStringMap.Node<>(PUT.toString(), PUT),
+                new SimpleStringMap.Node<>(PATCH.toString(), PATCH),
+                new SimpleStringMap.Node<>(DELETE.toString(), DELETE),
+                new SimpleStringMap.Node<>(TRACE.toString(), TRACE),
+                new SimpleStringMap.Node<>(CONNECT.toString(), CONNECT));
     }
 
     private static final class SimpleStringMap<T> {
diff --git a/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java b/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java
index c94bc59a8c..d815cb5dd3 100644
--- a/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java
+++ b/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java
@@ -87,7 +87,7 @@ public final class HpackBenchmarkUtil {
 
     static {
         HpackHeadersSize[] sizes = HpackHeadersSize.values();
-        headersMap = new HashMap<HeadersKey, List<HpackHeader>>(sizes.length * 2);
+        headersMap = new HashMap<>(sizes.length * 2);
         for (HpackHeadersSize size : sizes) {
             HeadersKey key = new HeadersKey(size, true);
             headersMap.put(key, key.newHeaders());
diff --git a/microbench/src/main/java/io/netty/handler/codec/http2/HpackHeader.java b/microbench/src/main/java/io/netty/handler/codec/http2/HpackHeader.java
index c0b63590d4..dede5f9a87 100644
--- a/microbench/src/main/java/io/netty/handler/codec/http2/HpackHeader.java
+++ b/microbench/src/main/java/io/netty/handler/codec/http2/HpackHeader.java
@@ -57,7 +57,7 @@ class HpackHeader {
      */
     static List<HpackHeader> createHeaders(int numHeaders, int nameLength, int valueLength,
                                            boolean limitToAscii) {
-        List<HpackHeader> hpackHeaders = new ArrayList<HpackHeader>(numHeaders);
+        List<HpackHeader> hpackHeaders = new ArrayList<>(numHeaders);
         for (int i = 0; i < numHeaders; ++i) {
             byte[] name = randomBytes(new byte[nameLength], limitToAscii);
             byte[] value = randomBytes(new byte[valueLength], limitToAscii);
diff --git a/microbench/src/main/java/io/netty/microbench/concurrent/ScheduledFutureTaskBenchmark.java b/microbench/src/main/java/io/netty/microbench/concurrent/ScheduledFutureTaskBenchmark.java
index ecb438fad6..02e9922ee9 100644
--- a/microbench/src/main/java/io/netty/microbench/concurrent/ScheduledFutureTaskBenchmark.java
+++ b/microbench/src/main/java/io/netty/microbench/concurrent/ScheduledFutureTaskBenchmark.java
@@ -51,7 +51,7 @@ public class ScheduledFutureTaskBenchmark extends AbstractMicrobenchmark {
         @Param({ "100", "1000", "10000", "100000" })
         int num;
 
-        final List<ScheduledFuture<Void>> futures = new ArrayList<ScheduledFuture<Void>>();
+        final List<ScheduledFuture<Void>> futures = new ArrayList<>();
 
         @Setup(Level.Invocation)
         public void reset() {
diff --git a/microbench/src/main/java/io/netty/microbench/headers/ExampleHeaders.java b/microbench/src/main/java/io/netty/microbench/headers/ExampleHeaders.java
index abfd9814bd..617cfa0fe7 100644
--- a/microbench/src/main/java/io/netty/microbench/headers/ExampleHeaders.java
+++ b/microbench/src/main/java/io/netty/microbench/headers/ExampleHeaders.java
@@ -32,17 +32,17 @@ public final class ExampleHeaders {
     }
 
     public static final Map<HeaderExample, Map<String, String>> EXAMPLES =
-            new EnumMap<HeaderExample, Map<String, String>>(HeaderExample.class);
+            new EnumMap<>(HeaderExample.class);
 
     static {
-        Map<String, String> header = new HashMap<String, String>();
+        Map<String, String> header = new HashMap<>();
         header.put(":method", "GET");
         header.put(":scheme", "https");
         header.put(":path", "/index.html");
         EXAMPLES.put(HeaderExample.THREE, header);
 
         // Headers used by Norman's HTTP benchmarks with wrk
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put("Method", "GET");
         header.put("Path", "/plaintext");
         header.put("Host", "localhost");
@@ -50,7 +50,7 @@ public final class ExampleHeaders {
         header.put("Connection", "keep-alive");
         EXAMPLES.put(HeaderExample.FIVE, header);
 
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put(":authority", "127.0.0.1:33333");
         header.put(":method", "POST");
         header.put(":path", "/grpc.testing.TestService/UnaryCall");
@@ -59,7 +59,7 @@ public final class ExampleHeaders {
         header.put("te", "trailers");
         EXAMPLES.put(HeaderExample.SIX, header);
 
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put(":method", "POST");
         header.put(":scheme", "http");
         header.put(":path", "/google.pubsub.v2.PublisherService/CreateTopic");
@@ -70,7 +70,7 @@ public final class ExampleHeaders {
         header.put("authorization", "Bearer y235.wef315yfh138vh31hv93hv8h3v");
         EXAMPLES.put(HeaderExample.EIGHT, header);
 
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put(":host", "twitter.com");
         header.put(":method", "GET");
         header.put(":path", "/");
@@ -84,7 +84,7 @@ public final class ExampleHeaders {
         header.put("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko)");
         EXAMPLES.put(HeaderExample.ELEVEN, header);
 
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put("cache-control", "no-cache, no-store, must-revalidate, pre-check=0, post-check=0");
         header.put("content-encoding", "gzip");
         header.put("content-security-policy", "default-src https:; connect-src https:;");
@@ -109,7 +109,7 @@ public final class ExampleHeaders {
         header.put("x-xss-protection", "1; mode=block");
         EXAMPLES.put(HeaderExample.TWENTYTWO, header);
 
-        header = new HashMap<String, String>();
+        header = new HashMap<>();
         header.put("Cache-Control", "no-cache");
         header.put("Content-Encoding", "gzip");
         header.put("Content-Security-Policy", "default-src *; script-src assets-cdn.github.com ...");
diff --git a/microbench/src/main/java/io/netty/microbench/redis/RedisEncoderBenchmark.java b/microbench/src/main/java/io/netty/microbench/redis/RedisEncoderBenchmark.java
index 69e7ee505c..a4dab42951 100644
--- a/microbench/src/main/java/io/netty/microbench/redis/RedisEncoderBenchmark.java
+++ b/microbench/src/main/java/io/netty/microbench/redis/RedisEncoderBenchmark.java
@@ -69,7 +69,7 @@ public class RedisEncoderBenchmark extends AbstractMicrobenchmark {
         content.writeBytes(bytes);
         ByteBuf testContent = Unpooled.unreleasableBuffer(content.asReadOnly());
 
-        List<RedisMessage> rList = new ArrayList<RedisMessage>(arraySize);
+        List<RedisMessage> rList = new ArrayList<>(arraySize);
         for (int i = 0; i < arraySize; ++i) {
             rList.add(new FullBulkStringRedisMessage(testContent));
         }
diff --git a/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmark.java b/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmark.java
index 64ec3e2303..b5a9f99679 100644
--- a/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmark.java
+++ b/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmark.java
@@ -40,7 +40,7 @@ public class AbstractMicrobenchmark extends AbstractMicrobenchmarkBase {
 
         public HarnessExecutor(int maxThreads, String prefix) {
             super(maxThreads, maxThreads, 0, TimeUnit.MILLISECONDS,
-                    new LinkedBlockingQueue<Runnable>(), new DefaultThreadFactory(prefix));
+                    new LinkedBlockingQueue<>(), new DefaultThreadFactory(prefix));
             logger.debug("Using harness executor");
         }
     }
diff --git a/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmarkBase.java b/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmarkBase.java
index a623cc89ea..0cec4cf45c 100644
--- a/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmarkBase.java
+++ b/microbench/src/main/java/io/netty/microbench/util/AbstractMicrobenchmarkBase.java
@@ -85,7 +85,7 @@ public abstract class AbstractMicrobenchmarkBase {
     protected abstract String[] jvmArgs();
 
     protected static String[] removeAssertions(String[] jvmArgs) {
-        List<String> customArgs = new ArrayList<String>(jvmArgs.length);
+        List<String> customArgs = new ArrayList<>(jvmArgs.length);
         for (String arg : jvmArgs) {
             if (!arg.startsWith("-ea")) {
                 customArgs.add(arg);
diff --git a/microbench/src/main/java/io/netty/microbench/util/ResourceLeakDetectorBenchmark.java b/microbench/src/main/java/io/netty/microbench/util/ResourceLeakDetectorBenchmark.java
index be6414a9e1..503d1a29ed 100644
--- a/microbench/src/main/java/io/netty/microbench/util/ResourceLeakDetectorBenchmark.java
+++ b/microbench/src/main/java/io/netty/microbench/util/ResourceLeakDetectorBenchmark.java
@@ -26,7 +26,7 @@ public class ResourceLeakDetectorBenchmark extends AbstractMicrobenchmark {
 
     @Setup
     public void setup() {
-        detector = new ResourceLeakDetector<Object>(getClass(), 128, Long.MAX_VALUE);
+        detector = new ResourceLeakDetector<>(getClass(), 128, Long.MAX_VALUE);
     }
 
     @Benchmark
diff --git a/microbench/src/main/java/io/netty/microbenchmark/common/IntObjectHashMapBenchmark.java b/microbench/src/main/java/io/netty/microbenchmark/common/IntObjectHashMapBenchmark.java
index 6787f9b791..73b31c17ad 100644
--- a/microbench/src/main/java/io/netty/microbenchmark/common/IntObjectHashMapBenchmark.java
+++ b/microbench/src/main/java/io/netty/microbenchmark/common/IntObjectHashMapBenchmark.java
@@ -101,7 +101,7 @@ public class IntObjectHashMapBenchmark extends AbstractMicrobenchmark {
                 case RANDOM: {
                     // Create a 'size' # of random integers.
                     Random r = new Random();
-                    Set<Integer> keySet = new HashSet<Integer>();
+                    Set<Integer> keySet = new HashSet<>();
                     while (keySet.size() < size) {
                         keySet.add(r.nextInt());
                     }
@@ -123,7 +123,7 @@ public class IntObjectHashMapBenchmark extends AbstractMicrobenchmark {
     }
 
     private class AgronaEnvironment extends Environment {
-        private final Int2ObjectHashMap<Long> map = new Int2ObjectHashMap<Long>();
+        private final Int2ObjectHashMap<Long> map = new Int2ObjectHashMap<>();
 
         AgronaEnvironment() {
             for (int key : keys) {
@@ -133,7 +133,7 @@ public class IntObjectHashMapBenchmark extends AbstractMicrobenchmark {
 
         @Override
         void put(Blackhole bh) {
-            Int2ObjectHashMap<Long> map = new Int2ObjectHashMap<Long>();
+            Int2ObjectHashMap<Long> map = new Int2ObjectHashMap<>();
             for (int key : keys) {
                 bh.consume(map.put(key, VALUE));
             }
@@ -148,7 +148,7 @@ public class IntObjectHashMapBenchmark extends AbstractMicrobenchmark {
 
         @Override
         void remove(Blackhole bh) {
-            Int2ObjectHashMap<Long> copy = new Int2ObjectHashMap<Long>();
+            Int2ObjectHashMap<Long> copy = new Int2ObjectHashMap<>();
             copy.putAll(map);
             for (int key : keys) {
                 bh.consume(copy.remove(key));
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java
index 470106e695..38f2c0a45e 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java
@@ -50,7 +50,7 @@ final class AuthoritativeDnsServerCacheAdapter implements AuthoritativeDnsServer
             return null;
         }
 
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(entries.size());
+        List<InetSocketAddress> addresses = new ArrayList<>(entries.size());
 
         int i = 0;
         do {
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java
index cdd590e8fc..fffdec86f6 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java
@@ -189,7 +189,7 @@ abstract class Cache<E> {
                         }
 
                         // Create a new List for COW semantics
-                        List<E> newEntries = new ArrayList<E>(entries.size() + 1);
+                        List<E> newEntries = new ArrayList<>(entries.size() + 1);
                         int i = 0;
                         E replacedEntry = null;
                         do {
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java
index 00be072295..db3255b27e 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java
@@ -48,7 +48,7 @@ public final class DefaultDnsServerAddressStreamProvider implements DnsServerAdd
     static final int DNS_PORT = 53;
 
     static {
-        final List<InetSocketAddress> defaultNameServers = new ArrayList<InetSocketAddress>(2);
+        final List<InetSocketAddress> defaultNameServers = new ArrayList<>(2);
         if (!PlatformDependent.isAndroid()) {
             // Only try to use when not on Android as the classes not exists there:
             // See https://github.com/netty/netty/issues/8654
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DirContextUtils.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DirContextUtils.java
index 45c1ac433f..b456449e8c 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DirContextUtils.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DirContextUtils.java
@@ -41,7 +41,7 @@ final class DirContextUtils {
         // See:
         // - http://docs.oracle.com/javase/8/docs/technotes/guides/jndi/jndi-dns.html
         // - http://mail.openjdk.java.net/pipermail/net-dev/2017-March/010695.html
-        Hashtable<String, String> env = new Hashtable<String, String>();
+        Hashtable<String, String> env = new Hashtable<>();
         env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory");
         env.put("java.naming.provider.url", "dns://");
 
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolveContext.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolveContext.java
index 85078c6792..85c0cfec71 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolveContext.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolveContext.java
@@ -69,7 +69,7 @@ final class DnsAddressResolveContext extends DnsResolveContext<InetAddress> {
             // If all the results are the preferred type, or none of them are, then we don't need to do any filtering.
             return unfiltered;
         }
-        List<InetAddress> filtered = new ArrayList<InetAddress>(numExpected);
+        List<InetAddress> filtered = new ArrayList<>(numExpected);
         for (int i = 0; i < size; i++) {
             InetAddress address = unfiltered.get(i);
             if (inetAddressType.isInstance(address)) {
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java
index 303c42a098..f1171a436e 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java
@@ -89,7 +89,7 @@ public class DnsAddressResolverGroup extends AddressResolverGroup<InetSocketAddr
             EventLoop eventLoop, ChannelFactory<? extends DatagramChannel> channelFactory,
             DnsServerAddressStreamProvider nameServerProvider) throws Exception {
 
-        final NameResolver<InetAddress> resolver = new InflightNameResolver<InetAddress>(
+        final NameResolver<InetAddress> resolver = new InflightNameResolver<>(
                 eventLoop,
                 newNameResolver(eventLoop, channelFactory, nameServerProvider),
                 resolvesInProgress,
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
index c8384fffe9..4a53cf7d79 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
@@ -776,7 +776,7 @@ public class DnsNameResolver extends InetNameResolver {
         if (!additionalsIt.hasNext()) {
             return EMPTY_ADDITIONALS;
         }
-        List<DnsRecord> records = new ArrayList<DnsRecord>();
+        List<DnsRecord> records = new ArrayList<>();
         do {
             DnsRecord r = additionalsIt.next();
             validateAdditional(r, validateType);
@@ -946,7 +946,7 @@ public class DnsNameResolver extends InetNameResolver {
                     final DnsCacheEntry e = cachedEntries.get(i);
                     if (f.addressType().isInstance(e.address())) {
                         if (result == null) {
-                            result = new ArrayList<InetAddress>(numEntries);
+                            result = new ArrayList<>(numEntries);
                         }
                         result.add(e.address());
                     }
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java
index 06266ccfd3..f9f561576f 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java
@@ -345,7 +345,7 @@ public final class DnsNameResolverBuilder {
     public DnsNameResolverBuilder searchDomains(Iterable<String> searchDomains) {
         checkNotNull(searchDomains, "searchDomains");
 
-        final List<String> list = new ArrayList<String>(4);
+        final List<String> list = new ArrayList<>(4);
 
         for (String f : searchDomains) {
             if (f == null) {
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
index 9cf02d8221..c0bff657f9 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
@@ -102,7 +102,7 @@ abstract class DnsResolveContext<T> {
 
     private final Set<Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>> queriesInProgress =
             Collections.newSetFromMap(
-                    new IdentityHashMap<Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>, Boolean>());
+                    new IdentityHashMap<>());
 
     private List<T> finalResult;
     private int allowedQueries;
@@ -587,7 +587,7 @@ abstract class DnsResolveContext<T> {
         public InetSocketAddress get(int index) {
             if (addresses == null) {
                 DnsServerAddressStream stream = duplicate.duplicate();
-                addresses = new ArrayList<InetSocketAddress>(size());
+                addresses = new ArrayList<>(size());
                 for (int i = 0; i < stream.size(); i++) {
                     addresses.add(stream.next());
                 }
@@ -675,7 +675,7 @@ abstract class DnsResolveContext<T> {
 
             // Make sure the record is for the questioned domain.
             if (!recordName.equals(questionName)) {
-                Map<String, String> cnamesCopy = new HashMap<String, String>(cnames);
+                Map<String, String> cnamesCopy = new HashMap<>(cnames);
                 // Even if the record's name is not exactly same, it might be an alias defined in the CNAME records.
                 String resolved = questionName;
                 do {
@@ -696,7 +696,7 @@ abstract class DnsResolveContext<T> {
             }
 
             if (finalResult == null) {
-                finalResult = new ArrayList<T>(8);
+                finalResult = new ArrayList<>(8);
             }
             finalResult.add(converted);
 
@@ -767,7 +767,7 @@ abstract class DnsResolveContext<T> {
             }
 
             if (cnames == null) {
-                cnames = new HashMap<String, String>(min(8, answerCount));
+                cnames = new HashMap<>(min(8, answerCount));
             }
 
             String name = r.name().toLowerCase(Locale.US);
@@ -913,7 +913,7 @@ abstract class DnsResolveContext<T> {
             }
             if (cnames == null) {
                 // Detect loops.
-                cnames = new HashSet<String>(2);
+                cnames = new HashSet<>(2);
             }
             if (!cnames.add(cname)) {
                 // Follow CNAME from cache would loop. Lets break here.
@@ -1172,7 +1172,7 @@ abstract class DnsResolveContext<T> {
          * Creates a new {@link List} which holds the {@link InetSocketAddress}es.
          */
         List<InetSocketAddress> addressList() {
-            List<InetSocketAddress> addressList = new ArrayList<InetSocketAddress>(nameServerCount);
+            List<InetSocketAddress> addressList = new ArrayList<>(nameServerCount);
 
             AuthoritativeNameServer server = head;
             while (server != null) {
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java
index 72c0acd1b5..b7cbc1141a 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java
@@ -166,9 +166,9 @@ public abstract class DnsServerAddresses {
 
         final List<InetSocketAddress> list;
         if (addresses instanceof Collection) {
-            list = new ArrayList<InetSocketAddress>(((Collection<?>) addresses).size());
+            list = new ArrayList<>(((Collection<?>) addresses).size());
         } else {
-            list = new ArrayList<InetSocketAddress>(4);
+            list = new ArrayList<>(4);
         }
 
         for (InetSocketAddress a : addresses) {
@@ -193,7 +193,7 @@ public abstract class DnsServerAddresses {
             throw new NullPointerException("addresses");
         }
 
-        List<InetSocketAddress> list = new ArrayList<InetSocketAddress>(addresses.length);
+        List<InetSocketAddress> list = new ArrayList<>(addresses.length);
         for (InetSocketAddress a: addresses) {
             if (a == null) {
                 break;
diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java
index afe29313c4..2e76abf13d 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java
@@ -152,7 +152,7 @@ public final class UnixResolverDnsServerAddressStreamProvider implements DnsServ
 
     private static Map<String, DnsServerAddresses> parse(File... etcResolverFiles) throws IOException {
         Map<String, DnsServerAddresses> domainToNameServerStreamMap =
-                new HashMap<String, DnsServerAddresses>(etcResolverFiles.length << 1);
+                new HashMap<>(etcResolverFiles.length << 1);
         for (File etcResolverFile : etcResolverFiles) {
             if (!etcResolverFile.isFile()) {
                 continue;
@@ -161,7 +161,7 @@ public final class UnixResolverDnsServerAddressStreamProvider implements DnsServ
             BufferedReader br = null;
             try {
                 br = new BufferedReader(fr);
-                List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(2);
+                List<InetSocketAddress> addresses = new ArrayList<>(2);
                 String domainName = etcResolverFile.getName();
                 int port = DNS_PORT;
                 String line;
@@ -199,7 +199,7 @@ public final class UnixResolverDnsServerAddressStreamProvider implements DnsServ
                         if (!addresses.isEmpty()) {
                             putIfAbsent(domainToNameServerStreamMap, domainName, addresses);
                         }
-                        addresses = new ArrayList<InetSocketAddress>(2);
+                        addresses = new ArrayList<>(2);
                     } else if (line.startsWith(PORT_ROW_LABEL)) {
                         int i = indexOfNonWhiteSpace(line, PORT_ROW_LABEL.length());
                         if (i < 0) {
@@ -308,7 +308,7 @@ public final class UnixResolverDnsServerAddressStreamProvider implements DnsServ
      */
     static List<String> parseEtcResolverSearchDomains(File etcResolvConf) throws IOException {
         String localDomain = null;
-        List<String> searchDomains = new ArrayList<String>();
+        List<String> searchDomains = new ArrayList<>();
 
         FileReader fr = new FileReader(etcResolvConf);
         BufferedReader br = null;
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java
index 4c2e4c46ba..88da131ec8 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java
@@ -113,7 +113,7 @@ public class DnsNameResolverTest {
     // $ curl -O http://s3.amazonaws.com/alexa-static/top-1m.csv.zip
     // $ unzip -o top-1m.csv.zip top-1m.csv
     // $ head -100 top-1m.csv | cut -d, -f2 | cut -d/ -f1 | while read L; do echo '"'"$L"'",'; done > topsites.txt
-    private static final Set<String> DOMAINS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+    private static final Set<String> DOMAINS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
             "google.com",
             "youtube.com",
             "facebook.com",
@@ -216,7 +216,7 @@ public class DnsNameResolverTest {
             "pixnet.net",
             "localhost")));
 
-    private static final Map<String, String> DOMAINS_PUNYCODE = new HashMap<String, String>();
+    private static final Map<String, String> DOMAINS_PUNYCODE = new HashMap<>();
 
     static {
         DOMAINS_PUNYCODE.put("büchner.de", "xn--bchner-3ya.de");
@@ -226,7 +226,7 @@ public class DnsNameResolverTest {
     private static final Set<String> DOMAINS_ALL;
 
     static {
-        Set<String> all = new HashSet<String>(DOMAINS.size() + DOMAINS_PUNYCODE.size());
+        Set<String> all = new HashSet<>(DOMAINS.size() + DOMAINS_PUNYCODE.size());
         all.addAll(DOMAINS);
         all.addAll(DOMAINS_PUNYCODE.values());
         DOMAINS_ALL = Collections.unmodifiableSet(all);
@@ -235,7 +235,7 @@ public class DnsNameResolverTest {
     /**
      * The list of the domain names to exclude from {@link #testResolveAorAAAA()}.
      */
-    private static final Set<String> EXCLUSIONS_RESOLVE_A = new HashSet<String>();
+    private static final Set<String> EXCLUSIONS_RESOLVE_A = new HashSet<>();
 
     static {
         Collections.addAll(
@@ -249,7 +249,7 @@ public class DnsNameResolverTest {
      * The list of the domain names to exclude from {@link #testResolveAAAA()}.
      * Unfortunately, there are only handful of domain names with IPv6 addresses.
      */
-    private static final Set<String> EXCLUSIONS_RESOLVE_AAAA = new HashSet<String>();
+    private static final Set<String> EXCLUSIONS_RESOLVE_AAAA = new HashSet<>();
 
     static {
         EXCLUSIONS_RESOLVE_AAAA.addAll(EXCLUSIONS_RESOLVE_A);
@@ -287,7 +287,7 @@ public class DnsNameResolverTest {
     /**
      * The list of the domain names to exclude from {@link #testQueryMx()}.
      */
-    private static final Set<String> EXCLUSIONS_QUERY_MX = new HashSet<String>();
+    private static final Set<String> EXCLUSIONS_QUERY_MX = new HashSet<>();
 
     static {
         Collections.addAll(
@@ -393,7 +393,7 @@ public class DnsNameResolverTest {
             public Set<ResourceRecord> getRecords(QuestionRecord question) {
                 switch (question.getRecordType()) {
                     case A:
-                        Map<String, Object> attr = new HashMap<String, Object>();
+                        Map<String, Object> attr = new HashMap<>();
                         attr.put(DnsAttribute.IP_ADDRESS.toLowerCase(Locale.US), overriddenIP);
                         return Collections.<ResourceRecord>singleton(
                                 new TestDnsServer.TestResourceRecord(
@@ -405,7 +405,7 @@ public class DnsNameResolverTest {
         });
         dnsServer2.start();
         try {
-            final Set<String> overriddenHostnames = new HashSet<String>();
+            final Set<String> overriddenHostnames = new HashSet<>();
             for (String name : DOMAINS) {
                 if (EXCLUSIONS_RESOLVE_A.contains(name)) {
                     continue;
@@ -541,9 +541,9 @@ public class DnsNameResolverTest {
 
         assertThat(resolver.isRecursionDesired(), is(true));
 
-        final Map<String, InetAddress> results = new HashMap<String, InetAddress>();
+        final Map<String, InetAddress> results = new HashMap<>();
         final Map<String, Future<InetAddress>> futures =
-                new LinkedHashMap<String, Future<InetAddress>>();
+                new LinkedHashMap<>();
 
         for (String name : DOMAINS) {
             if (excludedDomains.contains(name)) {
@@ -586,7 +586,7 @@ public class DnsNameResolverTest {
             assertThat(resolver.isRecursionDesired(), is(true));
 
             Map<String, Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>> futures =
-                    new LinkedHashMap<String, Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>>();
+                    new LinkedHashMap<>();
             for (String name : DOMAINS) {
                 if (EXCLUSIONS_QUERY_MX.contains(name)) {
                     continue;
@@ -603,7 +603,7 @@ public class DnsNameResolverTest {
                 assertThat(response.code(), is(DnsResponseCode.NOERROR));
 
                 final int answerCount = response.count(DnsSection.ANSWER);
-                final List<DnsRecord> mxList = new ArrayList<DnsRecord>(answerCount);
+                final List<DnsRecord> mxList = new ArrayList<>(answerCount);
                 for (int i = 0; i < answerCount; i++) {
                     final DnsRecord r = response.recordAt(DnsSection.ANSWER, i);
                     if (r.type() == DnsRecordType.MX) {
@@ -646,7 +646,7 @@ public class DnsNameResolverTest {
             resolveNonExistentDomain(resolver);
 
             final int size = 10000;
-            final List<UnknownHostException> exceptions = new ArrayList<UnknownHostException>();
+            final List<UnknownHostException> exceptions = new ArrayList<>();
 
             // If negative cache works, this thread should be done really quickly.
             final Thread negativeLookupThread = new Thread() {
@@ -969,7 +969,7 @@ public class DnsNameResolverTest {
         try {
             assertThat(resolver.isRecursionDesired(), is(true));
 
-            final Map<String, Future<List<DnsRecord>>> futures = new LinkedHashMap<String, Future<List<DnsRecord>>>();
+            final Map<String, Future<List<DnsRecord>>> futures = new LinkedHashMap<>();
             for (String name : DOMAINS) {
                 if (EXCLUSIONS_QUERY_MX.contains(name)) {
                     continue;
@@ -1201,7 +1201,7 @@ public class DnsNameResolverTest {
         // This store is non-compliant, returning records of the wrong type for a query.
         // It works since we don't verify the type of the result when resolving to deal with
         // non-compliant servers in the wild.
-        List<Set<ResourceRecord>> records = new ArrayList<Set<ResourceRecord>>();
+        List<Set<ResourceRecord>> records = new ArrayList<>();
         final String ipv6Address = "0:0:0:0:0:0:1:1";
         final String ipv4Address = "1.1.1.1";
         if (types == ResolvedAddressTypes.IPV4_PREFERRED) {
@@ -1242,7 +1242,7 @@ public class DnsNameResolverTest {
         final String hostname = "some.record.netty.io";
         final String hostname2 = "some2.record.netty.io";
 
-        final TestDnsServer dnsServerAuthority = new TestDnsServer(new HashSet<String>(
+        final TestDnsServer dnsServerAuthority = new TestDnsServer(new HashSet<>(
                 Arrays.asList(hostname, hostname2)));
         dnsServerAuthority.start();
 
@@ -1393,7 +1393,7 @@ public class DnsNameResolverTest {
         });
         dnsServerAuthority.start();
 
-        TestDnsServer redirectServer = new TestDnsServer(new HashSet<String>(
+        TestDnsServer redirectServer = new TestDnsServer(new HashSet<>(
                 Arrays.asList(expected.getHostName(), ns1Name, ns2Name))) {
             @Override
             protected DnsMessage filterMessage(DnsMessage message) {
@@ -1528,7 +1528,7 @@ public class DnsNameResolverTest {
                 InetAddress.getByAddress(ns1Name, new byte[] { 10, 0, 0, 4 }),
                 DefaultDnsServerAddressStreamProvider.DNS_PORT);
 
-        TestDnsServer redirectServer = new TestDnsServer(new HashSet<String>(Arrays.asList(hostname, ns1Name))) {
+        TestDnsServer redirectServer = new TestDnsServer(new HashSet<>(Arrays.asList(hostname, ns1Name))) {
             @Override
             protected DnsMessage filterMessage(DnsMessage message) {
                 for (QuestionRecord record: message.getQuestionRecords()) {
@@ -1553,7 +1553,7 @@ public class DnsNameResolverTest {
         redirectServer.start();
         EventLoopGroup group = new NioEventLoopGroup(1);
 
-        final List<InetSocketAddress> cached = new CopyOnWriteArrayList<InetSocketAddress>();
+        final List<InetSocketAddress> cached = new CopyOnWriteArrayList<>();
         final AuthoritativeDnsServerCache authoritativeDnsServerCache = new AuthoritativeDnsServerCache() {
             @Override
             public DnsServerAddressStream get(String hostname) {
@@ -1576,7 +1576,7 @@ public class DnsNameResolverTest {
             }
         };
 
-        final AtomicReference<DnsServerAddressStream> redirectedRef = new AtomicReference<DnsServerAddressStream>();
+        final AtomicReference<DnsServerAddressStream> redirectedRef = new AtomicReference<>();
         final DnsNameResolver resolver = new DnsNameResolver(
                 group.next(), new ReflectiveChannelFactory<DatagramChannel>(NioDatagramChannel.class),
                 NoopDnsCache.INSTANCE, authoritativeDnsServerCache,
@@ -1656,7 +1656,7 @@ public class DnsNameResolverTest {
         final InetSocketAddress ns5Address = new InetSocketAddress(
                 InetAddress.getByAddress(ns2Name, new byte[] { 10, 0, 0, 5 }),
                 DefaultDnsServerAddressStreamProvider.DNS_PORT);
-        TestDnsServer redirectServer = new TestDnsServer(new HashSet<String>(Arrays.asList(hostname, ns1Name))) {
+        TestDnsServer redirectServer = new TestDnsServer(new HashSet<>(Arrays.asList(hostname, ns1Name))) {
             @Override
             protected DnsMessage filterMessage(DnsMessage message) {
                 for (QuestionRecord record: message.getQuestionRecords()) {
@@ -1683,7 +1683,7 @@ public class DnsNameResolverTest {
         redirectServer.start();
         EventLoopGroup group = new NioEventLoopGroup(1);
 
-        final List<InetSocketAddress> cached = new CopyOnWriteArrayList<InetSocketAddress>();
+        final List<InetSocketAddress> cached = new CopyOnWriteArrayList<>();
         final AuthoritativeDnsServerCache authoritativeDnsServerCache = new AuthoritativeDnsServerCache() {
             @Override
             public DnsServerAddressStream get(String hostname) {
@@ -1713,7 +1713,7 @@ public class DnsNameResolverTest {
         cache.cache(ns1Name, null, ns3Address.getAddress(), 10000, loop);
         cache.cache(ns1Name, null, ns4Address.getAddress(), 10000, loop);
 
-        final AtomicReference<DnsServerAddressStream> redirectedRef = new AtomicReference<DnsServerAddressStream>();
+        final AtomicReference<DnsServerAddressStream> redirectedRef = new AtomicReference<>();
         final DnsNameResolver resolver = new DnsNameResolver(
                 loop, new ReflectiveChannelFactory<DatagramChannel>(NioDatagramChannel.class),
                 cache, authoritativeDnsServerCache,
@@ -1803,7 +1803,7 @@ public class DnsNameResolverTest {
     private static final class TestRecursiveCacheDnsQueryLifecycleObserverFactory
             implements DnsQueryLifecycleObserverFactory {
         final Queue<TestDnsQueryLifecycleObserver> observers =
-                new ConcurrentLinkedQueue<TestDnsQueryLifecycleObserver>();
+                new ConcurrentLinkedQueue<>();
         @Override
         public DnsQueryLifecycleObserver newDnsQueryLifecycleObserver(DnsQuestion question) {
             TestDnsQueryLifecycleObserver observer = new TestDnsQueryLifecycleObserver(question);
@@ -1864,7 +1864,7 @@ public class DnsNameResolverTest {
     }
 
     private static final class TestDnsQueryLifecycleObserver implements DnsQueryLifecycleObserver {
-        final Queue<Object> events = new ArrayDeque<Object>();
+        final Queue<Object> events = new ArrayDeque<>();
         final DnsQuestion question;
 
         TestDnsQueryLifecycleObserver(DnsQuestion question) {
@@ -1912,7 +1912,7 @@ public class DnsNameResolverTest {
 
     private static final class TestAuthoritativeDnsServerCache implements AuthoritativeDnsServerCache {
         final AuthoritativeDnsServerCache cache;
-        final Map<String, DnsServerAddressStream> cacheHits = new HashMap<String, DnsServerAddressStream>();
+        final Map<String, DnsServerAddressStream> cacheHits = new HashMap<>();
 
         TestAuthoritativeDnsServerCache(AuthoritativeDnsServerCache cache) {
             this.cache = cache;
@@ -1946,7 +1946,7 @@ public class DnsNameResolverTest {
     private static final class TestDnsCache implements DnsCache {
         final DnsCache cache;
         final Map<String, List<? extends DnsCacheEntry>> cacheHits =
-                new HashMap<String, List<? extends DnsCacheEntry>>();
+                new HashMap<>();
 
         TestDnsCache(DnsCache cache) {
             this.cache = cache;
@@ -2068,14 +2068,14 @@ public class DnsNameResolverTest {
     @Test
     public void testDnsNameResolverBuilderCopy() {
         ChannelFactory<DatagramChannel> channelFactory =
-                new ReflectiveChannelFactory<DatagramChannel>(NioDatagramChannel.class);
+                new ReflectiveChannelFactory<>(NioDatagramChannel.class);
         DnsNameResolverBuilder builder = new DnsNameResolverBuilder(group.next())
                 .channelFactory(channelFactory);
         DnsNameResolverBuilder copiedBuilder = builder.copy();
 
         // change channel factory does not propagate to previously made copy
         ChannelFactory<DatagramChannel> newChannelFactory =
-                new ReflectiveChannelFactory<DatagramChannel>(NioDatagramChannel.class);
+                new ReflectiveChannelFactory<>(NioDatagramChannel.class);
         builder.channelFactory(newChannelFactory);
         assertEquals(channelFactory, copiedBuilder.channelFactory());
         assertEquals(newChannelFactory, builder.channelFactory());
@@ -2088,18 +2088,18 @@ public class DnsNameResolverTest {
             @Override
             public Set<ResourceRecord> getRecords(QuestionRecord question) {
                 if (question.getDomainName().equals("cname.netty.io")) {
-                    Map<String, Object> map1 = new HashMap<String, Object>();
+                    Map<String, Object> map1 = new HashMap<>();
                     map1.put(DnsAttribute.IP_ADDRESS.toLowerCase(), "10.0.0.99");
                     return Collections.<ResourceRecord>singleton(
                             new TestDnsServer.TestResourceRecord(question.getDomainName(), RecordType.A, map1));
                 } else {
-                    Set<ResourceRecord> records = new LinkedHashSet<ResourceRecord>(2);
-                    Map<String, Object> map = new HashMap<String, Object>();
+                    Set<ResourceRecord> records = new LinkedHashSet<>(2);
+                    Map<String, Object> map = new HashMap<>();
                     map.put(DnsAttribute.DOMAIN_NAME.toLowerCase(), "cname.netty.io");
                     records.add(new TestDnsServer.TestResourceRecord(
                             question.getDomainName(), RecordType.CNAME, map));
 
-                    Map<String, Object> map1 = new HashMap<String, Object>();
+                    Map<String, Object> map1 = new HashMap<>();
                     map1.put(DnsAttribute.IP_ADDRESS.toLowerCase(), "10.0.0.2");
                     records.add(new TestDnsServer.TestResourceRecord(
                             question.getDomainName(), RecordType.A, map1));
@@ -2137,7 +2137,7 @@ public class DnsNameResolverTest {
 
             @Override
             public Set<ResourceRecord> getRecords(QuestionRecord question) {
-                Set<ResourceRecord> records = new LinkedHashSet<ResourceRecord>(4);
+                Set<ResourceRecord> records = new LinkedHashSet<>(4);
 
                 records.add(new TestDnsServer.TestResourceRecord("x." + question.getDomainName(),
                         RecordType.A, Collections.<String, Object>singletonMap(
@@ -2332,7 +2332,7 @@ public class DnsNameResolverTest {
 
     @Test
     public void testCNameCached() throws Exception {
-        final Map<String, String> cache = new ConcurrentHashMap<String, String>();
+        final Map<String, String> cache = new ConcurrentHashMap<>();
         final AtomicInteger cnameQueries = new AtomicInteger();
         final AtomicInteger aQueries = new AtomicInteger();
 
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsServerAddressesTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsServerAddressesTest.java
index cf437fe82e..94a6e87dff 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsServerAddressesTest.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsServerAddressesTest.java
@@ -98,7 +98,7 @@ public class DnsServerAddressesTest {
 
         // Ensure that all three addresses are returned by the iterator.
         // In theory, this test can fail at extremely low chance, but we don't really care.
-        Set<InetSocketAddress> set = Collections.newSetFromMap(new IdentityHashMap<InetSocketAddress, Boolean>());
+        Set<InetSocketAddress> set = Collections.newSetFromMap(new IdentityHashMap<>());
         DnsServerAddressStream i = seq.stream();
         for (int j = 0; j < 1048576; j ++) {
             set.add(i.next());
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/NameServerComparatorTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/NameServerComparatorTest.java
index e29932a18b..62d5a8708a 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/NameServerComparatorTest.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/NameServerComparatorTest.java
@@ -101,7 +101,7 @@ public class NameServerComparatorTest {
     @Test
     public void testSortAlreadySortedPreferred() {
         List<InetSocketAddress> expected = Arrays.asList(IPV4ADDRESS1, IPV4ADDRESS2, IPV4ADDRESS3);
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(expected);
+        List<InetSocketAddress> addresses = new ArrayList<>(expected);
         NameServerComparator comparator = new NameServerComparator(Inet4Address.class);
 
         Collections.sort(addresses, comparator);
@@ -112,7 +112,7 @@ public class NameServerComparatorTest {
     @Test
     public void testSortAlreadySortedNotPreferred() {
         List<InetSocketAddress> expected = Arrays.asList(IPV4ADDRESS1, IPV4ADDRESS2, IPV4ADDRESS3);
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(expected);
+        List<InetSocketAddress> addresses = new ArrayList<>(expected);
         NameServerComparator comparator = new NameServerComparator(Inet6Address.class);
 
         Collections.sort(addresses, comparator);
@@ -123,7 +123,7 @@ public class NameServerComparatorTest {
     @Test
     public void testSortAlreadySortedUnresolved() {
         List<InetSocketAddress> expected = Arrays.asList(UNRESOLVED1, UNRESOLVED2, UNRESOLVED3);
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(expected);
+        List<InetSocketAddress> addresses = new ArrayList<>(expected);
         NameServerComparator comparator = new NameServerComparator(Inet6Address.class);
 
         Collections.sort(addresses, comparator);
@@ -136,7 +136,7 @@ public class NameServerComparatorTest {
         List<InetSocketAddress> expected = Arrays.asList(
                 IPV4ADDRESS1, IPV4ADDRESS2, IPV6ADDRESS1, IPV6ADDRESS2, UNRESOLVED1, UNRESOLVED2);
 
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(expected);
+        List<InetSocketAddress> addresses = new ArrayList<>(expected);
         NameServerComparator comparator = new NameServerComparator(Inet4Address.class);
 
         Collections.sort(addresses, comparator);
@@ -148,7 +148,7 @@ public class NameServerComparatorTest {
     public void testSort1() {
         List<InetSocketAddress> expected = Arrays.asList(
                 IPV4ADDRESS1, IPV4ADDRESS2, IPV6ADDRESS1, IPV6ADDRESS2, UNRESOLVED1, UNRESOLVED2);
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(
+        List<InetSocketAddress> addresses = new ArrayList<>(
                 Arrays.asList(IPV6ADDRESS1, IPV4ADDRESS1, IPV6ADDRESS2, UNRESOLVED1, UNRESOLVED2, IPV4ADDRESS2));
         NameServerComparator comparator = new NameServerComparator(Inet4Address.class);
 
@@ -161,7 +161,7 @@ public class NameServerComparatorTest {
     public void testSort2() {
         List<InetSocketAddress> expected = Arrays.asList(
                 IPV4ADDRESS1, IPV4ADDRESS2, IPV6ADDRESS1, IPV6ADDRESS2, UNRESOLVED1, UNRESOLVED2);
-        List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(
+        List<InetSocketAddress> addresses = new ArrayList<>(
                 Arrays.asList(IPV4ADDRESS1, IPV6ADDRESS1, IPV6ADDRESS2, UNRESOLVED1, IPV4ADDRESS2, UNRESOLVED2));
         NameServerComparator comparator = new NameServerComparator(Inet4Address.class);
 
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java
index 3888778ced..f161f44ac6 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java
@@ -75,7 +75,7 @@ public class SearchDomainTest {
 
     @Test
     public void testResolve() throws Exception {
-        Set<String> domains = new HashSet<String>();
+        Set<String> domains = new HashSet<>();
         domains.add("host1.foo.com");
         domains.add("host1");
         domains.add("host3");
@@ -125,7 +125,7 @@ public class SearchDomainTest {
 
     @Test
     public void testResolveAll() throws Exception {
-        Set<String> domains = new HashSet<String>();
+        Set<String> domains = new HashSet<>();
         domains.add("host1.foo.com");
         domains.add("host1");
         domains.add("host3");
@@ -175,7 +175,7 @@ public class SearchDomainTest {
 
     @Test
     public void testMultipleSearchDomain() throws Exception {
-        Set<String> domains = new HashSet<String>();
+        Set<String> domains = new HashSet<>();
         domains.add("host1.foo.com");
         domains.add("host2.bar.com");
         domains.add("host3.bar.com");
@@ -205,7 +205,7 @@ public class SearchDomainTest {
 
     @Test
     public void testSearchDomainWithNdots2() throws Exception {
-        Set<String> domains = new HashSet<String>();
+        Set<String> domains = new HashSet<>();
         domains.add("host1.sub.foo.com");
         domains.add("host2.sub.foo.com");
         domains.add("host2.sub");
@@ -226,7 +226,7 @@ public class SearchDomainTest {
 
     @Test
     public void testSearchDomainWithNdots0() throws Exception {
-        Set<String> domains = new HashSet<String>();
+        Set<String> domains = new HashSet<>();
         domains.add("host1");
         domains.add("host1.foo.com");
         domains.add("host2.foo.com");
@@ -272,7 +272,7 @@ public class SearchDomainTest {
                                                  String inetHost) throws InterruptedException {
         Future<List<InetAddress>> fut = resolver.resolveAll(inetHost);
         assertTrue(fut.await(10, TimeUnit.SECONDS));
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (InetAddress addr : fut.getNow()) {
             list.add(addr.getHostAddress());
         }
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java b/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java
index 229ea98a88..1d86bdc283 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java
@@ -55,7 +55,7 @@ import java.util.Map;
 import java.util.Set;
 
 class TestDnsServer extends DnsServer {
-    private static final Map<String, byte[]> BYTES = new HashMap<String, byte[]>();
+    private static final Map<String, byte[]> BYTES = new HashMap<>();
     private static final String[] IPV6_ADDRESSES;
 
     static {
@@ -197,9 +197,9 @@ class TestDnsServer extends DnsServer {
         private final Map<String, List<String>> domainMap;
 
         MapRecordStoreA(Set<String> domains, int length) {
-            domainMap = new HashMap<String, List<String>>(domains.size());
+            domainMap = new HashMap<>(domains.size());
             for (String domain : domains) {
-                List<String> addresses = new ArrayList<String>(length);
+                List<String> addresses = new ArrayList<>(length);
                 for (int i = 0; i < length; i++) {
                     addresses.add(TestRecordStore.nextIp());
                 }
@@ -224,9 +224,9 @@ class TestDnsServer extends DnsServer {
             String name = questionRecord.getDomainName();
             List<String> addresses = domainMap.get(name);
             if (addresses != null && questionRecord.getRecordType() == RecordType.A) {
-                Set<ResourceRecord> records = new LinkedHashSet<ResourceRecord>();
+                Set<ResourceRecord> records = new LinkedHashSet<>();
                 for (String address : addresses) {
-                    Map<String, Object> attributes = new HashMap<String, Object>();
+                    Map<String, Object> attributes = new HashMap<>();
                     attributes.put(DnsAttribute.IP_ADDRESS.toLowerCase(), address);
                     records.add(new TestResourceRecord(name, questionRecord.getRecordType(), attributes));
                 }
@@ -280,7 +280,7 @@ class TestDnsServer extends DnsServer {
         public Set<ResourceRecord> getRecords(QuestionRecord questionRecord) {
             String name = questionRecord.getDomainName();
             if (domains.contains(name)) {
-                Map<String, Object> attr = new HashMap<String, Object>();
+                Map<String, Object> attr = new HashMap<>();
                 switch (questionRecord.getRecordType()) {
                     case A:
                         do {
diff --git a/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java b/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java
index e9bb9dfd64..2c898baf72 100644
--- a/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java
+++ b/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java
@@ -40,8 +40,7 @@ public abstract class AddressResolverGroup<T extends SocketAddress> implements C
     /**
      * Note that we do not use a {@link ConcurrentMap} here because it is usually expensive to instantiate a resolver.
      */
-    private final Map<EventExecutor, AddressResolver<T>> resolvers =
-            new IdentityHashMap<EventExecutor, AddressResolver<T>>();
+    private final Map<EventExecutor, AddressResolver<T>> resolvers = new IdentityHashMap<>();
 
     protected AddressResolverGroup() { }
 
diff --git a/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java b/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java
index 03f555c5e4..1275cd8422 100644
--- a/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java
+++ b/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java
@@ -32,17 +32,14 @@ public final class HostsFileEntries {
     /**
      * Empty entries
      */
-    static final HostsFileEntries EMPTY =
-            new HostsFileEntries(
-                    Collections.<String, Inet4Address>emptyMap(),
-                    Collections.<String, Inet6Address>emptyMap());
+    static final HostsFileEntries EMPTY = new HostsFileEntries(Collections.emptyMap(), Collections.emptyMap());
 
     private final Map<String, Inet4Address> inet4Entries;
     private final Map<String, Inet6Address> inet6Entries;
 
     public HostsFileEntries(Map<String, Inet4Address> inet4Entries, Map<String, Inet6Address> inet6Entries) {
-        this.inet4Entries = Collections.unmodifiableMap(new HashMap<String, Inet4Address>(inet4Entries));
-        this.inet6Entries = Collections.unmodifiableMap(new HashMap<String, Inet6Address>(inet6Entries));
+        this.inet4Entries = Collections.unmodifiableMap(new HashMap<>(inet4Entries));
+        this.inet6Entries = Collections.unmodifiableMap(new HashMap<>(inet6Entries));
     }
 
     /**
diff --git a/resolver/src/main/java/io/netty/resolver/HostsFileParser.java b/resolver/src/main/java/io/netty/resolver/HostsFileParser.java
index 16eaba6167..b4650589af 100644
--- a/resolver/src/main/java/io/netty/resolver/HostsFileParser.java
+++ b/resolver/src/main/java/io/netty/resolver/HostsFileParser.java
@@ -150,8 +150,8 @@ public final class HostsFileParser {
         checkNotNull(reader, "reader");
         BufferedReader buff = new BufferedReader(reader);
         try {
-            Map<String, Inet4Address> ipv4Entries = new HashMap<String, Inet4Address>();
-            Map<String, Inet6Address> ipv6Entries = new HashMap<String, Inet6Address>();
+            Map<String, Inet4Address> ipv4Entries = new HashMap<>();
+            Map<String, Inet6Address> ipv6Entries = new HashMap<>();
             String line;
             while ((line = buff.readLine()) != null) {
                 // remove comment
@@ -166,7 +166,7 @@ public final class HostsFileParser {
                 }
 
                 // split
-                List<String> lineParts = new ArrayList<String>();
+                List<String> lineParts = new ArrayList<>();
                 for (String s: WHITESPACES.split(line)) {
                     if (!s.isEmpty()) {
                         lineParts.add(s);
diff --git a/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java b/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java
index c7db25d10d..f6aff6093e 100644
--- a/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java
+++ b/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java
@@ -79,7 +79,7 @@ public class InetSocketAddressResolver extends AbstractAddressResolver<InetSocke
                         if (future.isSuccess()) {
                             List<InetAddress> inetAddresses = future.getNow();
                             List<InetSocketAddress> socketAddresses =
-                                    new ArrayList<InetSocketAddress>(inetAddresses.size());
+                                    new ArrayList<>(inetAddresses.size());
                             for (InetAddress inetAddress : inetAddresses) {
                                 socketAddresses.add(new InetSocketAddress(inetAddress, unresolvedAddress.getPort()));
                             }
diff --git a/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java b/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java
index f505328a39..41799239c8 100644
--- a/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java
+++ b/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java
@@ -83,7 +83,7 @@ public class RoundRobinInetAddressResolver extends InetNameResolver {
                     List<InetAddress> inetAddresses = future.getNow();
                     if (!inetAddresses.isEmpty()) {
                         // create a copy to make sure that it's modifiable random access collection
-                        List<InetAddress> result = new ArrayList<InetAddress>(inetAddresses);
+                        List<InetAddress> result = new ArrayList<>(inetAddresses);
                         // rotate by different distance each time to force round robin distribution
                         Collections.rotate(result, randomIndex(inetAddresses.size()));
                         promise.setSuccess(result);
diff --git a/resolver/src/test/java/io/netty/resolver/DefaultHostsFileEntriesResolverTest.java b/resolver/src/test/java/io/netty/resolver/DefaultHostsFileEntriesResolverTest.java
index d4d4c99188..88d3d49710 100644
--- a/resolver/src/test/java/io/netty/resolver/DefaultHostsFileEntriesResolverTest.java
+++ b/resolver/src/test/java/io/netty/resolver/DefaultHostsFileEntriesResolverTest.java
@@ -40,8 +40,8 @@ public class DefaultHostsFileEntriesResolverTest {
 
     @Test
     public void shouldntFindWhenAddressTypeDoesntMatch() {
-        Map<String, Inet4Address> inet4Entries = new HashMap<String, Inet4Address>();
-        Map<String, Inet6Address> inet6Entries = new HashMap<String, Inet6Address>();
+        Map<String, Inet4Address> inet4Entries = new HashMap<>();
+        Map<String, Inet6Address> inet6Entries = new HashMap<>();
 
         inet4Entries.put("localhost", NetUtil.LOCALHOST4);
 
@@ -54,8 +54,8 @@ public class DefaultHostsFileEntriesResolverTest {
 
     @Test
     public void shouldPickIpv4WhenBothAreDefinedButIpv4IsPreferred() {
-        Map<String, Inet4Address> inet4Entries = new HashMap<String, Inet4Address>();
-        Map<String, Inet6Address> inet6Entries = new HashMap<String, Inet6Address>();
+        Map<String, Inet4Address> inet4Entries = new HashMap<>();
+        Map<String, Inet6Address> inet6Entries = new HashMap<>();
 
         inet4Entries.put("localhost", NetUtil.LOCALHOST4);
         inet6Entries.put("localhost", NetUtil.LOCALHOST6);
@@ -69,8 +69,8 @@ public class DefaultHostsFileEntriesResolverTest {
 
     @Test
     public void shouldPickIpv6WhenBothAreDefinedButIpv6IsPreferred() {
-        Map<String, Inet4Address> inet4Entries = new HashMap<String, Inet4Address>();
-        Map<String, Inet6Address> inet6Entries = new HashMap<String, Inet6Address>();
+        Map<String, Inet4Address> inet4Entries = new HashMap<>();
+        Map<String, Inet6Address> inet6Entries = new HashMap<>();
 
         inet4Entries.put("localhost", NetUtil.LOCALHOST4);
         inet6Entries.put("localhost", NetUtil.LOCALHOST6);
diff --git a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
index 891e2a6087..60034bddcc 100644
--- a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
+++ b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
@@ -49,7 +49,7 @@ public class OsgiBundleTest {
     private static final Collection<String> BUNDLES;
 
     static {
-        final Set<String> artifacts = new HashSet<String>();
+        final Set<String> artifacts = new HashSet<>();
         final File f = new File("target/classes/META-INF/maven/dependencies.properties");
         try {
             final BufferedReader r = new BufferedReader(new FileReader(f));
@@ -86,7 +86,7 @@ public class OsgiBundleTest {
 
     @Configuration
     public final Option[] config() {
-        final Collection<Option> options = new ArrayList<Option>();
+        final Collection<Option> options = new ArrayList<>();
 
         // Avoid boot delegating sun.misc which would fail testCanLoadPlatformDependent()
         options.add(frameworkProperty(FRAMEWORK_BOOTDELEGATION).value("com.sun.*"));
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java
index 8dc7b1aacd..e70a85910e 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/TestsuitePermutation.java
@@ -26,7 +26,7 @@ import java.util.List;
 public final class TestsuitePermutation {
 
     public static List<ByteBufAllocator> allocator() {
-        List<ByteBufAllocator> allocators = new ArrayList<ByteBufAllocator>();
+        List<ByteBufAllocator> allocators = new ArrayList<>();
         allocators.add(UnpooledByteBufAllocator.DEFAULT);
         allocators.add(PooledByteBufAllocator.DEFAULT);
         return allocators;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
index ca63e07e60..fdd6545dda 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
@@ -150,7 +150,7 @@ public class SctpEchoTest extends AbstractSctpTest {
 
     private static class EchoHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         @Override
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
index f249fe6e12..ed14828f41 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
@@ -70,7 +70,7 @@ public final class SctpTestPermutation {
 
     static List<BootstrapComboFactory<ServerBootstrap, Bootstrap>> sctpChannel() {
         List<BootstrapComboFactory<ServerBootstrap, Bootstrap>> list =
-                new ArrayList<BootstrapComboFactory<ServerBootstrap, Bootstrap>>();
+                new ArrayList<>();
 
         // Make the list of SCTP ServerBootstrap factories.
         List<BootstrapFactory<ServerBootstrap>> sbfs = sctpServerChannel();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java
index 3538d8baa4..a82a4f1c00 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java
@@ -51,7 +51,7 @@ public class CompositeBufferGatheringWriteTest extends AbstractSocketTest {
         Channel clientChannel = null;
         try {
             final CountDownLatch latch = new CountDownLatch(1);
-            final AtomicReference<Object> clientReceived = new AtomicReference<Object>();
+            final AtomicReference<Object> clientReceived = new AtomicReference<>();
             sb.childHandler(new ChannelInitializer<Channel>() {
                 @Override
                 protected void initChannel(Channel ch) throws Exception {
@@ -160,7 +160,7 @@ public class CompositeBufferGatheringWriteTest extends AbstractSocketTest {
             final ByteBuf expectedContent = alloc.buffer(soSndBuf * 2);
             expectedContent.writeBytes(newRandomBytes(expectedContent.writableBytes(), r));
             final CountDownLatch latch = new CountDownLatch(1);
-            final AtomicReference<Object> clientReceived = new AtomicReference<Object>();
+            final AtomicReference<Object> clientReceived = new AtomicReference<>();
             sb.childOption(ChannelOption.SO_SNDBUF, soSndBuf)
               .childHandler(new ChannelInitializer<Channel>() {
                 @Override
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
index f7fafff1b9..6adc603918 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/ServerSocketSuspendTest.java
@@ -52,7 +52,7 @@ public class ServerSocketSuspendTest extends AbstractServerSocketTest {
 
         Channel sc = sb.bind().sync().channel();
 
-        List<Socket> sockets = new ArrayList<Socket>();
+        List<Socket> sockets = new ArrayList<>();
 
         try {
             long startTime = System.nanoTime();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
index ed6ad174b8..6fc36e9542 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
@@ -74,7 +74,7 @@ public class SocketBufReleaseTest extends AbstractSocketTest {
         private final Random random = new Random();
         private final CountDownLatch latch = new CountDownLatch(1);
         private ByteBuf buf;
-        private final Promise<Channel> channelFuture = new DefaultPromise<Channel>(executor);
+        private final Promise<Channel> channelFuture = new DefaultPromise<>(executor);
 
         @Override
         public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
index 812e9149b0..125b0c7f95 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
@@ -96,7 +96,7 @@ public class SocketCancelWriteTest extends AbstractSocketTest {
 
     private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
         final ByteBuf received = Unpooled.buffer();
         @Override
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java
index 0f96d04790..4b33a40464 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java
@@ -78,7 +78,7 @@ public class SocketConnectTest extends AbstractSocketTest {
     }
 
     public void testChannelEventsFiredWhenClosedDirectly(ServerBootstrap sb, Bootstrap cb) throws Throwable {
-        final BlockingQueue<Integer> events = new LinkedBlockingQueue<Integer>();
+        final BlockingQueue<Integer> events = new LinkedBlockingQueue<>();
 
         Channel sc = null;
         Channel cc = null;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java
index f4d218d957..7beefed778 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java
@@ -50,7 +50,7 @@ public class SocketDataReadInitialStateTest extends AbstractSocketTest {
             final CountDownLatch acceptorReadLatch = new CountDownLatch(1);
             final CountDownLatch serverReadLatch = new CountDownLatch(1);
             final CountDownLatch clientReadLatch = new CountDownLatch(1);
-            final AtomicReference<Channel> serverConnectedChannelRef = new AtomicReference<Channel>();
+            final AtomicReference<Channel> serverConnectedChannelRef = new AtomicReference<>();
 
             sb.handler(new ChannelInitializer<Channel>() {
                 @Override
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
index 19136043c1..e2a63e00d7 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
@@ -219,7 +219,7 @@ public class SocketEchoTest extends AbstractSocketTest {
     private static class EchoHandler extends SimpleChannelInboundHandler<ByteBuf> {
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         EchoHandler(boolean autoRead) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
index 53deb6c674..f9bfbcbecc 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
@@ -201,7 +201,7 @@ public class SocketFileRegionTest extends AbstractSocketTest {
     private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         TestHandler(boolean autoRead) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
index 080244a84c..7145f45424 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
@@ -141,7 +141,7 @@ public class SocketFixedLengthEchoTest extends AbstractSocketTest {
     private static class EchoHandler extends SimpleChannelInboundHandler<ByteBuf> {
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         EchoHandler(boolean autoRead) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
index 4d9844fdb7..a9879f28f5 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
@@ -207,7 +207,7 @@ public class SocketGatheringWriteTest extends AbstractSocketTest {
     private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         TestHandler(boolean autoRead) {
             this.autoRead = autoRead;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java
index 2680810a91..4729d86684 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java
@@ -250,7 +250,7 @@ public class SocketHalfClosedTest extends AbstractSocketTest {
         final int expectedBytes = 100;
         final CountDownLatch serverReadExpectedLatch = new CountDownLatch(1);
         final CountDownLatch doneLatch = new CountDownLatch(1);
-        final AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> causeRef = new AtomicReference<>();
         Channel serverChannel = null;
         Channel clientChannel = null;
         try {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java
index 64971b951b..7cc14ed874 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java
@@ -63,7 +63,7 @@ public class SocketMultipleConnectTest extends AbstractSocketTest {
     @Override
     protected List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
         List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> factories
-                = new ArrayList<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>>();
+                = new ArrayList<>();
         for (TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap> comboFactory
                 : SocketTestPermutation.INSTANCE.socket()) {
             if (comboFactory.newClientInstance().config().group() instanceof NioEventLoopGroup) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
index 7b3a58cfac..9d79dfe248 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
@@ -152,7 +152,7 @@ public class SocketObjectEchoTest extends AbstractSocketTest {
     private static class EchoHandler extends ChannelInboundHandlerAdapter {
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         EchoHandler(boolean autoRead) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketRstTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketRstTest.java
index 4cde8b023b..11d52a8bac 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketRstTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketRstTest.java
@@ -46,8 +46,8 @@ public class SocketRstTest extends AbstractSocketTest {
     }
 
     public void testSoLingerZeroCausesOnlyRstOnClose(ServerBootstrap sb, Bootstrap cb) throws Throwable {
-        final AtomicReference<Channel> serverChannelRef = new AtomicReference<Channel>();
-        final AtomicReference<Throwable> throwableRef = new AtomicReference<Throwable>();
+        final AtomicReference<Channel> serverChannelRef = new AtomicReference<>();
+        final AtomicReference<Throwable> throwableRef = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         final CountDownLatch latch2 = new CountDownLatch(1);
         // SO_LINGER=0 means that we must send ONLY a RST when closing (not a FIN + RST).
@@ -101,8 +101,8 @@ public class SocketRstTest extends AbstractSocketTest {
     }
 
     public void testNoRstIfSoLingerOnClose(ServerBootstrap sb, Bootstrap cb) throws Throwable {
-        final AtomicReference<Channel> serverChannelRef = new AtomicReference<Channel>();
-        final AtomicReference<Throwable> throwableRef = new AtomicReference<Throwable>();
+        final AtomicReference<Channel> serverChannelRef = new AtomicReference<>();
+        final AtomicReference<Throwable> throwableRef = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         final CountDownLatch latch2 = new CountDownLatch(1);
         sb.childHandler(new ChannelInitializer<Channel>() {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
index f18109e039..ffafbbcc76 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputByPeerTest.java
@@ -121,7 +121,7 @@ public class SocketShutdownOutputByPeerTest extends AbstractServerSocketTest {
 
     private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile SocketChannel ch;
-        final BlockingQueue<Byte> queue = new LinkedBlockingQueue<Byte>();
+        final BlockingQueue<Byte> queue = new LinkedBlockingQueue<>();
         final CountDownLatch halfClosure = new CountDownLatch(1);
         final CountDownLatch closure = new CountDownLatch(1);
         final AtomicInteger halfClosureCount = new AtomicInteger();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
index 20005d356c..3fc6dbde78 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
@@ -246,8 +246,8 @@ public class SocketShutdownOutputBySelfTest extends AbstractClientSocketTest {
 
     private static final class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile SocketChannel ch;
-        final BlockingQueue<Byte> queue = new LinkedBlockingQueue<Byte>();
-        final BlockingDeque<Boolean> writabilityQueue = new LinkedBlockingDeque<Boolean>();
+        final BlockingQueue<Byte> queue = new LinkedBlockingQueue<>();
+        final BlockingDeque<Boolean> writabilityQueue = new LinkedBlockingDeque<>();
 
         @Override
         public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
index ca98ff7fb6..9ecfe45754 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
@@ -228,7 +228,7 @@ public class SocketSpdyEchoTest extends AbstractSocketTest {
 
     private static class SpdyEchoTestServerHandler extends ChannelInboundHandlerAdapter {
         private final boolean autoRead;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         SpdyEchoTestServerHandler(boolean autoRead) {
             this.autoRead = autoRead;
@@ -267,7 +267,7 @@ public class SocketSpdyEchoTest extends AbstractSocketTest {
 
     private static class SpdyEchoTestClientHandler extends SimpleChannelInboundHandler<ByteBuf> {
         private final boolean autoRead;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         final ByteBuf frames;
         volatile int counter;
 
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
index 8036f081f4..9ba7a85609 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
@@ -75,8 +75,8 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest {
 
     @Parameters(name = "{index}: serverEngine = {0}, clientEngine = {1}")
     public static Collection<Object[]> data() throws Exception {
-        List<SslContext> serverContexts = new ArrayList<SslContext>();
-        List<SslContext> clientContexts = new ArrayList<SslContext>();
+        List<SslContext> serverContexts = new ArrayList<>();
+        List<SslContext> clientContexts = new ArrayList<>();
         clientContexts.add(new JdkSslClientContext(CERT_FILE));
 
         boolean hasOpenSsl = OpenSsl.isAvailable();
@@ -87,7 +87,7 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest {
             logger.warn("OpenSSL is unavailable and thus will not be tested.", OpenSsl.unavailabilityCause());
         }
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslContext sc: serverContexts) {
             for (SslContext cc: clientContexts) {
                 for (int i = 0; i < 32; i++) {
@@ -102,8 +102,8 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest {
     private final SslContext serverCtx;
     private final SslContext clientCtx;
 
-    private final AtomicReference<Throwable> clientException = new AtomicReference<Throwable>();
-    private final AtomicReference<Throwable> serverException = new AtomicReference<Throwable>();
+    private final AtomicReference<Throwable> clientException = new AtomicReference<>();
+    private final AtomicReference<Throwable> serverException = new AtomicReference<>();
 
     private volatile Channel clientChannel;
     private volatile Channel serverChannel;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
index 4cdeae98be..b187d2ccf2 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
@@ -122,14 +122,14 @@ public class SocketSslEchoTest extends AbstractSocketTest {
             "serverUsesDelegatedTaskExecutor = {3}, clientUsesDelegatedTaskExecutor = {4}, " +
             "autoRead = {5}, useChunkedWriteHandler = {6}, useCompositeByteBuf = {7}")
     public static Collection<Object[]> data() throws Exception {
-        List<SslContext> serverContexts = new ArrayList<SslContext>();
+        List<SslContext> serverContexts = new ArrayList<>();
         serverContexts.add(SslContextBuilder.forServer(CERT_FILE, KEY_FILE)
                                             .sslProvider(SslProvider.JDK)
                                             // As we test renegotiation we should use a protocol that support it.
                                             .protocols("TLSv1.2")
                                             .build());
 
-        List<SslContext> clientContexts = new ArrayList<SslContext>();
+        List<SslContext> clientContexts = new ArrayList<>();
         clientContexts.add(SslContextBuilder.forClient()
                                             .sslProvider(SslProvider.JDK)
                                             .trustManager(CERT_FILE)
@@ -154,7 +154,7 @@ public class SocketSslEchoTest extends AbstractSocketTest {
             logger.warn("OpenSSL is unavailable and thus will not be tested.", OpenSsl.unavailabilityCause());
         }
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslContext sc: serverContexts) {
             for (SslContext cc: clientContexts) {
                 for (RenegotiationType rt: RenegotiationType.values()) {
@@ -200,8 +200,8 @@ public class SocketSslEchoTest extends AbstractSocketTest {
     private final boolean useChunkedWriteHandler;
     private final boolean useCompositeByteBuf;
 
-    private final AtomicReference<Throwable> clientException = new AtomicReference<Throwable>();
-    private final AtomicReference<Throwable> serverException = new AtomicReference<Throwable>();
+    private final AtomicReference<Throwable> clientException = new AtomicReference<>();
+    private final AtomicReference<Throwable> serverException = new AtomicReference<>();
 
     private final AtomicInteger clientSendCounter = new AtomicInteger();
     private final AtomicInteger clientRecvCounter = new AtomicInteger();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
index d7db90be8b..ba0662d723 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java
@@ -76,10 +76,10 @@ public class SocketSslGreetingTest extends AbstractSocketTest {
 
     @Parameters(name = "{index}: serverEngine = {0}, clientEngine = {1}")
     public static Collection<Object[]> data() throws Exception {
-        List<SslContext> serverContexts = new ArrayList<SslContext>();
+        List<SslContext> serverContexts = new ArrayList<>();
         serverContexts.add(SslContextBuilder.forServer(CERT_FILE, KEY_FILE).sslProvider(SslProvider.JDK).build());
 
-        List<SslContext> clientContexts = new ArrayList<SslContext>();
+        List<SslContext> clientContexts = new ArrayList<>();
         clientContexts.add(SslContextBuilder.forClient().sslProvider(SslProvider.JDK).trustManager(CERT_FILE).build());
 
         boolean hasOpenSsl = OpenSsl.isAvailable();
@@ -92,7 +92,7 @@ public class SocketSslGreetingTest extends AbstractSocketTest {
             logger.warn("OpenSSL is unavailable and thus will not be tested.", OpenSsl.unavailabilityCause());
         }
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslContext sc: serverContexts) {
             for (SslContext cc: clientContexts) {
                 params.add(new Object[] { sc, cc });
@@ -164,7 +164,7 @@ public class SocketSslGreetingTest extends AbstractSocketTest {
 
     private static class ClientHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
 
         @Override
@@ -189,7 +189,7 @@ public class SocketSslGreetingTest extends AbstractSocketTest {
 
     private static class ServerHandler extends SimpleChannelInboundHandler<String> {
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         @Override
         protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java
index 5d0fd0a5e4..4907fab0e1 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java
@@ -162,7 +162,7 @@ public class SocketSslSessionReuseTest extends AbstractSocketTest {
     }
 
     private static Set<String> sessionIdSet(Enumeration<byte[]> sessionIds) {
-        Set<String> idSet = new HashSet<String>();
+        Set<String> idSet = new HashSet<>();
         byte[] id;
         while (sessionIds.hasMoreElements()) {
             id = sessionIds.nextElement();
@@ -173,7 +173,7 @@ public class SocketSslSessionReuseTest extends AbstractSocketTest {
 
     @Sharable
     private static class ReadAndDiscardHandler extends SimpleChannelInboundHandler<ByteBuf> {
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         private final boolean server;
         private final boolean autoRead;
 
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
index a0331cc9c6..6a2b6b6e9b 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java
@@ -81,10 +81,10 @@ public class SocketStartTlsTest extends AbstractSocketTest {
 
     @Parameters(name = "{index}: serverEngine = {0}, clientEngine = {1}")
     public static Collection<Object[]> data() throws Exception {
-        List<SslContext> serverContexts = new ArrayList<SslContext>();
+        List<SslContext> serverContexts = new ArrayList<>();
         serverContexts.add(SslContextBuilder.forServer(CERT_FILE, KEY_FILE).sslProvider(SslProvider.JDK).build());
 
-        List<SslContext> clientContexts = new ArrayList<SslContext>();
+        List<SslContext> clientContexts = new ArrayList<>();
         clientContexts.add(SslContextBuilder.forClient().sslProvider(SslProvider.JDK).trustManager(CERT_FILE).build());
 
         boolean hasOpenSsl = OpenSsl.isAvailable();
@@ -97,7 +97,7 @@ public class SocketStartTlsTest extends AbstractSocketTest {
             logger.warn("OpenSSL is unavailable and thus will not be tested.", OpenSsl.unavailabilityCause());
         }
 
-        List<Object[]> params = new ArrayList<Object[]>();
+        List<Object[]> params = new ArrayList<>();
         for (SslContext sc: serverContexts) {
             for (SslContext cc: clientContexts) {
                 params.add(new Object[] { sc, cc });
@@ -228,7 +228,7 @@ public class SocketStartTlsTest extends AbstractSocketTest {
         private final SslHandler sslHandler;
         private final boolean autoRead;
         private Future<Channel> handshakeFuture;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         StartTlsClientHandler(SSLEngine engine, boolean autoRead) {
             engine.setUseClientMode(true);
@@ -283,7 +283,7 @@ public class SocketStartTlsTest extends AbstractSocketTest {
         private final SslHandler sslHandler;
         private final boolean autoRead;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         StartTlsServerHandler(SSLEngine engine, boolean autoRead) {
             engine.setUseClientMode(false);
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
index 3f807fa58e..d3afcccc8c 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
@@ -131,7 +131,7 @@ public class SocketStringEchoTest extends AbstractSocketTest {
         private final Promise<Void> donePromise;
         private int dataIndex;
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         StringEchoHandler(boolean autoRead, Promise<Void> donePromise) {
             this.autoRead = autoRead;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
index c9aa2348d2..92cc47dccd 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
@@ -62,7 +62,7 @@ public class SocketTestPermutation {
     protected <A extends AbstractBootstrap<?, ?, ?>, B extends AbstractBootstrap<?, ?, ?>>
     List<BootstrapComboFactory<A, B>> combo(List<BootstrapFactory<A>> sbfs, List<BootstrapFactory<B>> cbfs) {
 
-        List<BootstrapComboFactory<A, B>> list = new ArrayList<BootstrapComboFactory<A, B>>();
+        List<BootstrapComboFactory<A, B>> list = new ArrayList<>();
 
         // Populate the combinations
         for (BootstrapFactory<A> sbf: sbfs) {
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
index bf8a4ed273..529a8dc362 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java
@@ -383,7 +383,7 @@ public class TrafficShapingHandlerTest extends AbstractSocketTest {
 
     private static class ClientHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int step;
         // first message will always be validated
         private long currentLastTime = TrafficCounter.milliSecondFromNano();
@@ -456,7 +456,7 @@ public class TrafficShapingHandlerTest extends AbstractSocketTest {
         private final int[] multipleMessage;
         volatile Channel channel;
         volatile int step;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         ServerHandler(int[] autoRead, int[] multipleMessage) {
             this.autoRead = autoRead;
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
index 67f863b6c0..9deb9a193e 100644
--- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
+++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
@@ -395,8 +395,8 @@ public final class EpollDatagramChannel extends AbstractEpollChannel implements
 
                 ByteBuf content = (ByteBuf) e.content();
                 return UnixChannelUtil.isBufferCopyNeededForWrite(content)?
-                        new DefaultAddressedEnvelope<ByteBuf, InetSocketAddress>(
-                            newDirectBuffer(e, content), (InetSocketAddress) e.recipient()) : e;
+                        new DefaultAddressedEnvelope<>(
+                                newDirectBuffer(e, content), (InetSocketAddress) e.recipient()) : e;
             }
         }
 
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
index 080c835e30..e41a2397fc 100644
--- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
+++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/TcpMd5Util.java
@@ -64,7 +64,7 @@ final class TcpMd5Util {
         }
 
         // Set new mappings and store addresses which we set.
-        final Collection<InetAddress> addresses = new ArrayList<InetAddress>(newKeys.size());
+        final Collection<InetAddress> addresses = new ArrayList<>(newKeys.size());
         for (Entry<InetAddress, byte[]> e : newKeys.entrySet()) {
             channel.socket.setTcpMd5Sig(e.getKey(), e.getValue());
             addresses.add(e.getKey());
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDomainSocketFdTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDomainSocketFdTest.java
index 62fc4ffd30..0c46694690 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDomainSocketFdTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDomainSocketFdTest.java
@@ -52,7 +52,7 @@ public class EpollDomainSocketFdTest extends AbstractSocketTest {
     }
 
     public void testSendRecvFd(ServerBootstrap sb, Bootstrap cb) throws Throwable {
-        final BlockingQueue<Object> queue = new LinkedBlockingQueue<Object>(1);
+        final BlockingQueue<Object> queue = new LinkedBlockingQueue<>(1);
         sb.childHandler(new ChannelInboundHandlerAdapter() {
             @Override
             public void channelActive(ChannelHandlerContext ctx) throws Exception {
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollEventLoopTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollEventLoopTest.java
index 4e51114422..268e626a19 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollEventLoopTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollEventLoopTest.java
@@ -35,7 +35,7 @@ public class EpollEventLoopTest {
 
     @Test
     public void testScheduleBigDelayNotOverflow() {
-        final AtomicReference<Throwable> capture = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> capture = new AtomicReference<>();
 
         final EventLoopGroup group = new EpollEventLoop(null,
                 new ThreadPerTaskExecutor(new DefaultThreadFactory(getClass())), 0,
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketMultipleConnectTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketMultipleConnectTest.java
index 1d53a8045b..09c1167a5a 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketMultipleConnectTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketMultipleConnectTest.java
@@ -30,7 +30,7 @@ public class EpollSocketMultipleConnectTest extends SocketMultipleConnectTest {
     @Override
     protected List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
         List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> factories
-                = new ArrayList<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>>();
+                = new ArrayList<>();
         for (TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap> comboFactory
                 : EpollSocketTestPermutation.INSTANCE.socket()) {
             EventLoopGroup group = comboFactory.newClientInstance().config().group();
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketStringEchoBusyWaitTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketStringEchoBusyWaitTest.java
index f67b6da94f..3ce1d1535a 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketStringEchoBusyWaitTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketStringEchoBusyWaitTest.java
@@ -63,7 +63,7 @@ public class EpollSocketStringEchoBusyWaitTest extends SocketStringEchoTest {
     @Override
     protected List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
         List<BootstrapComboFactory<ServerBootstrap, Bootstrap>> list =
-                new ArrayList<BootstrapComboFactory<ServerBootstrap, Bootstrap>>();
+                new ArrayList<>();
         final BootstrapFactory<ServerBootstrap> sbf = serverSocket();
         final BootstrapFactory<Bootstrap> cbf = clientSocket();
         list.add(new BootstrapComboFactory<ServerBootstrap, Bootstrap>() {
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java
index 2cfb165b1d..10ea7d9ba9 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java
@@ -70,7 +70,7 @@ class EpollSocketTestPermutation extends SocketTestPermutation {
     @SuppressWarnings("unchecked")
     @Override
     public List<BootstrapFactory<ServerBootstrap>> serverSocket() {
-        List<BootstrapFactory<ServerBootstrap>> toReturn = new ArrayList<BootstrapFactory<ServerBootstrap>>();
+        List<BootstrapFactory<ServerBootstrap>> toReturn = new ArrayList<>();
         toReturn.add(new BootstrapFactory<ServerBootstrap>() {
             @Override
             public ServerBootstrap newInstance() {
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java
index c53ff1ea78..06c4c9dbb7 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java
@@ -248,7 +248,7 @@ public class EpollSpliceTest {
 
     private static class EchoHandler extends SimpleChannelInboundHandler<ByteBuf> {
         volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
         volatile int counter;
 
         @Override
@@ -294,7 +294,7 @@ public class EpollSpliceTest {
 
         volatile Channel channel;
         volatile ChannelFuture future;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
         public SpliceHandler(File file) {
             this.file = file;
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTest.java
index 5a9cb19a1f..94108560bb 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTest.java
@@ -42,7 +42,7 @@ public class EpollTest {
             Native.epollCtlAdd(epoll.intValue(), timerFd.intValue(), Native.EPOLLIN);
             Native.epollCtlAdd(epoll.intValue(), eventfd.intValue(), Native.EPOLLIN);
 
-            final AtomicReference<Throwable> ref = new AtomicReference<Throwable>();
+            final AtomicReference<Throwable> ref = new AtomicReference<>();
             Thread t = new Thread(new Runnable() {
                 @Override
                 public void run() {
diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
index 09476a5f4b..21542352d6 100644
--- a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
+++ b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
@@ -367,7 +367,7 @@ public final class KQueueDatagramChannel extends AbstractKQueueChannel implement
 
                 ByteBuf content = (ByteBuf) e.content();
                 return UnixChannelUtil.isBufferCopyNeededForWrite(content)?
-                        new DefaultAddressedEnvelope<ByteBuf, InetSocketAddress>(
+                        new DefaultAddressedEnvelope<>(
                                 newDirectBuffer(e, content), (InetSocketAddress) e.recipient()) : e;
             }
         }
diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueDomainSocketFdTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueDomainSocketFdTest.java
index 310b082c72..2dbe144901 100644
--- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueDomainSocketFdTest.java
+++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueDomainSocketFdTest.java
@@ -51,7 +51,7 @@ public class KQueueDomainSocketFdTest extends AbstractSocketTest {
     }
 
     public void testSendRecvFd(ServerBootstrap sb, Bootstrap cb) throws Throwable {
-        final BlockingQueue<Object> queue = new LinkedBlockingQueue<Object>(1);
+        final BlockingQueue<Object> queue = new LinkedBlockingQueue<>(1);
         sb.childHandler(new ChannelInboundHandlerAdapter() {
             @Override
             public void channelActive(ChannelHandlerContext ctx) throws Exception {
diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketMultipleConnectTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketMultipleConnectTest.java
index fb66e5f2d1..bc55852599 100644
--- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketMultipleConnectTest.java
+++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketMultipleConnectTest.java
@@ -29,7 +29,7 @@ public class KQueueSocketMultipleConnectTest extends SocketMultipleConnectTest {
     @Override
     protected List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
         List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> factories
-                = new ArrayList<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>>();
+                = new ArrayList<>();
         for (TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap> comboFactory
                 : KQueueSocketTestPermutation.INSTANCE.socket()) {
             EventLoopGroup group = comboFactory.newClientInstance().config().group();
diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java
index abe27938a9..8a64b62a0b 100644
--- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java
+++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java
@@ -64,7 +64,7 @@ class KQueueSocketTestPermutation extends SocketTestPermutation {
     @SuppressWarnings("unchecked")
     @Override
     public List<BootstrapFactory<ServerBootstrap>> serverSocket() {
-        List<BootstrapFactory<ServerBootstrap>> toReturn = new ArrayList<BootstrapFactory<ServerBootstrap>>();
+        List<BootstrapFactory<ServerBootstrap>> toReturn = new ArrayList<>();
         toReturn.add(new BootstrapFactory<ServerBootstrap>() {
             @Override
             public ServerBootstrap newInstance() {
diff --git a/transport-native-unix-common/src/test/java/io/netty/channel/unix/UnixChannelUtilTest.java b/transport-native-unix-common/src/test/java/io/netty/channel/unix/UnixChannelUtilTest.java
index af7841d87c..a53177aafb 100644
--- a/transport-native-unix-common/src/test/java/io/netty/channel/unix/UnixChannelUtilTest.java
+++ b/transport-native-unix-common/src/test/java/io/netty/channel/unix/UnixChannelUtilTest.java
@@ -66,7 +66,7 @@ public class UnixChannelUtilTest {
     private static void assertCompositeByteBufIsBufferCopyNeededForWrite(ByteBufAllocator alloc, int numDirect,
                                                                          int numHeap, boolean expected) {
         CompositeByteBuf comp = alloc.compositeBuffer(numDirect + numHeap);
-        List<ByteBuf> byteBufs = new LinkedList<ByteBuf>();
+        List<ByteBuf> byteBufs = new LinkedList<>();
 
         while (numDirect > 0) {
             byteBufs.add(alloc.directBuffer(1));
diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
index e20fb2bda0..26f0af6008 100644
--- a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
@@ -151,7 +151,7 @@ public class NioSctpChannel extends AbstractNioMessageChannel implements io.nett
     public Set<InetSocketAddress> allLocalAddresses() {
         try {
             final Set<SocketAddress> allLocalAddresses = javaChannel().getAllLocalAddresses();
-            final Set<InetSocketAddress> addresses = new LinkedHashSet<InetSocketAddress>(allLocalAddresses.size());
+            final Set<InetSocketAddress> addresses = new LinkedHashSet<>(allLocalAddresses.size());
             for (SocketAddress socketAddress : allLocalAddresses) {
                 addresses.add((InetSocketAddress) socketAddress);
             }
@@ -170,7 +170,7 @@ public class NioSctpChannel extends AbstractNioMessageChannel implements io.nett
     public Set<InetSocketAddress> allRemoteAddresses() {
         try {
             final Set<SocketAddress> allLocalAddresses = javaChannel().getRemoteAddresses();
-            final Set<InetSocketAddress> addresses = new HashSet<InetSocketAddress>(allLocalAddresses.size());
+            final Set<InetSocketAddress> addresses = new HashSet<>(allLocalAddresses.size());
             for (SocketAddress socketAddress : allLocalAddresses) {
                 addresses.add((InetSocketAddress) socketAddress);
             }
diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
index ab8aea54d6..a4c3d524ba 100644
--- a/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
@@ -86,7 +86,7 @@ public class NioSctpServerChannel extends AbstractNioMessageChannel
     public Set<InetSocketAddress> allLocalAddresses() {
         try {
             final Set<SocketAddress> allLocalAddresses = javaChannel().getAllLocalAddresses();
-            final Set<InetSocketAddress> addresses = new LinkedHashSet<InetSocketAddress>(allLocalAddresses.size());
+            final Set<InetSocketAddress> addresses = new LinkedHashSet<>(allLocalAddresses.size());
             for (SocketAddress socketAddress : allLocalAddresses) {
                 addresses.add((InetSocketAddress) socketAddress);
             }
diff --git a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
index 0a09a5e847..567bb2cff8 100644
--- a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
+++ b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * {@link ChannelInboundHandler}.
  */
 public class SctpMessageCompletionHandler extends MessageToMessageDecoder<SctpMessage> {
-    private final Map<Integer, ByteBuf> fragments = new HashMap<Integer, ByteBuf>();
+    private final Map<Integer, ByteBuf> fragments = new HashMap<>();
 
     @Override
     protected void decode(ChannelHandlerContext ctx, SctpMessage msg, List<Object> out) throws Exception {
diff --git a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
index 22ae1624dc..3ddfd15c8a 100644
--- a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
+++ b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
@@ -48,8 +48,8 @@ public abstract class AbstractBootstrap<B extends AbstractBootstrap<B, C, F>, C
 
     volatile EventLoopGroup group;
     private volatile SocketAddress localAddress;
-    private final Map<ChannelOption<?>, Object> options = new LinkedHashMap<ChannelOption<?>, Object>();
-    private final Map<AttributeKey<?>, Object> attrs = new LinkedHashMap<AttributeKey<?>, Object>();
+    private final Map<ChannelOption<?>, Object> options = new LinkedHashMap<>();
+    private final Map<AttributeKey<?>, Object> attrs = new LinkedHashMap<>();
     private volatile ChannelHandler handler;
 
     AbstractBootstrap() {
@@ -346,7 +346,7 @@ public abstract class AbstractBootstrap<B extends AbstractBootstrap<B, C, F>, C
             if (map.isEmpty()) {
                 return Collections.emptyMap();
             }
-            copied = new LinkedHashMap<K, V>(map);
+            copied = new LinkedHashMap<>(map);
         }
         return Collections.unmodifiableMap(copied);
     }
diff --git a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
index 2aa5a5ce13..4f423f3da5 100644
--- a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
+++ b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
@@ -49,8 +49,8 @@ public class ServerBootstrap extends AbstractBootstrap<ServerBootstrap, ServerCh
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ServerBootstrap.class);
 
-    private final Map<ChannelOption<?>, Object> childOptions = new LinkedHashMap<ChannelOption<?>, Object>();
-    private final Map<AttributeKey<?>, Object> childAttrs = new LinkedHashMap<AttributeKey<?>, Object>();
+    private final Map<ChannelOption<?>, Object> childOptions = new LinkedHashMap<>();
+    private final Map<AttributeKey<?>, Object> childAttrs = new LinkedHashMap<>();
     private final ServerBootstrapConfig config = new ServerBootstrapConfig(this);
     private volatile EventLoopGroup childGroup;
     private volatile ChannelHandler childHandler;
diff --git a/transport/src/main/java/io/netty/channel/AbstractChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/AbstractChannelHandlerContext.java
index 913edecc08..aed34338a5 100644
--- a/transport/src/main/java/io/netty/channel/AbstractChannelHandlerContext.java
+++ b/transport/src/main/java/io/netty/channel/AbstractChannelHandlerContext.java
@@ -99,7 +99,7 @@ abstract class AbstractChannelHandlerContext extends DefaultAttributeMap
             new FastThreadLocal<Map<Class<? extends ChannelHandler>, Integer>>() {
                 @Override
                 protected Map<Class<? extends ChannelHandler>, Integer> initialValue() {
-                    return new WeakHashMap<Class<? extends ChannelHandler>, Integer>(32);
+                    return new WeakHashMap<>(32);
                 }
             };
 
diff --git a/transport/src/main/java/io/netty/channel/AbstractCoalescingBufferQueue.java b/transport/src/main/java/io/netty/channel/AbstractCoalescingBufferQueue.java
index 80bf9098d3..a05d37a9a4 100644
--- a/transport/src/main/java/io/netty/channel/AbstractCoalescingBufferQueue.java
+++ b/transport/src/main/java/io/netty/channel/AbstractCoalescingBufferQueue.java
@@ -43,7 +43,7 @@ public abstract class AbstractCoalescingBufferQueue {
      * @param initSize the initial size of the underlying queue.
      */
     protected AbstractCoalescingBufferQueue(Channel channel, int initSize) {
-        bufAndListenerPairs = new ArrayDeque<Object>(initSize);
+        bufAndListenerPairs = new ArrayDeque<>(initSize);
         tracker = channel == null ? null : PendingBytesTracker.newTracker(channel);
     }
 
diff --git a/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java
index a2db615f6b..dae0b8f80b 100644
--- a/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java
+++ b/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java
@@ -43,7 +43,7 @@ public class AdaptiveRecvByteBufAllocator extends DefaultMaxMessagesRecvByteBufA
     private static final int[] SIZE_TABLE;
 
     static {
-        List<Integer> sizeTable = new ArrayList<Integer>();
+        List<Integer> sizeTable = new ArrayList<>();
         for (int i = 16; i < 512; i += 16) {
             sizeTable.add(i);
         }
diff --git a/transport/src/main/java/io/netty/channel/ChannelFlushPromiseNotifier.java b/transport/src/main/java/io/netty/channel/ChannelFlushPromiseNotifier.java
index 26594a38df..6bfd692e82 100644
--- a/transport/src/main/java/io/netty/channel/ChannelFlushPromiseNotifier.java
+++ b/transport/src/main/java/io/netty/channel/ChannelFlushPromiseNotifier.java
@@ -25,7 +25,7 @@ import java.util.Queue;
 public final class ChannelFlushPromiseNotifier {
 
     private long writeCounter;
-    private final Queue<FlushCheckpoint> flushCheckpoints = new ArrayDeque<FlushCheckpoint>();
+    private final Queue<FlushCheckpoint> flushCheckpoints = new ArrayDeque<>();
     private final boolean tryNotify;
 
     /**
diff --git a/transport/src/main/java/io/netty/channel/ChannelOption.java b/transport/src/main/java/io/netty/channel/ChannelOption.java
index 97bf31545c..21b52e798b 100644
--- a/transport/src/main/java/io/netty/channel/ChannelOption.java
+++ b/transport/src/main/java/io/netty/channel/ChannelOption.java
@@ -35,7 +35,7 @@ public class ChannelOption<T> extends AbstractConstant<ChannelOption<T>> {
     private static final ConstantPool<ChannelOption<Object>> pool = new ConstantPool<ChannelOption<Object>>() {
         @Override
         protected ChannelOption<Object> newConstant(int id, String name) {
-            return new ChannelOption<Object>(id, name);
+            return new ChannelOption<>(id, name);
         }
     };
 
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
index 4118708637..c3b8dd1927 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
@@ -88,7 +88,7 @@ public class DefaultChannelConfig implements ChannelConfig {
     protected Map<ChannelOption<?>, Object> getOptions(
             Map<ChannelOption<?>, Object> result, ChannelOption<?>... options) {
         if (result == null) {
-            result = new IdentityHashMap<ChannelOption<?>, Object>();
+            result = new IdentityHashMap<>();
         }
         for (ChannelOption<?> o: options) {
             result.put(o, getOption(o));
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
index 492842299b..c968bc9718 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
@@ -53,7 +53,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
             new FastThreadLocal<Map<Class<?>, String>>() {
         @Override
         protected Map<Class<?>, String> initialValue() throws Exception {
-            return new WeakHashMap<Class<?>, String>();
+            return new WeakHashMap<>();
         }
     };
 
@@ -113,7 +113,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
         Map<EventExecutorGroup, EventExecutor> childExecutors = this.childExecutors;
         if (childExecutors == null) {
             // Use size of 4 as most people only use one extra EventExecutor.
-            childExecutors = this.childExecutors = new IdentityHashMap<EventExecutorGroup, EventExecutor>(4);
+            childExecutors = this.childExecutors = new IdentityHashMap<>(4);
         }
         // Pin one of the child executors once and remember it so that the same child executor
         // is used to fire events for the same channel.
@@ -703,7 +703,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
 
     @Override
     public final List<String> names() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         AbstractChannelHandlerContext ctx = head.next;
         for (;;) {
             if (ctx == null) {
@@ -716,7 +716,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
 
     @Override
     public final Map<String, ChannelHandler> toMap() {
-        Map<String, ChannelHandler> map = new LinkedHashMap<String, ChannelHandler>();
+        Map<String, ChannelHandler> map = new LinkedHashMap<>();
         AbstractChannelHandlerContext ctx = head.next;
         for (;;) {
             if (ctx == tail) {
diff --git a/transport/src/main/java/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java
index 9077551f88..75774cbcab 100644
--- a/transport/src/main/java/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java
+++ b/transport/src/main/java/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java
@@ -170,7 +170,7 @@ public class DefaultMaxBytesRecvByteBufAllocator implements MaxBytesRecvByteBufA
 
     @Override
     public synchronized Entry<Integer, Integer> maxBytesPerReadPair() {
-        return new AbstractMap.SimpleEntry<Integer, Integer>(maxBytesPerRead, maxBytesPerIndividualRead);
+        return new AbstractMap.SimpleEntry<>(maxBytesPerRead, maxBytesPerIndividualRead);
     }
 
     private static void checkMaxBytesPerReadPair(int maxBytesPerRead, int maxBytesPerIndividualRead) {
diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
index 8119e6afbd..2aed6784c2 100644
--- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
+++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
@@ -255,7 +255,7 @@ public class EmbeddedChannel extends AbstractChannel {
      */
     public Queue<Object> inboundMessages() {
         if (inboundMessages == null) {
-            inboundMessages = new ArrayDeque<Object>();
+            inboundMessages = new ArrayDeque<>();
         }
         return inboundMessages;
     }
@@ -273,7 +273,7 @@ public class EmbeddedChannel extends AbstractChannel {
      */
     public Queue<Object> outboundMessages() {
         if (outboundMessages == null) {
-            outboundMessages = new ArrayDeque<Object>();
+            outboundMessages = new ArrayDeque<>();
         }
         return outboundMessages;
     }
diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java
index b0534a43e8..e49be3cb31 100644
--- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java
+++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedEventLoop.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 final class EmbeddedEventLoop extends AbstractScheduledEventExecutor implements EventLoop {
 
-    private final Queue<Runnable> tasks = new ArrayDeque<Runnable>(2);
+    private final Queue<Runnable> tasks = new ArrayDeque<>(2);
 
     private static EmbeddedChannel cast(Channel channel) {
         if (channel instanceof EmbeddedChannel) {
diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
index 71f217a174..3988fa4558 100644
--- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
+++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
@@ -196,14 +196,14 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
 
     @Override
     public Iterator<Channel> iterator() {
-        return new CombinedIterator<Channel>(
+        return new CombinedIterator<>(
                 serverChannels.values().iterator(),
                 nonServerChannels.values().iterator());
     }
 
     @Override
     public Object[] toArray() {
-        Collection<Channel> channels = new ArrayList<Channel>(size());
+        Collection<Channel> channels = new ArrayList<>(size());
         channels.addAll(serverChannels.values());
         channels.addAll(nonServerChannels.values());
         return channels.toArray();
@@ -211,7 +211,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
 
     @Override
     public <T> T[] toArray(T[] a) {
-        Collection<Channel> channels = new ArrayList<Channel>(size());
+        Collection<Channel> channels = new ArrayList<>(size());
         channels.addAll(serverChannels.values());
         channels.addAll(nonServerChannels.values());
         return channels.toArray(a);
@@ -272,7 +272,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
             }
             future = voidFuture;
         } else {
-            Map<Channel, ChannelFuture> futures = new LinkedHashMap<Channel, ChannelFuture>(size());
+            Map<Channel, ChannelFuture> futures = new LinkedHashMap<>(size());
             for (Channel c: nonServerChannels.values()) {
                 if (matcher.matches(c)) {
                     futures.put(c, c.write(safeDuplicate(message)));
@@ -306,7 +306,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
         }
 
         Map<Channel, ChannelFuture> futures =
-                new LinkedHashMap<Channel, ChannelFuture>(size());
+                new LinkedHashMap<>(size());
 
         for (Channel c: serverChannels.values()) {
             if (matcher.matches(c)) {
@@ -329,7 +329,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
         }
 
         Map<Channel, ChannelFuture> futures =
-                new LinkedHashMap<Channel, ChannelFuture>(size());
+                new LinkedHashMap<>(size());
 
         if (stayClosed) {
             // It is important to set the closed to true, before closing channels.
@@ -362,7 +362,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
         }
 
         Map<Channel, ChannelFuture> futures =
-                new LinkedHashMap<Channel, ChannelFuture>(size());
+                new LinkedHashMap<>(size());
 
         for (Channel c: serverChannels.values()) {
             if (matcher.matches(c)) {
@@ -413,7 +413,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
             }
             future = voidFuture;
         } else {
-            Map<Channel, ChannelFuture> futures = new LinkedHashMap<Channel, ChannelFuture>(size());
+            Map<Channel, ChannelFuture> futures = new LinkedHashMap<>(size());
             for (Channel c: nonServerChannels.values()) {
                 if (matcher.matches(c)) {
                     futures.put(c, c.writeAndFlush(safeDuplicate(message)));
@@ -433,7 +433,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
     @Override
     public ChannelGroupFuture newCloseFuture(ChannelMatcher matcher) {
         Map<Channel, ChannelFuture> futures =
-                new LinkedHashMap<Channel, ChannelFuture>(size());
+                new LinkedHashMap<>(size());
 
         for (Channel c: serverChannels.values()) {
             if (matcher.matches(c)) {
diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
index e4afe232c3..17feaa4875 100644
--- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
+++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
@@ -63,10 +63,10 @@ final class DefaultChannelGroupFuture extends DefaultPromise<Void> implements Ch
             if (callSetDone) {
                 if (failureCount > 0) {
                     List<Map.Entry<Channel, Throwable>> failed =
-                            new ArrayList<Map.Entry<Channel, Throwable>>(failureCount);
+                            new ArrayList<>(failureCount);
                     for (ChannelFuture f: futures.values()) {
                         if (!f.isSuccess()) {
-                            failed.add(new DefaultEntry<Channel, Throwable>(f.channel(), f.cause()));
+                            failed.add(new DefaultEntry<>(f.channel(), f.cause()));
                         }
                     }
                     setFailure0(new ChannelGroupException(failed));
@@ -91,7 +91,7 @@ final class DefaultChannelGroupFuture extends DefaultPromise<Void> implements Ch
 
         this.group = group;
 
-        Map<Channel, ChannelFuture> futureMap = new LinkedHashMap<Channel, ChannelFuture>();
+        Map<Channel, ChannelFuture> futureMap = new LinkedHashMap<>();
         for (ChannelFuture f: futures) {
             futureMap.put(f.channel(), f);
         }
diff --git a/transport/src/main/java/io/netty/channel/local/LocalServerChannel.java b/transport/src/main/java/io/netty/channel/local/LocalServerChannel.java
index 277c7d49e0..75a4d4ff33 100644
--- a/transport/src/main/java/io/netty/channel/local/LocalServerChannel.java
+++ b/transport/src/main/java/io/netty/channel/local/LocalServerChannel.java
@@ -36,7 +36,7 @@ import java.util.Queue;
 public class LocalServerChannel extends AbstractServerChannel {
 
     private final ChannelConfig config = new DefaultChannelConfig(this);
-    private final Queue<Object> inboundBuffer = new ArrayDeque<Object>();
+    private final Queue<Object> inboundBuffer = new ArrayDeque<>();
     private final Runnable shutdownHook = new Runnable() {
         @Override
         public void run() {
diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java
index 34bd2279c1..1adce7800d 100644
--- a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java
+++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java
@@ -58,7 +58,7 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel {
 
     private final class NioMessageUnsafe extends AbstractNioUnsafe {
 
-        private final List<Object> readBuf = new ArrayList<Object>();
+        private final List<Object> readBuf = new ArrayList<>();
 
         @Override
         public void read() {
diff --git a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
index d43a2938eb..837b37320b 100644
--- a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
+++ b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
@@ -738,7 +738,7 @@ public final class NioEventLoop extends SingleThreadEventLoop {
     private void closeAll() {
         selectAgain();
         Set<SelectionKey> keys = selector.keys();
-        Collection<AbstractNioChannel> channels = new ArrayList<AbstractNioChannel>(keys.size());
+        Collection<AbstractNioChannel> channels = new ArrayList<>(keys.size());
         for (SelectionKey k: keys) {
             Object a = k.attachment();
             if (a instanceof AbstractNioChannel) {
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioChannelOption.java b/transport/src/main/java/io/netty/channel/socket/nio/NioChannelOption.java
index 3f9550f101..6375bac835 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioChannelOption.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioChannelOption.java
@@ -43,7 +43,7 @@ public final class NioChannelOption<T> extends ChannelOption<T> {
      * Returns a {@link ChannelOption} for the given {@link java.net.SocketOption}.
      */
     public static <T> ChannelOption<T> of(java.net.SocketOption<T> option) {
-        return new NioChannelOption<T>(option);
+        return new NioChannelOption<>(option);
     }
 
     // It's important to not use java.nio.channels.NetworkChannel as otherwise the classes that sometimes call this
@@ -95,7 +95,7 @@ public final class NioChannelOption<T> extends ChannelOption<T> {
         Set<java.net.SocketOption<?>> supportedOpts = channel.supportedOptions();
 
         if (channel instanceof ServerSocketChannel) {
-            List<ChannelOption<?>> extraOpts = new ArrayList<ChannelOption<?>>(supportedOpts.size());
+            List<ChannelOption<?>> extraOpts = new ArrayList<>(supportedOpts.size());
             for (java.net.SocketOption<?> opt : supportedOpts) {
                 if (opt == java.net.StandardSocketOptions.IP_TOS) {
                     // Skip IP_TOS as a workaround for a JDK bug:
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
index d039f8a67e..565c9886a9 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
@@ -324,7 +324,7 @@ public final class NioDatagramChannel
                 if (isSingleDirectBuffer(content)) {
                     return e;
                 }
-                return new DefaultAddressedEnvelope<ByteBuf, SocketAddress>(newDirectBuffer(e, content), e.recipient());
+                return new DefaultAddressedEnvelope<>(newDirectBuffer(e, content), e.recipient());
             }
         }
 
@@ -421,12 +421,12 @@ public final class NioDatagramChannel
             synchronized (this) {
                 List<MembershipKey> keys = null;
                 if (memberships == null) {
-                    memberships = new HashMap<InetAddress, List<MembershipKey>>();
+                    memberships = new HashMap<>();
                 } else {
                     keys = memberships.get(multicastAddress);
                 }
                 if (keys == null) {
-                    keys = new ArrayList<MembershipKey>();
+                    keys = new ArrayList<>();
                     memberships.put(multicastAddress, keys);
                 }
                 keys.add(key);
diff --git a/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java b/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
index 6b4f54cdd3..aa3843ea98 100644
--- a/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
+++ b/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
@@ -83,7 +83,7 @@ public class BootstrapTest {
         bootstrapB.channel(LocalChannel.class);
         bootstrapB.handler(dummyHandler);
 
-        List<Future<?>> bindFutures = new ArrayList<Future<?>>();
+        List<Future<?>> bindFutures = new ArrayList<>();
 
         // Try to bind from each other.
         for (int i = 0; i < 1024; i ++) {
@@ -119,7 +119,7 @@ public class BootstrapTest {
         bootstrapB.channel(LocalChannel.class);
         bootstrapB.handler(dummyHandler);
 
-        List<Future<?>> bindFutures = new ArrayList<Future<?>>();
+        List<Future<?>> bindFutures = new ArrayList<>();
 
         // Try to connect from each other.
         for (int i = 0; i < 1024; i ++) {
@@ -157,7 +157,7 @@ public class BootstrapTest {
             ChannelFuture future = bootstrap.bind();
             assertFalse(future.isDone());
             registerHandler.registerPromise().setSuccess();
-            final BlockingQueue<Boolean> queue = new LinkedBlockingQueue<Boolean>();
+            final BlockingQueue<Boolean> queue = new LinkedBlockingQueue<>();
             future.addListener(new ChannelFutureListener() {
                 @Override
                 public void operationComplete(ChannelFuture future) throws Exception {
@@ -208,7 +208,7 @@ public class BootstrapTest {
             ChannelFuture future = bootstrap.bind();
             assertFalse(future.isDone());
             registerHandler.registerPromise().setSuccess();
-            final BlockingQueue<Boolean> queue = new LinkedBlockingQueue<Boolean>();
+            final BlockingQueue<Boolean> queue = new LinkedBlockingQueue<>();
             future.addListener(new ChannelFutureListener() {
                 @Override
                 public void operationComplete(ChannelFuture future) throws Exception {
diff --git a/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java b/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
index 458cee76bd..0b663ac602 100644
--- a/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
+++ b/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
@@ -40,7 +40,7 @@ public class ServerBootstrapTest {
     @Test(timeout = 5000)
     public void testHandlerRegister() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         LocalEventLoopGroup group = new LocalEventLoopGroup(1);
         try {
             ServerBootstrap sb = new ServerBootstrap();
diff --git a/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java b/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
index 24e6b5e77f..29ff37277c 100644
--- a/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
+++ b/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
@@ -85,7 +85,7 @@ public class ChannelInitializerTest {
 
     private void testInitChannelThrows(boolean registerFirst) {
         final Exception exception = new Exception();
-        final AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> causeRef = new AtomicReference<>();
 
         ChannelPipeline pipeline = new LocalChannel(group.next()).pipeline();
 
@@ -263,7 +263,7 @@ public class ChannelInitializerTest {
     public void testChannelInitializerEventExecutor() throws Throwable {
         final AtomicInteger invokeCount = new AtomicInteger();
         final AtomicInteger completeCount = new AtomicInteger();
-        final AtomicReference<Throwable> errorRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> errorRef = new AtomicReference<>();
         LocalAddress addr = new LocalAddress("test");
 
         final EventExecutor executor = new AbstractEventExecutor() {
diff --git a/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java b/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
index 8043ae82b2..be1cd4e266 100644
--- a/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
+++ b/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
@@ -56,7 +56,7 @@ public class CombinedChannelDuplexHandlerTest {
     @Test(expected = IllegalStateException.class)
     public void testInboundRemoveBeforeAdded() {
         CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler> handler =
-                new CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler>(
+                new CombinedChannelDuplexHandler<>(
                         new ChannelInboundHandlerAdapter(), new ChannelOutboundHandlerAdapter());
         handler.removeInboundHandler();
     }
@@ -64,7 +64,7 @@ public class CombinedChannelDuplexHandlerTest {
     @Test(expected = IllegalStateException.class)
     public void testOutboundRemoveBeforeAdded() {
         CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler> handler =
-                new CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler>(
+                new CombinedChannelDuplexHandler<>(
                         new ChannelInboundHandlerAdapter(), new ChannelOutboundHandlerAdapter());
         handler.removeOutboundHandler();
     }
@@ -91,7 +91,7 @@ public class CombinedChannelDuplexHandlerTest {
     @Test
     public void testExceptionCaughtBothCombinedHandlers() {
         final Exception exception = new Exception();
-        final Queue<ChannelHandler> queue = new ArrayDeque<ChannelHandler>();
+        final Queue<ChannelHandler> queue = new ArrayDeque<>();
 
         ChannelInboundHandler inboundHandler = new ChannelInboundHandlerAdapter() {
             @Override
@@ -117,7 +117,7 @@ public class CombinedChannelDuplexHandlerTest {
             }
         };
         EmbeddedChannel channel = new EmbeddedChannel(
-                new CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler>(
+                new CombinedChannelDuplexHandler<>(
                         inboundHandler, outboundHandler), lastHandler);
         channel.pipeline().fireExceptionCaught(exception);
         assertFalse(channel.finish());
@@ -129,7 +129,7 @@ public class CombinedChannelDuplexHandlerTest {
 
     @Test
     public void testInboundEvents() {
-        final Queue<Event> queue = new ArrayDeque<Event>();
+        final Queue<Event> queue = new ArrayDeque<>();
 
         ChannelInboundHandler inboundHandler = new ChannelInboundHandlerAdapter() {
             @Override
@@ -189,8 +189,8 @@ public class CombinedChannelDuplexHandlerTest {
         };
 
         CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler> handler =
-                new CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler>(
-                inboundHandler, new ChannelOutboundHandlerAdapter());
+                new CombinedChannelDuplexHandler<>(
+                        inboundHandler, new ChannelOutboundHandlerAdapter());
 
         EmbeddedChannel channel = new EmbeddedChannel(handler);
         channel.pipeline().fireChannelWritabilityChanged();
@@ -223,7 +223,7 @@ public class CombinedChannelDuplexHandlerTest {
 
     @Test
     public void testOutboundEvents() {
-        final Queue<Event> queue = new ArrayDeque<Event>();
+        final Queue<Event> queue = new ArrayDeque<>();
 
         ChannelInboundHandler inboundHandler = new ChannelInboundHandlerAdapter();
         ChannelOutboundHandler outboundHandler = new ChannelOutboundHandlerAdapter() {
@@ -281,7 +281,7 @@ public class CombinedChannelDuplexHandlerTest {
         };
 
         CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler> handler =
-                new CombinedChannelDuplexHandler<ChannelInboundHandler, ChannelOutboundHandler>(
+                new CombinedChannelDuplexHandler<>(
                         inboundHandler, outboundHandler);
 
         EmbeddedChannel channel = new EmbeddedChannel();
diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
index 21c8015521..57d543be03 100644
--- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
+++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
@@ -82,7 +82,7 @@ public class DefaultChannelPipelineTailTest {
 
     @Test
     public void testOnUnhandledInboundException() throws Exception {
-        final AtomicReference<Throwable> causeRef = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> causeRef = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         EventLoop loop = GROUP.next();
         MyChannel myChannel = new MyChannel(loop) {
diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
index c793f5a2f1..72da584a64 100644
--- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
+++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
@@ -82,7 +82,7 @@ public class DefaultChannelPipelineTest {
     }
 
     private void setUp(final ChannelHandler... handlers) throws Exception {
-        final AtomicReference<Channel> peerRef = new AtomicReference<Channel>();
+        final AtomicReference<Channel> peerRef = new AtomicReference<>();
         ServerBootstrap sb = new ServerBootstrap();
         sb.group(group).channel(LocalServerChannel.class);
         sb.childHandler(new ChannelInboundHandlerAdapter() {
@@ -358,7 +358,7 @@ public class DefaultChannelPipelineTest {
 
         ChannelPipeline p = self.pipeline();
 
-        final List<LifeCycleAwareTestHandler> handlers = new ArrayList<LifeCycleAwareTestHandler>();
+        final List<LifeCycleAwareTestHandler> handlers = new ArrayList<>();
         final int COUNT = 20;
         final CountDownLatch addLatch = new CountDownLatch(COUNT);
         for (int i = 0; i < COUNT; i++) {
@@ -671,7 +671,7 @@ public class DefaultChannelPipelineTest {
     @Test(timeout = 5000)
     public void testChannelInitializerException() throws Exception {
         final IllegalStateException exception = new IllegalStateException();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         EmbeddedChannel channel = new EmbeddedChannel(false, false, new ChannelInitializer<Channel>() {
             @Override
@@ -765,8 +765,8 @@ public class DefaultChannelPipelineTest {
         final EventExecutorGroup group2 = new DefaultEventExecutorGroup(1);
 
         try {
-            BlockingQueue<CheckOrderHandler> addedQueue = new LinkedBlockingQueue<CheckOrderHandler>();
-            BlockingQueue<CheckOrderHandler> removedQueue = new LinkedBlockingQueue<CheckOrderHandler>();
+            BlockingQueue<CheckOrderHandler> addedQueue = new LinkedBlockingQueue<>();
+            BlockingQueue<CheckOrderHandler> removedQueue = new LinkedBlockingQueue<>();
 
             CheckOrderHandler handler1 = new CheckOrderHandler(addedQueue, removedQueue);
             CheckOrderHandler handler2 = new CheckOrderHandler(addedQueue, removedQueue);
@@ -1137,7 +1137,7 @@ public class DefaultChannelPipelineTest {
     public void testHandlerRemovedOnlyCalledWhenHandlerAddedCalled() throws Exception {
         EventLoopGroup group = new LocalEventLoopGroup(1);
         try {
-            final AtomicReference<Error> errorRef = new AtomicReference<Error>();
+            final AtomicReference<Error> errorRef = new AtomicReference<>();
 
             // As this only happens via a race we will verify 500 times. This was good enough to have it failed most of
             // the time.
@@ -1655,7 +1655,7 @@ public class DefaultChannelPipelineTest {
     private static final class CallbackCheckHandler extends ChannelHandlerAdapter {
         final Promise<Boolean> addedHandler = ImmediateEventExecutor.INSTANCE.newPromise();
         final Promise<Boolean> removedHandler = ImmediateEventExecutor.INSTANCE.newPromise();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         @Override
         public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
@@ -1708,7 +1708,7 @@ public class DefaultChannelPipelineTest {
     private static final class CheckOrderHandler extends ChannelHandlerAdapter {
         private final Queue<CheckOrderHandler> addedQueue;
         private final Queue<CheckOrderHandler> removedQueue;
-        private final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> error = new AtomicReference<>();
 
         CheckOrderHandler(Queue<CheckOrderHandler> addedQueue, Queue<CheckOrderHandler> removedQueue) {
             this.addedQueue = addedQueue;
@@ -1846,8 +1846,8 @@ public class DefaultChannelPipelineTest {
     private static class TestHandler extends ChannelDuplexHandler { }
 
     private static class BufferedTestHandler extends ChannelDuplexHandler {
-        final Queue<Object> inboundBuffer = new ArrayDeque<Object>();
-        final Queue<Object> outboundBuffer = new ArrayDeque<Object>();
+        final Queue<Object> inboundBuffer = new ArrayDeque<>();
+        final Queue<Object> outboundBuffer = new ArrayDeque<>();
 
         @Override
         public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
diff --git a/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java b/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
index 2b46c21c8d..fc262e725c 100644
--- a/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
+++ b/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
@@ -95,8 +95,8 @@ public class PendingWriteQueueTest {
 
     @Test
     public void shouldFireChannelWritabilityChangedAfterRemoval() {
-        final AtomicReference<ChannelHandlerContext> ctxRef = new AtomicReference<ChannelHandlerContext>();
-        final AtomicReference<PendingWriteQueue> queueRef = new AtomicReference<PendingWriteQueue>();
+        final AtomicReference<ChannelHandlerContext> ctxRef = new AtomicReference<>();
+        final AtomicReference<PendingWriteQueue> queueRef = new AtomicReference<>();
         final ByteBuf msg = Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII);
 
         final EmbeddedChannel channel = new EmbeddedChannel(new ChannelInboundHandlerAdapter() {
@@ -290,7 +290,7 @@ public class PendingWriteQueueTest {
 
     @Test
     public void testRemoveAndFailAllReentrantWrite() {
-        final List<Integer> failOrder = Collections.synchronizedList(new ArrayList<Integer>());
+        final List<Integer> failOrder = Collections.synchronizedList(new ArrayList<>());
         EmbeddedChannel channel = newChannel();
         final PendingWriteQueue queue = new PendingWriteQueue(channel.pipeline().firstContext());
 
diff --git a/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java b/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
index c0801c0be3..6f3509b964 100644
--- a/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
+++ b/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
@@ -76,7 +76,7 @@ public class SimpleUserEventChannelHandlerTest {
         public List<FooEvent> caughtEvents;
 
         FooEventCatcher() {
-            caughtEvents = new ArrayList<FooEvent>();
+            caughtEvents = new ArrayList<>();
         }
 
         @Override
@@ -90,7 +90,7 @@ public class SimpleUserEventChannelHandlerTest {
         public List<Object> caughtEvents;
 
         AllEventCatcher() {
-            caughtEvents = new ArrayList<Object>();
+            caughtEvents = new ArrayList<>();
         }
 
         @Override
diff --git a/transport/src/test/java/io/netty/channel/SingleThreadEventLoopTest.java b/transport/src/test/java/io/netty/channel/SingleThreadEventLoopTest.java
index 6728084a13..5bc5f9bbc0 100644
--- a/transport/src/test/java/io/netty/channel/SingleThreadEventLoopTest.java
+++ b/transport/src/test/java/io/netty/channel/SingleThreadEventLoopTest.java
@@ -161,7 +161,7 @@ public class SingleThreadEventLoopTest {
     }
 
     private static void testScheduleTaskAtFixedRate(EventLoop loopA) throws InterruptedException {
-        final Queue<Long> timestamps = new LinkedBlockingQueue<Long>();
+        final Queue<Long> timestamps = new LinkedBlockingQueue<>();
         final int expectedTimeStamps = 5;
         final CountDownLatch allTimeStampsLatch = new CountDownLatch(expectedTimeStamps);
         ScheduledFuture<?> f = loopA.scheduleAtFixedRate(new Runnable() {
@@ -209,7 +209,7 @@ public class SingleThreadEventLoopTest {
     }
 
     private static void testScheduleLaggyTaskAtFixedRate(EventLoop loopA) throws InterruptedException {
-        final Queue<Long> timestamps = new LinkedBlockingQueue<Long>();
+        final Queue<Long> timestamps = new LinkedBlockingQueue<>();
         final int expectedTimeStamps = 5;
         final CountDownLatch allTimeStampsLatch = new CountDownLatch(expectedTimeStamps);
         ScheduledFuture<?> f = loopA.scheduleAtFixedRate(new Runnable() {
@@ -263,7 +263,7 @@ public class SingleThreadEventLoopTest {
     }
 
     private static void testScheduleTaskWithFixedDelay(EventLoop loopA) throws InterruptedException {
-        final Queue<Long> timestamps = new LinkedBlockingQueue<Long>();
+        final Queue<Long> timestamps = new LinkedBlockingQueue<>();
         final int expectedTimeStamps = 3;
         final CountDownLatch allTimeStampsLatch = new CountDownLatch(expectedTimeStamps);
         ScheduledFuture<?> f = loopA.scheduleWithFixedDelay(new Runnable() {
@@ -349,7 +349,7 @@ public class SingleThreadEventLoopTest {
 
         // Disable logging temporarily.
         Logger root = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-        List<Appender<ILoggingEvent>> appenders = new ArrayList<Appender<ILoggingEvent>>();
+        List<Appender<ILoggingEvent>> appenders = new ArrayList<>();
         for (Iterator<Appender<ILoggingEvent>> i = root.iteratorForAppenders(); i.hasNext();) {
             Appender<ILoggingEvent> a = i.next();
             appenders.add(a);
@@ -387,7 +387,7 @@ public class SingleThreadEventLoopTest {
 
         // Disable logging temporarily.
         Logger root = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-        List<Appender<ILoggingEvent>> appenders = new ArrayList<Appender<ILoggingEvent>>();
+        List<Appender<ILoggingEvent>> appenders = new ArrayList<>();
         for (Iterator<Appender<ILoggingEvent>> i = root.iteratorForAppenders(); i.hasNext();) {
             Appender<ILoggingEvent> a = i.next();
             appenders.add(a);
diff --git a/transport/src/test/java/io/netty/channel/embedded/EmbeddedChannelTest.java b/transport/src/test/java/io/netty/channel/embedded/EmbeddedChannelTest.java
index a5dae45afa..9419ae6d24 100644
--- a/transport/src/test/java/io/netty/channel/embedded/EmbeddedChannelTest.java
+++ b/transport/src/test/java/io/netty/channel/embedded/EmbeddedChannelTest.java
@@ -156,7 +156,7 @@ public class EmbeddedChannelTest {
     @Test(timeout = 3000)
     public void testHandlerAddedExecutedInEventLoop() throws Throwable {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         final ChannelHandler handler = new ChannelHandlerAdapter() {
             @Override
             public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
@@ -595,7 +595,7 @@ public class EmbeddedChannelTest {
         static final Integer DISCONNECT = 0;
         static final Integer CLOSE = 1;
 
-        private final Queue<Integer> queue = new ArrayDeque<Integer>();
+        private final Queue<Integer> queue = new ArrayDeque<>();
 
         @Override
         public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
diff --git a/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java b/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java
index eec72f91f0..8504d5a9b3 100644
--- a/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java
+++ b/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java
@@ -531,7 +531,7 @@ public class LocalChannelTest {
         final ByteBuf data = Unpooled.wrappedBuffer(new byte[1024]);
         final ByteBuf data2 = Unpooled.wrappedBuffer(new byte[512]);
         final CountDownLatch serverChannelLatch = new CountDownLatch(1);
-        final AtomicReference<Channel> serverChannelRef = new AtomicReference<Channel>();
+        final AtomicReference<Channel> serverChannelRef = new AtomicReference<>();
 
         cb.group(group1)
                 .channel(LocalChannel.class)
@@ -612,7 +612,7 @@ public class LocalChannelTest {
         final ByteBuf data = Unpooled.wrappedBuffer(new byte[1024]);
         final ByteBuf data2 = Unpooled.wrappedBuffer(new byte[512]);
         final CountDownLatch serverChannelLatch = new CountDownLatch(1);
-        final AtomicReference<Channel> serverChannelRef = new AtomicReference<Channel>();
+        final AtomicReference<Channel> serverChannelRef = new AtomicReference<>();
 
         try {
             cb.group(sharedGroup)
@@ -700,7 +700,7 @@ public class LocalChannelTest {
         final ByteBuf data = Unpooled.wrappedBuffer(new byte[1024]);
         final ByteBuf data2 = Unpooled.wrappedBuffer(new byte[512]);
         final CountDownLatch serverChannelLatch = new CountDownLatch(1);
-        final AtomicReference<Channel> serverChannelRef = new AtomicReference<Channel>();
+        final AtomicReference<Channel> serverChannelRef = new AtomicReference<>();
 
         try {
             cb.group(group1)
diff --git a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
index 1feb585329..844f4efaa7 100644
--- a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
+++ b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
@@ -174,7 +174,7 @@ public class LocalTransportThreadModelTest {
             }
 
             // Assert that the events for the same handler were handled by the same thread.
-            Set<String> names = new HashSet<String>();
+            Set<String> names = new HashSet<>();
             names.addAll(h1.inboundThreadNames);
             names.addAll(h1.outboundThreadNames);
             names.addAll(h1.removalThreadNames);
@@ -355,11 +355,11 @@ public class LocalTransportThreadModelTest {
 
     private static class ThreadNameAuditor extends ChannelDuplexHandler {
 
-        private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> exception = new AtomicReference<>();
 
-        private final Queue<String> inboundThreadNames = new ConcurrentLinkedQueue<String>();
-        private final Queue<String> outboundThreadNames = new ConcurrentLinkedQueue<String>();
-        private final Queue<String> removalThreadNames = new ConcurrentLinkedQueue<String>();
+        private final Queue<String> inboundThreadNames = new ConcurrentLinkedQueue<>();
+        private final Queue<String> outboundThreadNames = new ConcurrentLinkedQueue<>();
+        private final Queue<String> removalThreadNames = new ConcurrentLinkedQueue<>();
         private final boolean discard;
 
         ThreadNameAuditor() {
@@ -403,7 +403,7 @@ public class LocalTransportThreadModelTest {
      */
     private static class MessageForwarder1 extends ChannelDuplexHandler {
 
-        private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> exception = new AtomicReference<>();
         private volatile int inCnt;
         private volatile int outCnt;
         private volatile Thread t;
@@ -461,7 +461,7 @@ public class LocalTransportThreadModelTest {
      */
     private static class MessageForwarder2 extends ChannelDuplexHandler {
 
-        private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> exception = new AtomicReference<>();
         private volatile int inCnt;
         private volatile int outCnt;
         private volatile Thread t;
@@ -513,7 +513,7 @@ public class LocalTransportThreadModelTest {
      */
     private static class MessageForwarder3 extends ChannelDuplexHandler {
 
-        private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> exception = new AtomicReference<>();
         private volatile int inCnt;
         private volatile int outCnt;
         private volatile Thread t;
@@ -559,7 +559,7 @@ public class LocalTransportThreadModelTest {
      */
     private static class MessageDiscarder extends ChannelDuplexHandler {
 
-        private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        private final AtomicReference<Throwable> exception = new AtomicReference<>();
         private volatile int inCnt;
         private volatile int outCnt;
         private volatile Thread t;
diff --git a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest3.java b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest3.java
index 01c6577c5b..889465fde2 100644
--- a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest3.java
+++ b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest3.java
@@ -125,7 +125,7 @@ public class LocalTransportThreadModelTest3 {
 
         final EventExecutorGroup[] groups = {e1, e2, e3, e4, e5};
         try {
-            Deque<EventType> events = new ConcurrentLinkedDeque<EventType>();
+            Deque<EventType> events = new ConcurrentLinkedDeque<>();
             final EventForwarder h1 = new EventForwarder();
             final EventForwarder h2 = new EventForwarder();
             final EventForwarder h3 = new EventForwarder();
@@ -244,7 +244,7 @@ public class LocalTransportThreadModelTest3 {
         }
 
         Random random = new Random();
-        LinkedList<EventType> expectedEvents = new LinkedList<EventType>();
+        LinkedList<EventType> expectedEvents = new LinkedList<>();
         for (int i = 0; i < size; i++) {
             expectedEvents.add(events[random.nextInt(events.length)]);
         }
diff --git a/transport/src/test/java/io/netty/channel/nio/NioEventLoopTest.java b/transport/src/test/java/io/netty/channel/nio/NioEventLoopTest.java
index 8e249244f2..1d16467840 100644
--- a/transport/src/test/java/io/netty/channel/nio/NioEventLoopTest.java
+++ b/transport/src/test/java/io/netty/channel/nio/NioEventLoopTest.java
@@ -184,7 +184,7 @@ public class NioEventLoopTest extends AbstractEventLoopTest {
     @SuppressWarnings("deprecation")
     @Test
     public void testTaskRemovalOnShutdownThrowsNoUnsupportedOperationException() throws Exception {
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         final Runnable task = new Runnable() {
             @Override
             public void run() {
diff --git a/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java b/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java
index 1ef1049015..338984ef69 100644
--- a/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java
+++ b/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java
@@ -66,7 +66,7 @@ public class NioSocketChannelTest extends AbstractNioChannelTest<NioSocketChanne
     public void testFlushCloseReentrance() throws Exception {
         NioEventLoopGroup group = new NioEventLoopGroup(1);
         try {
-            final Queue<ChannelFuture> futures = new LinkedBlockingQueue<ChannelFuture>();
+            final Queue<ChannelFuture> futures = new LinkedBlockingQueue<>();
 
             ServerBootstrap sb = new ServerBootstrap();
             sb.group(group).channel(NioServerSocketChannel.class);