From 2d6d33151d17b44ba0589a40e19a2d323e6d7f13 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().
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java | 23 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 24 ---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 21 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java | 22 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java | 23 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 24 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 22 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 23 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java | 23 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 22 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java | 22 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 33 +---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java | 18 --
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 15 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java | 23 --
opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java | 16 -
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java | 24 --
17 files changed, 61 insertions(+), 317 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java
index 7e8db6a..e3c15fe 100644
--- a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java
+++ b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java
@@ -26,8 +26,6 @@
*/
package org.opends.quicksetup;
-import static org.opends.messages.QuickSetupMessages.*;
-
import java.awt.Font;
import java.util.ArrayList;
@@ -35,6 +33,9 @@
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
+import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
* A class used to describe the java arguments for a given command-line.
*
@@ -248,16 +249,7 @@
}
else
{
- StringBuilder sb = new StringBuilder();
- for (LocalizableMessage line : lines)
- {
- if (sb.length() > 0)
- {
- sb.append("<br>");
- }
- sb.append(line);
- }
- msg = LocalizableMessage.raw(sb.toString());
+ msg = LocalizableMessage.raw(collectionToString(lines, "<br>"));
}
}
return msg;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 87eb9fe..510c42c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/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;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
index b8c8f8e..4195b28 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -28,7 +28,6 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -464,21 +463,10 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
- // Bug: where in a section where configuration is null
+ String reasons = collectionToString(unacceptableReasons, ". ");
+ // Bug: we are in a section where configuration is null
throw new InitializationException(ERR_CONFIG_AUTHZ_CONFIG_NOT_ACCEPTABLE.get(
- null /* WAS: configuration.dn() */, buffer));
+ null /* WAS: configuration.dn() */, reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 47c537f..99bac66 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -25,16 +25,14 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.util.StaticUtils.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -53,8 +51,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-
-
/**
* This class defines a utility that will be used to manage the set of account
* status notification handlers defined in the Directory Server. It will
@@ -449,20 +445,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_ACCTNOTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_ACCTNOTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index 08fbb8f..a60ce71 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -48,16 +46,12 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a utility that will be used to manage the set of alert
* handlers defined in the Directory Server. It will initialize the alert
@@ -402,20 +396,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index eeb2870..a15642a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -26,12 +26,9 @@
*/
package org.opends.server.core;
-
-
import java.lang.reflect.Method;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -50,16 +47,12 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of attribute
* syntaxes defined in the Directory Server. It wil initialize the syntaxes
@@ -482,20 +475,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_SCHEMA_SYNTAX_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_SCHEMA_SYNTAX_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index 494ec52..a8476ca 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,11 +50,8 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of
* certificate mappers defined in the Directory Server. It will initialize the
@@ -418,20 +413,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_CERTMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_CERTMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
index 2bafff2..5ac8f0e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,11 +50,8 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of
* extensions defined in the Directory Server. It will initialize the
@@ -415,20 +410,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_EXTENSION_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_EXTENSION_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 2fe8783..beed978 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -48,17 +46,12 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of identity
* mappers defined in the Directory Server. It will initialize the identity
@@ -429,20 +422,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_IDMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_IDMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index 2010ce5..62bdfb7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,11 +50,8 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of key
* manager providers defined in the Directory Server. It will initialize the
@@ -417,20 +412,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_KEYMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_KEYMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index d05dd7c..487923b 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -55,17 +53,13 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.MatchingRuleUse;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a utility that will be used to manage the set of matching
* rules defined in the Directory Server. It wil initialize the rules when the
@@ -625,20 +619,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_SCHEMA_MR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_SCHEMA_MR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index ed40502..f22450a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,10 +50,7 @@
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
-
-
+import static org.opends.server.util.StaticUtils.*;
/**
* This class defines a utility that will be used to manage the set of password
@@ -411,20 +406,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_PWGENERATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_PWGENERATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 1632369..f5496e6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -25,17 +25,14 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import static org.opends.messages.ConfigMessages.*;
-
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.util.StaticUtils.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -54,8 +51,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-
-
/**
* This class defines a utility that will be used to manage the set of password
* storage schemes defined in the Directory Server. It will initialize the
@@ -436,20 +431,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index c60cd86..27ada2f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -54,8 +52,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the set of
* password validators defined in the Directory Server. It will initialize the
@@ -423,20 +419,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
index ae67018..ef6d1d8 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -48,16 +46,12 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a utility that will be used to manage the set of SASL
* mechanism handlers defined in the Directory Server. It will initialize the
@@ -411,20 +405,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_SASL_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_SASL_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index dc598b1..24e3c05 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -25,14 +25,12 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -48,16 +46,12 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-
-
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a utility that will be used to manage the set of trust
* manager providers defined in the Directory Server. It will initialize the
@@ -419,20 +413,9 @@
unacceptableReasons);
if (! acceptable)
{
- StringBuilder buffer = new StringBuilder();
- if (! unacceptableReasons.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = unacceptableReasons.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
+ String reasons = collectionToString(unacceptableReasons, ". ");
throw new InitializationException(
- ERR_CONFIG_TRUSTMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
+ ERR_CONFIG_TRUSTMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), reasons));
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 5683ef9..5102caf 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -1369,19 +1369,8 @@
if (resultCode != ResultCode.SUCCESS)
{
- StringBuilder buffer = new StringBuilder();
- if (! messages.isEmpty())
- {
- Iterator<LocalizableMessage> iterator = messages.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext())
- {
- buffer.append(". ");
- buffer.append(iterator.next());
- }
- }
-
- LocalizableMessage message = ERR_CONFIG_FILE_DELETE_APPLY_FAILED.get(buffer);
+ String reasons = StaticUtils.collectionToString(messages, ". ");
+ LocalizableMessage message = ERR_CONFIG_FILE_DELETE_APPLY_FAILED.get(reasons);
throw new DirectoryException(resultCode, message);
}
}
--
Gitblit v1.10.0