[Releng] Use Java 8 diamond operator where possible

8 files changed, 29 insertions, 18 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.ui.prefs
index 0097568eb1..49111f3054 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/.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.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
index 3cdce8bdb8..7e92ce39d7 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
@@ -113,9 +113,9 @@ public class LissomeStore extends Store
 
   private int lastMetaID;
 
-  private Map<Integer, Object> metaObjects = new HashMap<Integer, Object>();
+  private Map<Integer, Object> metaObjects = new HashMap<>();
 
-  private Map<Object, Integer> metaIDs = new HashMap<Object, Integer>();
+  private Map<Object, Integer> metaIDs = new HashMap<>();
 
   public LissomeStore()
   {
@@ -156,7 +156,7 @@ public class LissomeStore extends Store
   @Override
   public Map<String, String> getPersistentProperties(Set<String> names)
   {
-    Map<String, String> properties = new HashMap<String, String>();
+    Map<String, String> properties = new HashMap<>();
 
     synchronized (persistentProperties)
     {
@@ -293,7 +293,7 @@ public class LissomeStore extends Store
   @Override
   public Map<CDOBranch, List<CDORevision>> getAllRevisions()
   {
-    final Map<CDOBranch, List<CDORevision>> result = new HashMap<CDOBranch, List<CDORevision>>();
+    final Map<CDOBranch, List<CDORevision>> result = new HashMap<>();
     ILissomeStoreAccessor accessor = getReader(null);
     StoreThreadLocal.setAccessor(accessor);
 
@@ -308,7 +308,7 @@ public class LissomeStore extends Store
           List<CDORevision> list = result.get(branch);
           if (list == null)
           {
-            list = new ArrayList<CDORevision>();
+            list = new ArrayList<>();
             result.put(branch, list);
           }
 
@@ -336,7 +336,7 @@ public class LissomeStore extends Store
   {
     this.creationTime = creationTime;
 
-    Map<String, String> map = new HashMap<String, String>();
+    Map<String, String> map = new HashMap<>();
     map.put(PROP_REPOSITORY_CREATED, Long.toString(creationTime));
     setPersistentProperties(map);
   }
@@ -390,7 +390,7 @@ public class LissomeStore extends Store
   @Override
   protected void doDeactivate() throws Exception
   {
-    Map<String, String> map = new HashMap<String, String>();
+    Map<String, String> map = new HashMap<>();
     map.put(PROP_GRACEFULLY_SHUT_DOWN, Boolean.TRUE.toString());
     map.put(PROP_REPOSITORY_STOPPED, Long.toString(getRepository().getTimeStamp()));
 
@@ -429,7 +429,7 @@ public class LissomeStore extends Store
 
   protected void reStart() throws IOException
   {
-    Set<String> names = new HashSet<String>();
+    Set<String> names = new HashSet<>();
     names.add(PROP_REPOSITORY_CREATED);
     names.add(PROP_GRACEFULLY_SHUT_DOWN);
 
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
index eca7473023..fe4dc05d44 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
@@ -255,7 +255,7 @@ public class LissomeStoreReader extends StoreAccessorBase implements ILissomeSto
   {
     QueryResourcesContext context = new DelegatingQueryResourcesContext()
     {
-      private Set<CDOID> queried = new HashSet<CDOID>();
+      private Set<CDOID> queried = new HashSet<>();
 
       @Override
       protected QueryResourcesContext getDelegate()
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
index bf36703d5d..6767a866be 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
@@ -396,7 +396,7 @@ public class IndexReader implements IDBConnectionProvider
       index.trace(TRACER, loadSubBranchesStatement);
       resultSet = loadSubBranchesStatement.executeQuery();
 
-      List<SubBranchInfo> result = new ArrayList<SubBranchInfo>();
+      List<SubBranchInfo> result = new ArrayList<>();
       while (resultSet.next())
       {
         index.trace(TRACER, resultSet);
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
index c05c70b246..ba1833450e 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 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
@@ -44,7 +44,7 @@ public class IndexWriter extends IndexReader
 
   protected PreparedStatement createBranchStatement;
 
-  private Set<PreparedStatement> batches = new HashSet<PreparedStatement>();
+  private Set<PreparedStatement> batches = new HashSet<>();
 
   public IndexWriter(Index index)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
index 533654bb0e..21bdb6fa5f 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
@@ -79,7 +79,7 @@ public class Journal extends LissomeFile
 
   private static final boolean ZIP_PACKAGE_BYTES = true;
 
-  private Map<String, Long> ePackagePointers = new HashMap<String, Long>();
+  private Map<String, Long> ePackagePointers = new HashMap<>();
 
   private long commitPointer;
 
@@ -161,7 +161,7 @@ public class Journal extends LissomeFile
 
     try
     {
-      List<InternalCDOPackageUnit> result = new ArrayList<InternalCDOPackageUnit>();
+      List<InternalCDOPackageUnit> result = new ArrayList<>();
       InternalCDOPackageRegistry packageRegistry = getStore().getRepository().getPackageRegistry();
 
       ResourceSet resourceSet = new ResourceSetImpl();
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/CommitTransactionTask.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/CommitTransactionTask.java
index 1313dace86..51ab6bd41e 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/CommitTransactionTask.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/CommitTransactionTask.java
@@ -62,13 +62,13 @@ public class CommitTransactionTask implements OptimizerTask
 
   protected final CDOBranchVersion[] detachedObjectVersions;
 
-  protected final List<byte[]> lobs = new ArrayList<byte[]>();
+  protected final List<byte[]> lobs = new ArrayList<>();
 
   private long newCommitPointer;
 
   private long newPackageUnitPointer;
 
-  private Map<CDORevision, Long> newObjectPointers = new HashMap<CDORevision, Long>();
+  private Map<CDORevision, Long> newObjectPointers = new HashMap<>();
 
   private InternalCDORevision[] detachedRevisions;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
index 62fa014ca3..82158fb075 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
@@ -45,7 +45,7 @@ public class Optimizer extends Lifecycle
 
   private final boolean async;
 
-  private final LinkedList<OptimizerTask> queue = new LinkedList<OptimizerTask>();
+  private final LinkedList<OptimizerTask> queue = new LinkedList<>();
 
   private Worker worker;