[Releng] Use Java 8 diamond operator where possible

14 files changed, 67 insertions, 56 deletions

diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs
index 0097568eb1..49111f3054 100644
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@ cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.correct_indentation=true
 cleanup.format_source_code=true
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
@@ -23,15 +25,20 @@ cleanup.make_variable_declarations_final=false
 cleanup.never_use_blocks=false
 cleanup.never_use_parentheses_in_expressions=true
 cleanup.organize_imports=true
+cleanup.push_down_negation=false
 cleanup.qualify_static_field_accesses_with_declaring_class=false
 cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 cleanup.qualify_static_member_accesses_with_declaring_class=false
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
+cleanup.remove_redundant_modifiers=false
+cleanup.remove_redundant_semicolons=true
+cleanup.remove_redundant_type_arguments=true
 cleanup.remove_trailing_whitespaces=true
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_array_creation=true
 cleanup.remove_unnecessary_casts=true
 cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
@@ -42,14 +49,18 @@ cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_autoboxing=false
 cleanup.use_blocks=true
 cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
 cleanup.use_parentheses_in_expressions=true
 cleanup.use_this_for_non_static_field_access=true
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 cleanup.use_this_for_non_static_method_access=true
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_EMFT
+cleanup.use_unboxing=false
+cleanup_profile=_CDO
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java
index 5c7b2e9f93..aabb585345 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2007, 2009, 2011, 2012, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ public class BufferPoolTest extends AbstractOMTest
 {
   private static IBufferPool bufferPool = Net4jUtil.createBufferPool();
 
-  private static Collection<byte[]> memory = new ArrayList<byte[]>();
+  private static Collection<byte[]> memory = new ArrayList<>();
 
   @Override
   protected void doTearDown() throws Exception
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
index ad56e360cd..7e9a8b42d9 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -275,7 +275,7 @@ public abstract class ChannelTest extends AbstractProtocolTest
     super.doSetUp();
     startTransport();
     getConnector().setOpenChannelTimeout(TIMEOUT);
-    protocols = new ArrayList<TestSignalProtocol>();
+    protocols = new ArrayList<>();
   }
 
   @Override
