From 6791a1729c74c40faaf68edcc956351c3234b5b6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 15:01:45 +0000
Subject: [PATCH] Factorized code using StaticUtils.collectionToString().
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 87eb9fe..510c42c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -26,13 +26,6 @@
*/
package org.opends.server.backends.jeb.importLDIF;
-import static com.sleepycat.je.EnvironmentConfig.*;
-
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.util.DynamicConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.io.*;
import java.nio.ByteBuffer;
import java.util.*;
@@ -41,6 +34,8 @@
import java.util.concurrent.atomic.AtomicLong;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
@@ -51,9 +46,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DiskSpaceMonitor;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.Platform;
import org.opends.server.util.StaticUtils;
@@ -61,6 +54,13 @@
import com.sleepycat.je.*;
import com.sleepycat.util.PackedInteger;
+import static com.sleepycat.je.EnvironmentConfig.*;
+
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.util.DynamicConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
* This class provides the engine that performs both importing of LDIF files and
* the rebuilding of indexes.
@@ -3184,16 +3184,6 @@
*/
public void printStartMessage() throws DatabaseException
{
- StringBuilder sb = new StringBuilder();
- List<String> rebuildList = rebuildConfig.getRebuildList();
- for (String index : rebuildList)
- {
- if (sb.length() > 0)
- {
- sb.append(", ");
- }
- sb.append(index);
- }
totalEntries = suffix.getID2Entry().getRecordCount();
LocalizableMessage message = null;
@@ -3208,7 +3198,8 @@
default:
if (!rebuildConfig.isClearDegradedState())
{
- message = NOTE_JEB_REBUILD_START.get(sb, totalEntries);
+ String indexes = collectionToString(rebuildConfig.getRebuildList(), ", ");
+ message = NOTE_JEB_REBUILD_START.get(indexes, totalEntries);
}
break;
}
@@ -4134,7 +4125,6 @@
long deltaCount = (latestCount - previousCount);
long latestTime = System.currentTimeMillis();
long deltaTime = latestTime - previousTime;
- LocalizableMessage message;
if (deltaTime == 0)
{
return;
@@ -4267,7 +4257,6 @@
long deltaCount = (latestCount - previousCount);
long latestTime = System.currentTimeMillis();
long deltaTime = latestTime - previousTime;
- LocalizableMessage message;
if (deltaTime == 0)
{
return;
--
Gitblit v1.10.0