From 3f1ed4284d2b06b0bc85659c2017e40989b232db Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:33 +0000
Subject: [PATCH] Add/Update ConfigurationBackend and ConfigurationHandler classes.
---
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
index e13e998..9dd19c4 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
@@ -12,16 +12,16 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2015 ForgeRock AS.
+ * Portions copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.util.Utils;
/**
* This class defines a data structure that can be used to hold information
@@ -85,6 +85,19 @@
}
/**
+ * Aggregates the results from the provided config change result.
+ *
+ * @param other
+ * The config change result to aggregate
+ */
+ public void aggregate(ConfigChangeResult other) {
+ if (other.getResultCode() != ResultCode.SUCCESS) {
+ setResultCodeIfSuccess(other.getResultCode());
+ messages.addAll(other.getMessages());
+ }
+ }
+
+ /**
* Indicates whether administrative action is required before one or more of
* the changes will take effect.
*
@@ -156,16 +169,7 @@
buffer.append(", adminActionRequired=");
buffer.append(adminActionRequired);
buffer.append(", messages={");
-
- if (!messages.isEmpty()) {
- final Iterator<LocalizableMessage> iterator = messages.iterator();
- buffer.append(iterator.next());
- while (iterator.hasNext()) {
- buffer.append(",");
- buffer.append(iterator.next());
- }
- }
-
+ Utils.joinAsString(buffer, ",", messages);
buffer.append("})");
}
}
--
Gitblit v1.10.0