From 1a9b0c4c35b0fbcc2cf09db1f40a17fc76cb4a90 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 09:54:47 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 5a77dd7..bf4fd94 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -68,11 +68,10 @@
import com.forgerock.opendj.cli.StringArgument;
/**
- * This is a commodity class that can be used to check the arguments required
- * to establish a secure connection in the command line. It can be used
- * to generate an ApplicationTrustManager object based on the options provided
- * by the user in the command line.
- *
+ * This is a commodity class that can be used to check the arguments required to
+ * establish a secure connection in the command line. It can be used to generate
+ * an ApplicationTrustManager object based on the options provided by the user
+ * in the command line.
*/
public final class SecureConnectionCliArgs
{
@@ -228,10 +227,11 @@
}
/**
- * Tells whether this parser uses the Administrator UID (instead of the
- * bind DN) or not.
- * @return <CODE>true</CODE> if this parser uses the Administrator UID and
- * <CODE>false</CODE> otherwise.
+ * Tells whether this parser uses the Administrator UID (instead of the bind
+ * DN) or not.
+ *
+ * @return {@code true} if this parser uses the Administrator UID and
+ * {@code false} otherwise.
*/
public boolean useAdminUID()
{
@@ -600,30 +600,29 @@
/**
- * Returns <CODE>true</CODE> if we can read on the provided path and
- * <CODE>false</CODE> otherwise.
- * @param path the path.
- * @return <CODE>true</CODE> if we can read on the provided path and
- * <CODE>false</CODE> otherwise.
+ * Returns {@code true} if we can read on the provided path and
+ * {@code false} otherwise.
+ *
+ * @param path
+ * the path.
+ * @return {@code true} if we can read on the provided path and
+ * {@code false} otherwise.
*/
private boolean canRead(String path)
{
final File file = new File(path);
- if (file.exists())
- {
- return file.canRead();
- }
- return false;
+ return file.exists() && file.canRead();
}
/**
- * Returns the absolute path of the trust store file that appears on the
- * config. Returns <CODE>null</CODE> if the trust store is not defined or
- * it does not exist.
+ * Returns the absolute path of the trust store file that appears on the
+ * config. Returns {@code null} if the trust store is not defined or it
+ * does not exist.
*
- * @return the absolute path of the trust store file that appears on the
- * config.
- * @throws ConfigException if there is an error reading the configuration.
+ * @return the absolute path of the trust store file that appears on the
+ * config.
+ * @throws ConfigException
+ * if there is an error reading the configuration.
*/
public String getTruststoreFileFromConfig() throws ConfigException
{
@@ -681,8 +680,10 @@
/**
* Returns the admin port from the configuration.
+ *
* @return the admin port from the configuration.
- * @throws ConfigException if an error occurs reading the configuration.
+ * @throws ConfigException
+ * if an error occurs reading the configuration.
*/
public int getAdminPortFromConfig() throws ConfigException
{
@@ -726,10 +727,11 @@
/**
* Returns the port to be used according to the configuration and the
- * arguments provided by the user.
- * This method should be called after the arguments have been parsed.
+ * arguments provided by the user. This method should be called after the
+ * arguments have been parsed.
+ *
* @return the port to be used according to the configuration and the
- * arguments provided by the user.
+ * arguments provided by the user.
*/
public int getPortFromConfig()
{
@@ -742,10 +744,10 @@
{
portNumber = getAdminPortFromConfig();
} catch (ConfigException ex) {
- // nothing to do
+ // Nothing to do
}
} else {
- portNumber = 636;
+ portNumber = CliConstants.DEFAULT_SSL_PORT;
}
return portNumber;
}
@@ -753,7 +755,9 @@
/**
* Updates the default values of the port and the trust store with what is
* read in the configuration.
- * @throws ConfigException if there is an error reading the configuration.
+ *
+ * @throws ConfigException
+ * if there is an error reading the configuration.
*/
public void initArgumentsWithConfiguration() throws ConfigException
{
--
Gitblit v1.10.0