From 61b9eb1be03fc03a9f4bb0013a08ff44a1059503 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 14:25:46 +0000
Subject: [PATCH] opendj-server-legacy: added @Override + Autorefactor'ed comments
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 64 +++++++-------------------------
1 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index f927f57..771fd7d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -15,9 +15,9 @@
* Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.ExtensionMessages.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.File;
@@ -25,25 +25,24 @@
import java.io.IOException;
import java.security.KeyStore;
import java.util.List;
+
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.server.config.server.PKCS11KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.InitializationException;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a key manager provider that will access keys stored on a
* PKCS#11 device. It will use the Java PKCS#11 interface, which may need to be
@@ -55,15 +54,9 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- /**
- * The keystore type to use when accessing the PKCS#11 keystore.
- */
+ /** The keystore type to use when accessing the PKCS#11 keystore. */
public static final String PKCS11_KEYSTORE_TYPE = "PKCS11";
-
-
/** The DN of the configuration entry for this key manager provider. */
private DN configEntryDN;
@@ -73,8 +66,6 @@
/** The current configuration for this key manager provider. */
private PKCS11KeyManagerProviderCfg currentConfig;
-
-
/**
* Creates a new instance of this PKCS#11 key manager provider. The
* <CODE>initializeKeyManagerProvider</CODE> method must be called on the
@@ -85,9 +76,6 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeKeyManagerProvider(
PKCS11KeyManagerProviderCfg configuration)
@@ -168,29 +156,13 @@
}
}
-
-
- /**
- * Performs any finalization that may be necessary for this key
- * manager provider.
- */
+ @Override
public void finalizeKeyManagerProvider()
{
currentConfig.removePKCS11ChangeListener(this);
}
-
-
- /**
- * Retrieves a set of <CODE>KeyManager</CODE> objects that may be used for
- * interactions requiring access to a key manager.
- *
- * @return A set of <CODE>KeyManager</CODE> objects that may be used for
- * interactions requiring access to a key manager.
- *
- * @throws DirectoryException If a problem occurs while attempting to obtain
- * the set of key managers.
- */
+ @Override
public KeyManager[] getKeyManagers()
throws DirectoryException
{
@@ -210,7 +182,6 @@
message, e);
}
-
try
{
String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
@@ -230,9 +201,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
PKCS11KeyManagerProviderCfg configuration,
@@ -241,9 +209,7 @@
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
PKCS11KeyManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -339,9 +305,7 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
PKCS11KeyManagerProviderCfg configuration)
{
--
Gitblit v1.10.0