From 4a87d0ed96753944d40e2a7bc4fc64f342767649 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Feb 2014 10:49:25 +0000
Subject: [PATCH] Factorized a lot of String joining code into Utils.joinAsString(). Removed unjustified uses of LocalizedMessageBuilder. Removed a few calls to String.valueOf() with arguments of LocalizableMessageBuilder.append().
---
opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
index e92cbfd..4f505f0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -26,18 +26,14 @@
*/
package org.opends.server.extensions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.util.Utils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.admin.std.server.FIFOEntryCacheCfg;
@@ -45,8 +41,6 @@
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.CacheEntry;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
@@ -56,12 +50,9 @@
import org.opends.server.types.SearchFilter;
import org.opends.server.types.Attribute;
import org.opends.server.util.ServerConstants;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.messages.ExtensionMessages.*;
-
-
/**
* This class defines a Directory Server entry cache that uses a FIFO to keep
* track of the entries. Entries that have been in the cache the longest are
@@ -169,15 +160,7 @@
EntryCacheCommon.ConfigPhase.PHASE_INIT, null, errorMessages
);
if (!processEntryCacheConfig(configuration, applyChanges, errorHandler)) {
- LocalizableMessageBuilder buffer = new LocalizableMessageBuilder();
- if (!errorMessages.isEmpty()) {
- Iterator<LocalizableMessage> iterator = errorMessages.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext()) {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
+ String buffer = Utils.joinAsString(". ", errorMessages);
throw new ConfigException(ERR_FIFOCACHE_CANNOT_INITIALIZE.get(buffer));
}
}
@@ -1050,6 +1033,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toVerboseString()
{
StringBuilder sb = new StringBuilder();
--
Gitblit v1.10.0