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/tools/LDIFSearch.java | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
index 960d203..712e527 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
@@ -30,6 +30,7 @@
import static com.forgerock.opendj.cli.Utils.*;
import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
@@ -131,7 +132,7 @@
StringArgument filterFile;
IntegerArgument sizeLimit;
IntegerArgument timeLimit;
- MultiChoiceArgument scopeString;
+ MultiChoiceArgument<String> scopeString;
StringArgument baseDNString;
StringArgument configClass;
StringArgument configFile;
@@ -161,7 +162,7 @@
INFO_LDIFSEARCH_DESCRIPTION_BASEDN.get());
argParser.addArgument(baseDNString);
- scopeString = new MultiChoiceArgument(
+ scopeString = new MultiChoiceArgument<>(
"scope", 's', "searchScope", false, false,
true, INFO_SCOPE_PLACEHOLDER.get(), SCOPE_STRING_SUB,
null, scopeStrings, false,
@@ -338,32 +339,28 @@
err.println(message);
return 1;
}
- else
+
+ Iterator<String> iterator = trailingArguments.iterator();
+ filterStrings = newLinkedList(iterator.next());
+
+ while (iterator.hasNext())
{
- Iterator<String> iterator = trailingArguments.iterator();
-
- filterStrings = new LinkedList<>();
- filterStrings.add(iterator.next());
-
- while (iterator.hasNext())
+ String lowerName = toLowerCase(iterator.next());
+ if (lowerName.equals("*"))
{
- String lowerName = toLowerCase(iterator.next());
- if (lowerName.equals("*"))
- {
- allUserAttrs = true;
- }
- else if (lowerName.equals("+"))
- {
- allOperationalAttrs = true;
- }
- else if (lowerName.startsWith("@"))
- {
- objectClassNames.add(lowerName.substring(1));
- }
- else
- {
- attributeNames.add(lowerName);
- }
+ allUserAttrs = true;
+ }
+ else if (lowerName.equals("+"))
+ {
+ allOperationalAttrs = true;
+ }
+ else if (lowerName.startsWith("@"))
+ {
+ objectClassNames.add(lowerName.substring(1));
+ }
+ else
+ {
+ attributeNames.add(lowerName);
}
}
}
--
Gitblit v1.10.0