@@ -321,7 +321,7 @@ public abstract class ChannelTest extends AbstractProtocolTest
    */
   private static class DeactivationListener extends LifecycleEventAdapter
   {
-    private Set<ILifecycle> deactivatedSet = new HashSet<ILifecycle>();
+    private Set<ILifecycle> deactivatedSet = new HashSet<>();
 
     public DeactivationListener()
     {
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
index 6233ec12c5..045b7f0713 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -547,7 +547,7 @@ public class TCPConnectorTest extends AbstractTransportTest
 
   public void testRoundRobinBlockingQueue() throws Exception
   {
-    BlockingQueue<IChannel> queue = new RoundRobinBlockingQueue<IChannel>();
+    BlockingQueue<IChannel> queue = new RoundRobinBlockingQueue<>();
 
     Channel[] channels = new Channel[3];
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index aca6bd829f..b6eaa4c4e4 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -95,7 +95,7 @@ public abstract class AbstractOMTest extends TestCase
 
   private static String testName;
 
-  private transient final List<File> filesToDelete = new ArrayList<File>();
+  private transient final List<File> filesToDelete = new ArrayList<>();
 
   private transient String codeLink;
 
@@ -780,7 +780,7 @@ public abstract class AbstractOMTest extends TestCase
 
   public static void triggerGC()
   {
-    List<byte[]> bigdata = new ArrayList<byte[]>();
+    List<byte[]> bigdata = new ArrayList<>();
 
     try
     {
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
index 6c598a7fde..da17de0bb7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2011-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008, 2009, 2011-2013, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -120,7 +120,7 @@ public class ExtendedIOTest extends AbstractOMTest
 
   private HashMap<String, String> createMap()
   {
-    HashMap<String, String> map = new HashMap<String, String>();
+    HashMap<String, String> map = new HashMap<>();
     putMap(map, "org.eclipse.net4j.util.io.CachedFileMap.java"); //$NON-NLS-1$
     putMap(map, "org.eclipse.net4j.util.io.CloseableIterator.java"); //$NON-NLS-1$
     putMap(map, "org.eclipse.net4j.util.io.DataInputExtender.java"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
index 8dce9daff8..ba9e797a86 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ public class MultiMapTest extends AbstractOMTest
 {
   public void testListBased() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
+    ListBased<Integer, String> multiMap = new ListBased<>();
     assertEquals(true, multiMap.isEmpty());
     assertEquals(0, multiMap.size());
     assertEquals(false, multiMap.containsKey(1));
@@ -71,39 +71,39 @@ public class MultiMapTest extends AbstractOMTest
 
   public void testEntrySet() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
+    ListBased<Integer, String> multiMap = new ListBased<>();
     assertEquals(true, multiMap.entrySet().isEmpty());
     assertEquals(0, multiMap.entrySet().size());
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$
+    assertEquals(false, multiMap.entrySet().contains(new MapEntry<>(1, "value1"))); //$NON-NLS-1$
 
     addDelegate(multiMap, 0, 0);
     assertEquals(true, multiMap.entrySet().isEmpty());
     assertEquals(0, multiMap.entrySet().size());
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$
+    assertEquals(false, multiMap.entrySet().contains(new MapEntry<>(1, "value1"))); //$NON-NLS-1$
 
     addDelegate(multiMap, 1, 10);
     addDelegate(multiMap, 11, 10);
     addDelegate(multiMap, 21, 10);
     assertEquals(false, multiMap.entrySet().isEmpty());
     assertEquals(30, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$
+    assertEquals(true, multiMap.entrySet().contains(new MapEntry<>(1, "value1"))); //$NON-NLS-1$
 
     addDelegate(multiMap, 6, 10);
     assertEquals(false, multiMap.entrySet().isEmpty());
     assertEquals(30, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); //$NON-NLS-1$
+    assertEquals(true, multiMap.entrySet().contains(new MapEntry<>(1, "value1"))); //$NON-NLS-1$
+    assertEquals(false, multiMap.entrySet().contains(new MapEntry<>(35, "value35"))); //$NON-NLS-1$
 
     addDelegate(multiMap, 26, 10);
     assertEquals(false, multiMap.entrySet().isEmpty());
     assertEquals(35, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); //$NON-NLS-1$
+    assertEquals(true, multiMap.entrySet().contains(new MapEntry<>(1, "value1"))); //$NON-NLS-1$
+    assertEquals(true, multiMap.entrySet().contains(new MapEntry<>(35, "value35"))); //$NON-NLS-1$
   }
 
   public void testKeySet() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
+    ListBased<Integer, String> multiMap = new ListBased<>();
     assertEquals(true, multiMap.keySet().isEmpty());
     assertEquals(0, multiMap.keySet().size());
     assertEquals(false, multiMap.keySet().contains(1));
@@ -135,7 +135,7 @@ public class MultiMapTest extends AbstractOMTest
 
   public void testValues() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
+    ListBased<Integer, String> multiMap = new ListBased<>();
     assertEquals(true, multiMap.values().isEmpty());
     assertEquals(0, multiMap.values().size());
     assertEquals(false, multiMap.values().contains("value1")); //$NON-NLS-1$
@@ -167,11 +167,11 @@ public class MultiMapTest extends AbstractOMTest
 
   public void testEntrySetIterator() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.entrySet());
+    ListBased<Integer, String> multiMap = new ListBased<>();
+    assertIterator(new HashSet<>(), multiMap.entrySet());
 
     addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.entrySet());
+    assertIterator(new HashSet<>(), multiMap.entrySet());
 
     addDelegate(multiMap, 1, 10);
     addDelegate(multiMap, 11, 10);
@@ -187,11 +187,11 @@ public class MultiMapTest extends AbstractOMTest
 
   public void testKeySetIterator() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.keySet());
+    ListBased<Integer, String> multiMap = new ListBased<>();
+    assertIterator(new HashSet<>(), multiMap.keySet());
 
     addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.keySet());
+    assertIterator(new HashSet<>(), multiMap.keySet());
 
     addDelegate(multiMap, 1, 10);
     addDelegate(multiMap, 11, 10);
@@ -207,11 +207,11 @@ public class MultiMapTest extends AbstractOMTest
 
   public void testValuesIterator() throws Exception
   {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.values());
+    ListBased<Integer, String> multiMap = new ListBased<>();
+    assertIterator(new HashSet<>(), multiMap.values());
 
     addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.values());
+    assertIterator(new HashSet<>(), multiMap.values());
 
     addDelegate(multiMap, 1, 10);
     addDelegate(multiMap, 11, 10);
@@ -227,7 +227,7 @@ public class MultiMapTest extends AbstractOMTest
 
   private void addDelegate(ListBased<Integer, String> multiMap, int start, int count)
   {
-    Map<Integer, String> map = new HashMap<Integer, String>();
+    Map<Integer, String> map = new HashMap<>();
     for (int i = 0; i < count; i++)
     {
       int key = start + i;
@@ -255,11 +255,11 @@ public class MultiMapTest extends AbstractOMTest
 
   private Set<Object> createMapEntries(int start, int count)
   {
-    Set<Object> result = new HashSet<Object>();
+    Set<Object> result = new HashSet<>();
     for (int i = 0; i < count; i++)
     {
       int key = start + i;
-      result.add(new MapEntry<Integer, String>(key, "value" + key)); //$NON-NLS-1$
+      result.add(new MapEntry<>(key, "value" + key)); //$NON-NLS-1$
     }
 
     return result;
@@ -267,7 +267,7 @@ public class MultiMapTest extends AbstractOMTest
 
   private Set<Object> createKeys(int start, int count)
   {
-    Set<Object> result = new HashSet<Object>();
+    Set<Object> result = new HashSet<>();
     for (int i = 0; i < count; i++)
     {
       int key = start + i;
@@ -279,7 +279,7 @@ public class MultiMapTest extends AbstractOMTest
 
   private Set<Object> createValues(int start, int count)
   {
-    Set<Object> result = new HashSet<Object>();
+    Set<Object> result = new HashSet<>();
     for (int i = 0; i < count; i++)
     {
       int key = start + i;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
index 91701ae0d6..ee52ef6372 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
@@ -162,7 +162,7 @@ public class SecurityTest extends AbstractOMTest
 
     private String userID;
 
-    private BlockingQueue<ByteBuffer> queue = new LinkedBlockingQueue<ByteBuffer>();
+    private BlockingQueue<ByteBuffer> queue = new LinkedBlockingQueue<>();
 
     private boolean running;
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
index 9923fe15da..adb59b2d15 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2007-2012, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
   public void testPutConsumerFirst() throws Exception
   {
     final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
+    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<>();
     final Thread consumer = new Thread()
     {
       @Override
@@ -52,7 +52,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
   public void testBlockingPutConsumerFirst() throws Exception
   {
     final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
+    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<>();
     final Thread consumer = new Thread()
     {
       @Override
@@ -86,7 +86,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
   public void _testPutProducerFirst() throws Exception
   {
     final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
+    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<>();
     correlator.put("eike", true, DEFAULT_TIMEOUT); //$NON-NLS-1$
 
     final Thread consumer = new Thread()
@@ -118,7 +118,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
   public void testBlockingPutProducerFirst() throws Exception
   {
     final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
+    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<>();
     boolean consumed = correlator.put("eike", true, 50); //$NON-NLS-1$
     msg("Consumed: " + consumed); //$NON-NLS-1$
     assertEquals(false, consumed);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java
index 7ea3f56135..eb75290f95 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java
@@ -23,7 +23,7 @@ import junit.framework.AssertionFailedError;
  */
 public class TestListener implements IListener
 {
-  private List<IEvent> events = new ArrayList<IEvent>();
+  private List<IEvent> events = new ArrayList<>();
 
   private int nextAssertion;
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java
index 28e8bce13e..448e6fa5d7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java
@@ -38,7 +38,7 @@ public class TestListener2 implements IListener
 
   private static final long DEFAULT_TIMEOUT = 3000; // 3 seconds
 
-  private final Map<IEvent, Long> events = new LinkedHashMap<IEvent, Long>();
+  private final Map<IEvent, Long> events = new LinkedHashMap<>();
 
   private final Collection<Class<? extends IEvent>> eventClasses;
 
@@ -110,7 +110,7 @@ public class TestListener2 implements IListener
   {
     synchronized (this)
     {
-      return new ArrayList<IEvent>(events.keySet());
+      return new ArrayList<>(events.keySet());
     }
   }
 
@@ -243,7 +243,7 @@ public class TestListener2 implements IListener
 
   private static Set<Class<? extends IEvent>> singleton(Class<? extends IEvent> eventClass)
   {
-    Set<Class<? extends IEvent>> singleton = new HashSet<Class<? extends IEvent>>();
+    Set<Class<? extends IEvent>> singleton = new HashSet<>();
     singleton.add(eventClass);
     return singleton;
   }
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java
index 570a8f1e60..c4e50cfc1c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java
@@ -222,7 +222,7 @@ public class ThreadPoolTest extends AbstractOMTest
     private static ThreadFactory createThreadFactory()
     {
       final ThreadFactory factory = Executors.defaultThreadFactory();
-    
+
       return new ThreadFactory()
       {
         @Override
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
index 1c71d579d7..7c206df8b1 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public class RevisionManager extends Cache<Revision>
 {
-  private Map<Integer, TimeLine> timeLines = new HashMap<Integer, TimeLine>();
+  private Map<Integer, TimeLine> timeLines = new HashMap<>();
 
   public RevisionManager()
   {
@@ -79,7 +79,7 @@ public class RevisionManager extends Cache<Revision>
   {
     private int id;
 
-    private List<Reference<Revision>> revisions = new ArrayList<Reference<Revision>>();
+    private List<Reference<Revision>> revisions = new ArrayList<>();
 
     public TimeLine(int id)
     {
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
index 0047a4f84c..99ae98beaa 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2007, 2009, 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,14 +26,14 @@ public class SensitiveProtoTest extends AbstractOMTest
   public void testSensitiveCacheWithEvictionPolicy() throws Exception
   {
     ConcurrentMap<Integer, KeyedAndValuedWeakReference<Integer, String>> map //
-        = new ConcurrentHashMap<Integer, KeyedAndValuedWeakReference<Integer, String>>();
+        = new ConcurrentHashMap<>();
 
     ReferenceQueue<String> queue //
-        = new ReferenceQueue<String>();
+        = new ReferenceQueue<>();
 
     for (int i = 0; i < 20; i++)
     {
-      map.put(i, new KeyedAndValuedWeakReference<Integer, String>(i, String.valueOf(i), queue));
+      map.put(i, new KeyedAndValuedWeakReference<>(i, String.valueOf(i), queue));
     }
 
     for (int gc = 0; gc < 10; gc++)
@@ -49,7 +49,7 @@ public class SensitiveProtoTest extends AbstractOMTest
       System.out.println("Dequeued i=" + i); //$NON-NLS-1$
       if (i < 10)
       {
-        map.put(i, new KeyedAndValuedWeakReference<Integer, String>(i, ref.getValue(), queue));
+        map.put(i, new KeyedAndValuedWeakReference<>(i, ref.getValue(), queue));
       }
       else
       {