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/loggers/AbstractLogger.java | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 6eacdc5..70dcd1d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -29,7 +29,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -37,18 +36,18 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg3;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.LogPublisherCfg;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
/**
@@ -262,10 +261,7 @@
@Override
public ConfigChangeResult applyConfigurationAdd(C config)
{
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
config.addChangeListener((ConfigurationChangeListener) this);
@@ -278,18 +274,18 @@
catch(ConfigException e)
{
LocalizedLogger.getLoggerForThisClass().traceException(e);
- messages.add(e.getMessageObject());
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.addMessage(e.getMessageObject());
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
catch (Exception e)
{
LocalizedLogger.getLoggerForThisClass().traceException(e);
- messages.add(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(
+ ccr.addMessage(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(
config.dn(), stackTraceToSingleLineString(e)));
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
}
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
private P findLogPublisher(DN dn)
@@ -310,10 +306,7 @@
@Override
public ConfigChangeResult applyConfigurationChange(C config)
{
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
P logPublisher = findLogPublisher(config.dn());
if(logPublisher == null)
@@ -336,7 +329,7 @@
String className = config.getJavaClass();
if(!className.equals(logPublisher.getClass().getName()))
{
- adminActionRequired = true;
+ ccr.setAdminActionRequired(true);
}
}
else
@@ -346,7 +339,7 @@
}
}
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
/**
@@ -365,9 +358,7 @@
@Override
public ConfigChangeResult applyConfigurationDelete(C config)
{
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
+ final ConfigChangeResult ccr = new ConfigChangeResult();
P logPublisher = findLogPublisher(config.dn());
if(logPublisher != null)
@@ -376,10 +367,10 @@
}
else
{
- resultCode = ResultCode.NO_SUCH_OBJECT;
+ ccr.setResultCode(ResultCode.NO_SUCH_OBJECT);
}
- return new ConfigChangeResult(resultCode, adminActionRequired);
+ return ccr;
}
private boolean isJavaClassAcceptable(C config,
--
Gitblit v1.10.0