From 6d1ebe16f8bfd23ef5de615dc7fab6468f7ef3f8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 24 Dec 2014 15:01:44 +0000
Subject: [PATCH] Code cleanup
---
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 46b49a8..2a72246 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -26,6 +26,11 @@
*/
package org.opends.server.backends.task;
+import static org.opends.messages.BackendMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.*;
import java.net.InetAddress;
import java.security.MessageDigest;
@@ -40,29 +45,24 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Reject;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TaskBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
-import static org.opends.messages.BackendMessages.*;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class provides an implementation of a Directory Server backend that may
* be used to execute various kinds of administrative tasks on a one-time or
@@ -1869,9 +1869,7 @@
@Override
public ConfigChangeResult applyConfigurationChange(TaskBackendCfg configEntry)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
String tmpBackingFile = taskBackingFile;
@@ -1884,27 +1882,26 @@
File f = getFileForPath(tmpBackingFile);
if (f.exists())
{
- messages.add(ERR_TASKBE_BACKING_FILE_EXISTS.get(tmpBackingFile));
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
+ ccr.addMessage(ERR_TASKBE_BACKING_FILE_EXISTS.get(tmpBackingFile));
+ ccr.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
}
else
{
File p = f.getParentFile();
if (p == null)
{
- messages.add(ERR_TASKBE_INVALID_BACKING_FILE_PATH.get(
- tmpBackingFile));
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
+ ccr.addMessage(ERR_TASKBE_INVALID_BACKING_FILE_PATH.get(tmpBackingFile));
+ ccr.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
}
else if (! p.exists())
{
- messages.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(p, tmpBackingFile));
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
+ ccr.addMessage(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(p, tmpBackingFile));
+ ccr.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
}
else if (! p.isDirectory())
{
- messages.add(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(p, tmpBackingFile));
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
+ ccr.addMessage(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(p, tmpBackingFile));
+ ccr.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
}
}
}
@@ -1914,24 +1911,22 @@
{
logger.traceException(e);
- messages.add(ERR_TASKBE_ERROR_GETTING_BACKING_FILE.get(
- getExceptionMessage(e)));
-
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.addMessage(ERR_TASKBE_ERROR_GETTING_BACKING_FILE.get(getExceptionMessage(e)));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
long tmpRetentionTime = configEntry.getTaskRetentionTime();
- if (resultCode == ResultCode.SUCCESS)
+ if (ccr.getResultCode() == ResultCode.SUCCESS)
{
// Everything looks OK, so apply the changes.
if (retentionTime != tmpRetentionTime)
{
retentionTime = tmpRetentionTime;
- messages.add(INFO_TASKBE_UPDATED_RETENTION_TIME.get(retentionTime));
+ ccr.addMessage(INFO_TASKBE_UPDATED_RETENTION_TIME.get(retentionTime));
}
@@ -1940,7 +1935,7 @@
taskBackingFile = tmpBackingFile;
taskScheduler.writeState();
- messages.add(INFO_TASKBE_UPDATED_BACKING_FILE.get(taskBackingFile));
+ ccr.addMessage(INFO_TASKBE_UPDATED_BACKING_FILE.get(taskBackingFile));
}
}
@@ -1962,7 +1957,7 @@
currentConfig = configEntry;
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
--
Gitblit v1.10.0