From 73766a45c9e8fc61933819183943814f0122cb91 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Apr 2015 08:41:32 +0000
Subject: [PATCH] OPENDJ-1056 Fix checkstyle issues
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 21 +++++++++------------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java | 13 +++++++++++--
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index c0aa5db..aa308fb 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -25,9 +25,9 @@
* Portions Copyright 2011-2015 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;
@@ -37,26 +37,23 @@
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.util.Enumeration;
-import java.util.Iterator;
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.ldap.ResultCode;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
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.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-import org.forgerock.opendj.ldap.ResultCode;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.ExtensionMessages.*;
-
-import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
index a992660..7ea0319 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
@@ -348,8 +348,17 @@
return newKeyManagers;
}
- public static X509ExtendedKeyManager[] wrap(KeyManager[] keyManagers,
- String alias) {
+ /**
+ * Wraps the provided set of key managers in selectable certificate key
+ * managers using the provided alias.
+ *
+ * @param keyManagers The set of key managers to be wrapped.
+ * @param alias The alias to use for selecting the desired
+ * certificate.
+ *
+ * @return A key manager array
+ */
+ public static X509ExtendedKeyManager[] wrap(KeyManager[] keyManagers, String alias) {
return wrap(keyManagers, alias, "[unknown]");
}
}
--
Gitblit v1.10.0