From edc595e56216e680d268376e85c7625f2f052b6a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jul 2015 08:40:36 +0000
Subject: [PATCH] AutoRefactor'ed Collections
---
opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
index c7505c2..26add20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
@@ -49,6 +49,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.util.Utils;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
@@ -345,29 +346,17 @@
// Check that the backendID has not been expressed twice.
HashSet<String> backendIDLowerCase = new HashSet<>();
HashSet<String> repeatedBackendIds = new HashSet<>();
- StringBuilder repeatedBackends = new StringBuilder();
for (String id : backendID.getValues())
{
String lId = id.toLowerCase();
- if (backendIDLowerCase.contains(lId))
+ if (!backendIDLowerCase.add(lId))
{
- if (!repeatedBackendIds.contains(lId))
- {
- repeatedBackendIds.add(lId);
- if (repeatedBackends.length() > 0)
- {
- repeatedBackends.append(", ");
- }
- repeatedBackends.append(id);
- }
- }
- else
- {
- backendIDLowerCase.add(lId);
+ repeatedBackendIds.add(lId);
}
}
- if (repeatedBackends.length() > 0)
+ if (!repeatedBackendIds.isEmpty())
{
+ String repeatedBackends = Utils.joinAsString(", ", repeatedBackendIds);
LocalizableMessage message = ERR_BACKUPDB_REPEATED_BACKEND_ID.get(repeatedBackends);
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
@@ -442,7 +431,7 @@
addIfHasValue(attributes, ATTR_TASK_BACKUP_SIGN_HASH, signHash);
List<String> backendIDs = backendID.getValues();
- if (backendIDs != null && backendIDs.size() > 0) {
+ if (backendIDs != null && !backendIDs.isEmpty()) {
ArrayList<ByteString> values = new ArrayList<>(backendIDs.size());
for (String s : backendIDs) {
values.add(ByteString.valueOf(s));
--
Gitblit v1.10.0