From 922bb410e78593fe90d96f930b880da6dae3de87 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 05 Mar 2014 08:09:11 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig Minor code cleanup and reorganized imports.
---
opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 142 ++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 75 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 256a93f..32ae244 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -27,19 +27,40 @@
package org.opends.server.util.cli;
-import org.forgerock.i18n.LocalizableMessage;
-import static org.opends.messages.UtilityMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
+import static org.opends.messages.UtilityMessages.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+
+import javax.net.ssl.KeyManager;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.admin.ads.ADSContext;
+import org.opends.admin.ads.util.ApplicationKeyManager;
+import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.quicksetup.Step;
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.tools.dsconfig.ArgumentExceptionFactory;
-import org.opends.server.tools.LDAPConnectionOptions;
-import org.opends.server.tools.SSLConnectionFactory;
-import org.opends.server.tools.SSLConnectionException;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
+import org.opends.server.tools.LDAPConnectionOptions;
+import org.opends.server.tools.SSLConnectionException;
+import org.opends.server.tools.SSLConnectionFactory;
+import org.opends.server.tools.dsconfig.ArgumentExceptionFactory;
+import org.opends.server.util.SelectableCertificateKeyManager;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.CommandBuilder;
@@ -49,27 +70,6 @@
import com.forgerock.opendj.cli.MenuResult;
import com.forgerock.opendj.cli.ValidationCallback;
-import org.opends.server.util.SelectableCertificateKeyManager;
-import org.opends.admin.ads.ADSContext;
-import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.admin.ads.util.ApplicationKeyManager;
-
-import javax.net.ssl.KeyManager;
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.cert.X509Certificate;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
/**
* Supports interacting with a user through the command line to
* prompt for information necessary to create an LDAP connection.
@@ -87,31 +87,35 @@
private char[] bindPassword;
private KeyManager keyManager;
private ApplicationTrustManager trustManager;
- // Boolean that tells if we ask for bind DN or admin UID in the same prompt.
+
+ /** Boolean that tells if we ask for bind DN or admin UID in the same prompt. */
private boolean useAdminOrBindDn = false;
- // Boolean that tells if we must propose LDAP if it is available even if the
- // user provided certificate parameters.
+
+ /**
+ * Boolean that tells if we must propose LDAP if it is available even if the
+ * user provided certificate parameters.
+ */
private boolean displayLdapIfSecureParameters = false;
- // The SecureConnectionCliArgsList object.
+ /** The SecureConnectionCliArgsList object. */
private SecureConnectionCliArgs secureArgsList = null;
- // Indicate if we need to display the heading
+ /** Indicate if we need to display the heading. */
private boolean isHeadingDisplayed = false;
- // the Console application
+ /** the Console application. */
private ConsoleApplication app;
- // Indicate if the trust store in in memory
+ /** Indicate if the trust store in in memory. */
private boolean trustStoreInMemory = false;
- // Indicate if the all certificates are accepted
+ /** Indicate if the all certificates are accepted. */
private boolean trustAll = false;
- // Indicate that the trust manager was created with the parameters provided
+ /** Indicate that the trust manager was created with the parameters provided. */
private boolean trustManagerInitialized;
- // The trust store to use for the SSL or STARTTLS connection
+ /** The trust store to use for the SSL or STARTTLS connection. */
private KeyStore truststore;
private String keystorePath;
@@ -124,15 +128,15 @@
private char[] truststorePassword;
- // The timeout to be used to connect
+ /** The timeout to be used to connect. */
private int connectTimeout;
private LocalizableMessage heading = INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS.get();
- // A copy of the secureArgList for convenience.
+ /** A copy of the secureArgList for convenience. */
private SecureConnectionCliArgs copySecureArgsList = null;
- // The command builder that we can return with the connection information.
+ /** The command builder that we can return with the connection information. */
private CommandBuilder commandBuilder;
@@ -209,7 +213,7 @@
*/
private TrustMethod(int i, LocalizableMessage msg)
{
- choice = new Integer(i);
+ choice = Integer.valueOf(i);
this.msg = msg;
}
@@ -259,7 +263,7 @@
*/
private TrustOption(int i, LocalizableMessage msg)
{
- choice = new Integer(i);
+ choice = Integer.valueOf(i);
this.msg = msg;
}
@@ -418,19 +422,11 @@
useSSL = secureArgsList.useSSL();
useStartTLS = secureArgsList.useStartTLS();
boolean connectionTypeIsSet =
- (
- secureArgsList.alwaysSSL()
- ||
- secureArgsList.useSSLArg.isPresent()
- ||
- secureArgsList.useStartTLSArg.isPresent()
- ||
- (
- secureArgsList.useSSLArg.isValueSetByProperty()
- &&
- secureArgsList.useStartTLSArg.isValueSetByProperty()
- )
- );
+ secureArgsList.alwaysSSL()
+ || secureArgsList.useSSLArg.isPresent()
+ || secureArgsList.useStartTLSArg.isPresent()
+ || (secureArgsList.useSSLArg.isValueSetByProperty()
+ && secureArgsList.useStartTLSArg.isValueSetByProperty());
if (app.isInteractive() && !connectionTypeIsSet)
{
checkHeadingDisplayed();
@@ -587,7 +583,7 @@
commandBuilder.addArgument(copySecureArgsList.portArg);
// Handle certificate
- if ((useSSL || useStartTLS) && (trustManager == null))
+ if ((useSSL || useStartTLS) && trustManager == null)
{
initializeTrustManager();
}
@@ -613,8 +609,7 @@
{
providedBindDN = null;
}
- boolean argIsPresent = (providedAdminUID != null) ||
- (providedBindDN != null);
+ boolean argIsPresent = providedAdminUID != null || providedBindDN != null;
final String tmpBindDN = bindDN;
final String tmpAdminUID = adminUID;
if (keyManager == null)
@@ -654,7 +649,7 @@
app.println();
if (useAdminOrBindDn)
{
- String def = (adminUID != null) ? adminUID : bindDN;
+ String def = (adminUID != null ? adminUID : bindDN);
String v = app.readValidatedInput(
INFO_LDAP_CONN_GLOBAL_ADMINISTRATOR_OR_BINDDN_PROMPT.get(def),
callback);
@@ -763,7 +758,7 @@
commandBuilder.addArgument(copySecureArgsList.bindPasswordFileArg);
addedPasswordFileArgument = true;
}
- else if (bindPassword == null || bindPassword.equals("-"))
+ else if (bindPassword == null || "-".equals(bindPassword))
{
// Read the password from the stdin.
if (!app.isInteractive())
@@ -852,11 +847,9 @@
// Try to use the local instance trust store, to avoid certificate
// validation when both the CLI and the server are in the same instance.
- if (weDontKnowTheTrustMethod) {
- if (addLocalTrustStore()) {
- weDontKnowTheTrustMethod = false;
-
- }
+ if (weDontKnowTheTrustMethod && addLocalTrustStore())
+ {
+ weDontKnowTheTrustMethod = false;
}
if (app.isInteractive() && weDontKnowTheTrustMethod)
@@ -876,7 +869,7 @@
{
builder.setDefault(
INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE
- .get(new Integer(i)), MenuResult.success(t.getChoice()));
+ .get(Integer.valueOf(i)), MenuResult.success(t.getChoice()));
}
}
@@ -1003,7 +996,7 @@
truststorePassword = secureArgsList.trustStorePasswordFileArg
.getValue().toCharArray();
}
- if ((truststorePassword != null) && (truststorePassword.equals("-")))
+ if (truststorePassword != null && "-".equals(truststorePassword))
{
// Read the password from the stdin.
if (!app.isInteractive())
@@ -1050,8 +1043,8 @@
truststore.load(null, null);
}
- if (secureArgsList.trustStorePasswordFileArg.isPresent() &&
- (truststorePath != null))
+ if (secureArgsList.trustStorePasswordFileArg.isPresent()
+ && truststorePath != null)
{
copySecureArgsList.trustStorePasswordFileArg.clearValues();
copySecureArgsList.trustStorePasswordFileArg.getNameToValueMap().putAll(
@@ -1059,7 +1052,7 @@
commandBuilder.addArgument(
copySecureArgsList.trustStorePasswordFileArg);
}
- else if ((truststorePassword != null) && (truststorePath != null))
+ else if (truststorePassword != null && truststorePath != null)
{
// Only add the trust store password if there is one AND if the user
// specified a trust store path.
@@ -1185,7 +1178,7 @@
throw ArgumentExceptionFactory.missingBindPassword(keystorePassword);
}
}
- else if (keystorePassword == null || keystorePassword.equals("-"))
+ else if (keystorePassword == null || "-".equals(keystorePassword))
{
// Read the password from the stdin.
if (!app.isInteractive())
@@ -1559,7 +1552,7 @@
{
builder.setDefault(
INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE
- .get(new Integer(i)), MenuResult.success(t.getChoice()));
+ .get(Integer.valueOf(i)), MenuResult.success(t.getChoice()));
}
}
@@ -1579,8 +1572,7 @@
return false;
}
- if ((result.getValue().equals(TrustOption.CERTIFICATE_DETAILS
- .getChoice())))
+ if (result.getValue().equals(TrustOption.CERTIFICATE_DETAILS.getChoice()))
{
for (int i = 0; i < chain.length; i++)
{
@@ -1610,7 +1602,7 @@
{
trustManager = new ApplicationTrustManager(truststore);
}
- if ((authType != null) && (host != null))
+ if (authType != null && host != null)
{
// Update the trust manager with the new certificate
trustManager.acceptCertificate(chain, authType, host);
--
Gitblit v1.10.0