From 90a6ab6c63699343acf3adcd4346bce2f5665bdd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jul 2015 15:12:28 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator

---
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java |   42 ++++++++++++++++++------------------------
 1 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
index 4b1dc9b..bb35755 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
@@ -303,7 +303,7 @@
         InstantiableElement<C, S> create(
         InstantiableRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d, String name) {
-      return new InstantiableElement<C, S>(r, d, name);
+      return new InstantiableElement<>(r, d, name);
     }
 
     /** The name of the managed object. */
@@ -364,7 +364,7 @@
         S extends Configuration> OptionalElement<C, S> create(
         OptionalRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d) {
-      return new OptionalElement<C, S>(r, d);
+      return new OptionalElement<>(r, d);
     }
 
     /** The optional relation. */
@@ -413,7 +413,7 @@
         SetElement<C, S> create(
         SetRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d) {
-      return new SetElement<C, S>(r, d);
+      return new SetElement<>(r, d);
     }
 
     /** The set relation. */
@@ -462,7 +462,7 @@
         S extends Configuration> SingletonElement<C, S> create(
         SingletonRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d) {
-      return new SingletonElement<C, S>(r, d);
+      return new SingletonElement<>(r, d);
     }
 
     /** The singleton relation. */
@@ -580,8 +580,7 @@
 
   /** Single instance of a root path. */
   private static final ManagedObjectPath<RootCfgClient, RootCfg> EMPTY_PATH =
-      new ManagedObjectPath<RootCfgClient, RootCfg>(
-      new LinkedList<Element<?, ?>>(), null, RootCfgDefn.getInstance());
+      new ManagedObjectPath<>(new LinkedList<Element<?, ?>>(), null, RootCfgDefn.getInstance());
 
   /** A regular expression used to parse path elements. */
   private static final Pattern PE_REGEXP = Pattern
@@ -625,10 +624,9 @@
     }
 
     // Parse the elements.
-    LinkedList<Element<?, ?>> elements = new LinkedList<Element<?, ?>>();
+    LinkedList<Element<?, ?>> elements = new LinkedList<>();
     Element<?, ?> lastElement = null;
-    AbstractManagedObjectDefinition<?, ?> definition = RootCfgDefn
-        .getInstance();
+    AbstractManagedObjectDefinition<?, ?> definition = RootCfgDefn.getInstance();
 
     if (!ns.startsWith("/")) {
       throw new IllegalArgumentException("Invalid path \"" + ns
@@ -713,8 +711,8 @@
   private static <C extends ConfigurationClient, S extends Configuration>
       ManagedObjectPath<C, S> create(
       LinkedList<Element<?, ?>> elements, Element<C, S> lastElement) {
-    return new ManagedObjectPath<C, S>(elements, lastElement
-        .getRelationDefinition(), lastElement.getManagedObjectDefinition());
+    return new ManagedObjectPath<>(
+        elements, lastElement.getRelationDefinition(), lastElement.getManagedObjectDefinition());
   }
 
 
@@ -893,10 +891,9 @@
       throw new IllegalArgumentException(
           "Empty or blank managed object names are not allowed");
     }
-    LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
-        elements);
+    LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
     celements.add(new InstantiableElement<M, N>(r, d, name));
-    return new ManagedObjectPath<M, N>(celements, r, d);
+    return new ManagedObjectPath<>(celements, r, d);
   }
 
 
@@ -951,10 +948,9 @@
       ManagedObjectPath<M, N> child(
       OptionalRelationDefinition<? super M, ? super N> r,
       AbstractManagedObjectDefinition<M, N> d) {
-    LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
-        elements);
+    LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
     celements.add(new OptionalElement<M, N>(r, d));
-    return new ManagedObjectPath<M, N>(celements, r, d);
+    return new ManagedObjectPath<>(celements, r, d);
   }
 
 
@@ -1003,10 +999,9 @@
       ManagedObjectPath<M, N> child(
       SingletonRelationDefinition<? super M, ? super N> r,
       AbstractManagedObjectDefinition<M, N> d) {
-    LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
-        elements);
+    LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
     celements.add(new SingletonElement<M, N>(r, d));
-    return new ManagedObjectPath<M, N>(celements, r, d);
+    return new ManagedObjectPath<>(celements, r, d);
   }
 
 
@@ -1058,10 +1053,9 @@
       SetRelationDefinition<? super M, ? super N> r,
       AbstractManagedObjectDefinition<M, N> d)
       throws IllegalArgumentException {
-    LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
-        elements);
+    LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
     celements.add(new SetElement<M, N>(r, d));
-    return new ManagedObjectPath<M, N>(celements, r, d);
+    return new ManagedObjectPath<>(celements, r, d);
   }
 
 
@@ -1286,7 +1280,7 @@
       return emptyPath();
     }
 
-    LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
+    LinkedList<Element<?, ?>> celements = new LinkedList<>(
         elements.subList(0, elements.size() - offset));
     return create(celements, celements.getLast());
   }

--
Gitblit v1.10.0