From f6cd63ffc28006e05d3a7c90025f1430732949a9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Apr 2016 08:16:29 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
index 73001e1..65d36a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
@@ -28,14 +28,14 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.server.BackendCfg;
+import org.forgerock.util.Utils;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.DirectoryServer;
@@ -346,27 +346,18 @@
out.println(message);
byte[] hash = backupInfo.getUnsignedHash();
-
message = INFO_RESTOREDB_LIST_HASHED.get(hash != null);
out.println(message);
byte[] signature = backupInfo.getSignedHash();
-
message = INFO_RESTOREDB_LIST_SIGNED.get(signature != null);
out.println(message);
StringBuilder dependencyList = new StringBuilder();
- HashSet<String> dependencyIDs = backupInfo.getDependencies();
+ Set<String> dependencyIDs = backupInfo.getDependencies();
if (! dependencyIDs.isEmpty())
{
- Iterator<String> iterator = dependencyIDs.iterator();
- dependencyList.append(iterator.next());
-
- while (iterator.hasNext())
- {
- dependencyList.append(", ");
- dependencyList.append(iterator.next());
- }
+ Utils.joinAsString(dependencyList, ", ", dependencyIDs);
}
else
{
--
Gitblit v1.10.0