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/ConfigFileHandler.java | 45 +++++----------------------------------------
1 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 0d5e6a2..8da922f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -1220,19 +1220,8 @@
if (resultCode != ResultCode.SUCCESS)
{
- LocalizableMessageBuilder buffer = new LocalizableMessageBuilder();
- 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_ADD_APPLY_FAILED.get(buffer);
+ String reasons = Utils.joinAsString(". ", messages);
+ LocalizableMessage message = ERR_CONFIG_FILE_ADD_APPLY_FAILED.get(reasons);
throw new DirectoryException(resultCode, message);
}
}
@@ -1518,19 +1507,8 @@
if (resultCode != ResultCode.SUCCESS)
{
- LocalizableMessageBuilder buffer = new LocalizableMessageBuilder();
- 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_MODIFY_APPLY_FAILED.get(buffer);
+ String reasons = Utils.joinAsString(". ", messages);
+ LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_APPLY_FAILED.get(reasons);
throw new DirectoryException(resultCode, message);
}
}
@@ -3225,20 +3203,7 @@
boolean adminActionRequired = result.adminActionRequired();
List<LocalizableMessage> messages = result.getMessages();
- LocalizableMessageBuilder messageBuffer = new LocalizableMessageBuilder();
- if (messages != null)
- {
- for (LocalizableMessage s : messages)
- {
- if (messageBuffer.length() > 0)
- {
- messageBuffer.append(" ");
- }
- messageBuffer.append(s);
- }
- }
-
-
+ String messageBuffer = Utils.joinAsString(" ", messages);
if (resultCode != ResultCode.SUCCESS)
{
logger.error(ERR_CONFIG_CHANGE_RESULT_ERROR, className, methodName,
--
Gitblit v1.10.0