From 9ddd1c3c61e88d6b0eaac1394b95f0fafa07a216 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 13 Jul 2015 09:59:22 +0000
Subject: [PATCH] Used CollectionUtils.newArrayList() and newLinkedList().
---
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index 0f2d16c..48b66c5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -28,6 +28,7 @@
import static org.forgerock.util.Reject.*;
import static org.opends.messages.UtilityMessages.*;
+import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
@@ -892,14 +893,13 @@
{
attrBuilders = userAttrBuilders;
}
- List<AttributeBuilder> attrList = attrBuilders.get(attrType);
+
+ final List<AttributeBuilder> attrList = attrBuilders.get(attrType);
if (attrList == null)
{
AttributeBuilder builder = new AttributeBuilder(attribute, true);
builder.add(attributeValue);
- attrList = new ArrayList<>();
- attrList.add(builder);
- attrBuilders.put(attrType, attrList);
+ attrBuilders.put(attrType, newArrayList(builder));
return;
}
@@ -1705,40 +1705,32 @@
Map<AttributeType, List<Attribute>> attributes, AttributeType t,
ByteString v, String n)
{
- List<Attribute> attrList = attributes.get(t);
+ final List<Attribute> attrList = attributes.get(t);
if (attrList == null)
{
- attrList = new ArrayList<>();
- attrList.add(Attributes.create(t, n, v));
- attributes.put(t, attrList);
+ attributes.put(t, newArrayList(Attributes.create(t, n, v)));
+ return;
}
- else
+
+ for (int j = 0; j < attrList.size(); j++)
{
- boolean found = false;
- for (int j = 0; j < attrList.size(); j++)
+ Attribute a = attrList.get(j);
+ if (a.hasOptions())
{
- Attribute a = attrList.get(j);
-
- if (a.hasOptions())
- {
- continue;
- }
-
- if (!a.contains(v))
- {
- AttributeBuilder builder = new AttributeBuilder(a);
- builder.add(v);
- attrList.set(j, builder.toAttribute());
- }
-
- found = true;
- break;
+ continue;
}
- if (!found)
+ if (!a.contains(v))
{
- attrList.add(Attributes.create(t, n, v));
+ AttributeBuilder builder = new AttributeBuilder(a);
+ builder.add(v);
+ attrList.set(j, builder.toAttribute());
}
+
+ return;
}
+
+ // not found
+ attrList.add(Attributes.create(t, n, v));
}
}
--
Gitblit v1.10.0