From a89f7014aeb71dba5c94404dfea7eb89e7eeee74 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 06:48:02 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
index d692623..e2658df 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -360,7 +360,7 @@
builder.add("value1");
builder.add("value2");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
@@ -415,7 +415,7 @@
builder.add("value3");
builder.add("value4");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
@@ -461,7 +461,7 @@
// Create a single valued attribute with value : "value1"
// add this attribute to the entry.
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
Attribute attribute = Attributes.create(EMPLOYEENUMBER, "value1");
entry.addAttribute(attribute, duplicateValues);
@@ -494,7 +494,7 @@
// Create a single valued attribute with value : "value1"
// add this attribute to the entry.
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
Attribute attribute = Attributes.create(EMPLOYEENUMBER, "value1");
entry.addAttribute(attribute, duplicateValues);
@@ -532,7 +532,7 @@
builder.add("value1");
builder.add("value2");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
// load historical from the entry
@@ -581,7 +581,7 @@
// Create a single valued attribute with value : "value1"
// add this attribute to the entry.
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
Attribute attribute = Attributes.create(DISPLAYNAME, "value1");
entry.addAttribute(attribute, duplicateValues);
Attribute attrDel = buildSyncHist(DISPLAYNAME,
@@ -664,7 +664,7 @@
builder.add("value3");
builder.add("value4");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
// load historical from the entry
@@ -742,7 +742,7 @@
builder.add("value3");
builder.add("value4");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
// load historical from the entry
@@ -804,7 +804,7 @@
// Create a single valued attribute with value : "value1"
// add this attribute to the entry.
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
Attribute attribute = Attributes.create(DISPLAYNAME, "value1");
entry.addAttribute(attribute, duplicateValues);
@@ -903,7 +903,7 @@
attr = Attributes.create(DESCRIPTION, "Init Value");
Modification mod2 = new Modification(ModificationType.ADD, attr);
- List<Modification> mods = new LinkedList<Modification>();
+ List<Modification> mods = new LinkedList<>();
mods.add(mod1);
mods.add(mod2);
@@ -961,11 +961,11 @@
attr = Attributes.empty(DESCRIPTION);
Modification mod2 = new Modification(ModificationType.REPLACE, attr);
- List<Modification> mods = new LinkedList<Modification>();
+ List<Modification> mods = new LinkedList<>();
mods.add(mod1);
mods.add(mod2);
- List<Modification> mods2 = new LinkedList<Modification>(mods);
+ List<Modification> mods2 = new LinkedList<>(mods);
replayModifies(entry, hist, mods, 12);
assertEquals(hist.encodeAndPurge(), attrDel);
assertEquals(mods.size(), 2,
@@ -1004,7 +1004,7 @@
attr = Attributes.create(DESCRIPTION, "Init Value");
Modification mod2 = new Modification(ModificationType.DELETE, attr);
- List<Modification> mods = new LinkedList<Modification>();
+ List<Modification> mods = new LinkedList<>();
mods.add(mod1);
mods.add(mod2);
@@ -1241,7 +1241,7 @@
* for all these tests.
*/
DN dn = DN.valueOf(TEST_ROOT_DN_STRING);
- Map<ObjectClass, String> objectClasses = new HashMap<ObjectClass, String>();
+ Map<ObjectClass, String> objectClasses = new HashMap<>();
ObjectClass org = DirectoryServer.getObjectClass(ORGANIZATION);
objectClasses.put(org, ORGANIZATION);
@@ -1252,15 +1252,12 @@
UUID uuid = UUID.randomUUID();
// Create the att values list
- ArrayList<Attribute> uuidList = new ArrayList<Attribute>(1);
- Attribute uuidAttr = Attributes.create(entryuuidAttrType, uuid
- .toString());
+ ArrayList<Attribute> uuidList = new ArrayList<>(1);
+ Attribute uuidAttr = Attributes.create(entryuuidAttrType, uuid.toString());
uuidList.add(uuidAttr);
// Add the uuid in the entry
- Map<AttributeType, List<Attribute>> operationalAttributes = entry
- .getOperationalAttributes();
-
+ Map<AttributeType, List<Attribute>> operationalAttributes = entry.getOperationalAttributes();
operationalAttributes.put(entryuuidAttrType, uuidList);
return entry;
}
@@ -1352,7 +1349,7 @@
InternalClientConnection.getRootConnection();
CSN t = new CSN(date, 0, 0);
- List<Modification> mods = new ArrayList<Modification>();
+ List<Modification> mods = new ArrayList<>();
mods.add(mod);
ModifyOperationBasis modOpBasis =
@@ -1567,7 +1564,7 @@
builder.add("value1");
builder.add("value2");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
// load historical from the entry
@@ -1626,7 +1623,7 @@
builder.add("value2");
builder.add("value3");
- List<ByteString> duplicateValues = new LinkedList<ByteString>();
+ List<ByteString> duplicateValues = new LinkedList<>();
entry.addAttribute(builder.toAttribute(), duplicateValues);
// load historical from the entry
--
Gitblit v1.10.0