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/extensions/GSSAPISASLMechanismHandler.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 2425412..396dd30 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -29,7 +29,7 @@
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.config.ConfigConstants.CONFIG_DIR_NAME;
+import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -39,7 +39,6 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -51,27 +50,24 @@
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
-import org.ietf.jgss.GSSException;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.ietf.jgss.GSSException;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.
- GSSAPISASLMechanismHandlerCfgDefn.QualityOfProtection;
+import org.opends.server.admin.std.meta.GSSAPISASLMechanismHandlerCfgDefn.QualityOfProtection;
import org.opends.server.admin.std.server.GSSAPISASLMechanismHandlerCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.forgerock.opendj.ldap.ResultCode;
-
-
/**
* This class provides an implementation of a SASL mechanism that
@@ -191,6 +187,7 @@
* @throws UnsupportedCallbackException
* if an error occurs.
*/
+ @Override
public void handle(Callback[] callbacks) throws UnsupportedCallbackException
{
}
@@ -473,6 +470,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isConfigurationChangeAcceptable(
GSSAPISASLMechanismHandlerCfg newConfiguration,
List<LocalizableMessage> unacceptableReasons) {
@@ -523,11 +521,10 @@
/**
* {@inheritDoc}
*/
- public ConfigChangeResult applyConfigurationChange(
- GSSAPISASLMechanismHandlerCfg newConfiguration) {
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
+ @Override
+ public ConfigChangeResult applyConfigurationChange(GSSAPISASLMechanismHandlerCfg newConfiguration)
+ {
+ final ConfigChangeResult ccr = new ConfigChangeResult();
try
{
logout();
@@ -537,21 +534,21 @@
}
catch (InitializationException ex) {
logger.traceException(ex);
- messages.add(ex.getMessageObject());
+ ccr.addMessage(ex.getMessageObject());
clearProperties();
- resultCode = ResultCode.OTHER;
+ ccr.setResultCode(ResultCode.OTHER);
} catch (UnknownHostException ex) {
logger.traceException(ex);
- messages.add(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(ex)));
+ ccr.addMessage(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(ex)));
clearProperties();
- resultCode = ResultCode.OTHER;
+ ccr.setResultCode(ResultCode.OTHER);
} catch (IOException ex) {
logger.traceException(ex);
- messages.add(ERR_SASLGSSAPI_CANNOT_CREATE_JAAS_CONFIG.get(getExceptionMessage(ex)));
+ ccr.addMessage(ERR_SASLGSSAPI_CANNOT_CREATE_JAAS_CONFIG.get(getExceptionMessage(ex)));
clearProperties();
- resultCode = ResultCode.OTHER;
+ ccr.setResultCode(ResultCode.OTHER);
}
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
/**
--
Gitblit v1.10.0