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/main/java/org/opends/server/tools/LDIFDiff.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
index 1d0f3e9..1ae2ee8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
@@ -337,8 +337,8 @@
// Read in ignored entries and attributes if any
BufferedReader ignReader = null;
- Collection<DN> ignoreEntries = new HashSet<DN>();
- Collection<String> ignoreAttrs = new HashSet<String>();
+ Collection<DN> ignoreEntries = new HashSet<>();
+ Collection<String> ignoreAttrs = new HashSet<>();
if (ignoreAttrsFile.getValue() != null)
{
@@ -411,7 +411,7 @@
return OPERATIONS_ERROR;
}
- TreeMap<DN,Entry> sourceMap = new TreeMap<DN,Entry>();
+ TreeMap<DN,Entry> sourceMap = new TreeMap<>();
try
{
while (true)
@@ -451,7 +451,7 @@
return OPERATIONS_ERROR;
}
- TreeMap<DN,Entry> targetMap = new TreeMap<DN,Entry>();
+ TreeMap<DN,Entry> targetMap = new TreeMap<>();
try
{
while (true)
@@ -764,16 +764,12 @@
throws IOException
{
// Create a list to hold the modifications that are found.
- LinkedList<Modification> modifications = new LinkedList<Modification>();
+ LinkedList<Modification> modifications = new LinkedList<>();
// Look at the set of objectclasses for the entries.
- LinkedHashSet<ObjectClass> sourceClasses =
- new LinkedHashSet<ObjectClass>(
- sourceEntry.getObjectClasses().keySet());
- LinkedHashSet<ObjectClass> targetClasses =
- new LinkedHashSet<ObjectClass>(
- targetEntry.getObjectClasses().keySet());
+ LinkedHashSet<ObjectClass> sourceClasses = new LinkedHashSet<>(sourceEntry.getObjectClasses().keySet());
+ LinkedHashSet<ObjectClass> targetClasses = new LinkedHashSet<>(targetEntry.getObjectClasses().keySet());
Iterator<ObjectClass> sourceClassIterator = sourceClasses.iterator();
while (sourceClassIterator.hasNext())
{
@@ -814,9 +810,7 @@
// Look at the user attributes for the entries.
- LinkedHashSet<AttributeType> sourceTypes =
- new LinkedHashSet<AttributeType>(
- sourceEntry.getUserAttributes().keySet());
+ LinkedHashSet<AttributeType> sourceTypes = new LinkedHashSet<>(sourceEntry.getUserAttributes().keySet());
Iterator<AttributeType> sourceTypeIterator = sourceTypes.iterator();
while (sourceTypeIterator.hasNext())
{
@@ -935,13 +929,13 @@
Attribute a = m.getAttribute();
if (a.isEmpty())
{
- LinkedList<Modification> attrMods = new LinkedList<Modification>();
+ LinkedList<Modification> attrMods = new LinkedList<>();
attrMods.add(m);
writer.writeModifyChangeRecord(sourceEntry.getName(), attrMods);
}
else
{
- LinkedList<Modification> attrMods = new LinkedList<Modification>();
+ LinkedList<Modification> attrMods = new LinkedList<>();
for (ByteString v : a)
{
AttributeBuilder builder = new AttributeBuilder(a, true);
--
Gitblit v1.10.0