From df993e4e7a2b5af0c8e0907a80e1a4cef10ee56d Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 11 Feb 2016 14:17:18 +0000
Subject: [PATCH] OPENDJSDK-42 cli arguments fluent builder
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java | 340 ++++++++++++++++++++++++--------------------------------
1 files changed, 145 insertions(+), 195 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
index c5f9502..767a17c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
@@ -27,6 +27,7 @@
package org.opends.server.tools;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.CliMessages.INFO_DESCRIPTION_BINDPASSWORDFILE;
import static com.forgerock.opendj.cli.Utils.*;
import static org.opends.messages.ToolMessages.*;
@@ -328,218 +329,167 @@
argParser.setVersionHandler(new DirectoryServerVersionHandler());
try
{
- propertiesFileArgument = new StringArgument("propertiesFilePath",
- null, OPTION_LONG_PROP_FILE_PATH,
- false, false, true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_PROP_FILE_PATH.get());
- argParser.addArgument(propertiesFileArgument);
+ propertiesFileArgument =
+ StringArgument.builder(OPTION_LONG_PROP_FILE_PATH)
+ .description(INFO_DESCRIPTION_PROP_FILE_PATH.get())
+ .valuePlaceholder(INFO_PROP_FILE_PATH_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = new BooleanArgument(
- "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
- INFO_DESCRIPTION_NO_PROP_FILE.get());
- argParser.addArgument(noPropertiesFileArgument);
+ noPropertiesFileArgument =
+ BooleanArgument.builder(OPTION_LONG_NO_PROP_FILE)
+ .description(INFO_DESCRIPTION_NO_PROP_FILE.get())
+ .buildAndAddToParser(argParser);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
- hostName = new StringArgument("host", OPTION_SHORT_HOST,
- OPTION_LONG_HOST, false, false, true,
- INFO_HOST_PLACEHOLDER.get(), "localhost",
- null,
- INFO_DESCRIPTION_HOST.get());
- hostName.setPropertyName(OPTION_LONG_HOST);
- argParser.addArgument(hostName);
-
- port = new IntegerArgument("port", OPTION_SHORT_PORT,
- OPTION_LONG_PORT, false, false, true,
- INFO_PORT_PLACEHOLDER.get(), 389, null,
- true, 1, true, 65535,
- INFO_DESCRIPTION_PORT.get());
- port.setPropertyName(OPTION_LONG_PORT);
- argParser.addArgument(port);
-
- useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
- OPTION_LONG_USE_SSL,
- INFO_DESCRIPTION_USE_SSL.get());
- useSSL.setPropertyName(OPTION_LONG_USE_SSL);
- argParser.addArgument(useSSL);
-
- startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
- OPTION_LONG_START_TLS,
- INFO_DESCRIPTION_START_TLS.get());
- startTLS.setPropertyName(OPTION_LONG_START_TLS);
- argParser.addArgument(startTLS);
-
- bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
- OPTION_LONG_BINDDN, false, false, true,
- INFO_BINDDN_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_BINDDN.get());
- bindDN.setPropertyName(OPTION_LONG_BINDDN);
- argParser.addArgument(bindDN);
-
- bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
- OPTION_LONG_BINDPWD,
- false, false, true,
- INFO_BINDPWD_PLACEHOLDER.get(),
- null, null,
- INFO_DESCRIPTION_BINDPASSWORD.get());
- bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
- argParser.addArgument(bindPassword);
-
+ hostName =
+ StringArgument.builder(OPTION_LONG_HOST)
+ .shortIdentifier(OPTION_SHORT_HOST)
+ .description(INFO_DESCRIPTION_HOST.get())
+ .defaultValue("localhost")
+ .valuePlaceholder(INFO_HOST_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ port =
+ IntegerArgument.builder(OPTION_LONG_PORT)
+ .shortIdentifier(OPTION_SHORT_PORT)
+ .description(INFO_DESCRIPTION_PORT.get())
+ .range(1, 65535)
+ .defaultValue(389)
+ .valuePlaceholder(INFO_PORT_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ useSSL =
+ BooleanArgument.builder(OPTION_LONG_USE_SSL)
+ .shortIdentifier(OPTION_SHORT_USE_SSL)
+ .description(INFO_DESCRIPTION_USE_SSL.get())
+ .buildAndAddToParser(argParser);
+ startTLS =
+ BooleanArgument.builder(OPTION_LONG_START_TLS)
+ .shortIdentifier(OPTION_SHORT_START_TLS)
+ .description(INFO_DESCRIPTION_START_TLS.get())
+ .buildAndAddToParser(argParser);
+ bindDN =
+ StringArgument.builder(OPTION_LONG_BINDDN)
+ .shortIdentifier(OPTION_SHORT_BINDDN)
+ .description(INFO_DESCRIPTION_BINDDN.get())
+ .valuePlaceholder(INFO_BINDDN_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ bindPassword =
+ StringArgument.builder(OPTION_LONG_BINDPWD)
+ .shortIdentifier(OPTION_SHORT_BINDPWD)
+ .description(INFO_DESCRIPTION_BINDPASSWORD.get())
+ .valuePlaceholder(INFO_BINDPWD_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
bindPasswordFile =
- new FileBasedArgument("bindPasswordFile", OPTION_SHORT_BINDPWD_FILE,
- OPTION_LONG_BINDPWD_FILE,
- false, false,
- INFO_BINDPWD_FILE_PLACEHOLDER.get(), null,
- null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
- bindPasswordFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
- argParser.addArgument(bindPasswordFile);
-
- filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
- OPTION_LONG_FILENAME, false, false,
- true, INFO_FILE_PLACEHOLDER.get(), null,
- null,
- INFO_DELETE_DESCRIPTION_FILENAME.get());
- filename.setPropertyName(OPTION_LONG_FILENAME);
- argParser.addArgument(filename);
-
+ FileBasedArgument.builder(OPTION_LONG_BINDPWD_FILE)
+ .shortIdentifier(OPTION_SHORT_BINDPWD_FILE)
+ .description(INFO_DESCRIPTION_BINDPASSWORDFILE.get())
+ .valuePlaceholder(INFO_BINDPWD_FILE_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ filename =
+ StringArgument.builder(OPTION_LONG_FILENAME)
+ .shortIdentifier(OPTION_SHORT_FILENAME)
+ .description(INFO_DELETE_DESCRIPTION_FILENAME.get())
+ .valuePlaceholder(INFO_FILE_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
saslExternal =
- new BooleanArgument("useSASLExternal", 'r',
- "useSASLExternal",
- INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
- saslExternal.setPropertyName("useSASLExternal");
- argParser.addArgument(saslExternal);
-
- saslOptions = new StringArgument(
- "saslOption", OPTION_SHORT_SASLOPTION,
- OPTION_LONG_SASLOPTION,
- false, true, true,
- INFO_SASL_OPTION_PLACEHOLDER.get(), null,
- null, INFO_DESCRIPTION_SASL_PROPERTIES.get());
- saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
- argParser.addArgument(saslOptions);
+ BooleanArgument.builder("useSASLExternal")
+ .shortIdentifier('r')
+ .description(INFO_DESCRIPTION_USE_SASL_EXTERNAL.get())
+ .buildAndAddToParser(argParser);
+ saslOptions =
+ StringArgument.builder(OPTION_LONG_SASLOPTION)
+ .shortIdentifier(OPTION_SHORT_SASLOPTION)
+ .description(INFO_DESCRIPTION_SASL_PROPERTIES.get())
+ .multiValued()
+ .valuePlaceholder(INFO_SASL_OPTION_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
- keyStorePath = new StringArgument("keyStorePath",
- OPTION_SHORT_KEYSTOREPATH,
- OPTION_LONG_KEYSTOREPATH,
- false, false, true,
- INFO_KEYSTOREPATH_PLACEHOLDER.get(),
- null, null,
- INFO_DESCRIPTION_KEYSTOREPATH.get());
- keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
- argParser.addArgument(keyStorePath);
-
+ keyStorePath =
+ StringArgument.builder(OPTION_LONG_KEYSTOREPATH)
+ .shortIdentifier(OPTION_SHORT_KEYSTOREPATH)
+ .description(INFO_DESCRIPTION_KEYSTOREPATH.get())
+ .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
keyStorePassword =
- new StringArgument("keyStorePassword",
- OPTION_SHORT_KEYSTORE_PWD,
- OPTION_LONG_KEYSTORE_PWD,
- false, false,
- true, INFO_KEYSTORE_PWD_PLACEHOLDER.get(),
- null, null,
- INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
- keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
- argParser.addArgument(keyStorePassword);
-
+ StringArgument.builder(OPTION_LONG_KEYSTORE_PWD)
+ .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD)
+ .description(INFO_DESCRIPTION_KEYSTOREPASSWORD.get())
+ .valuePlaceholder(INFO_KEYSTORE_PWD_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
keyStorePasswordFile =
- new FileBasedArgument("keyStorePasswordFile",
- OPTION_SHORT_KEYSTORE_PWD_FILE,
- OPTION_LONG_KEYSTORE_PWD_FILE,
- false, false,
- INFO_KEYSTORE_PWD_FILE_PLACEHOLDER.get(),
- null, null,
- INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
- keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
- argParser.addArgument(keyStorePasswordFile);
-
- certNickname = new StringArgument(
- "certnickname", 'N', "certNickname",
- false, false, true, INFO_NICKNAME_PLACEHOLDER.get(), null,
- null, INFO_DESCRIPTION_CERT_NICKNAME.get());
- certNickname.setPropertyName("certNickname");
- argParser.addArgument(certNickname);
-
- trustStorePath = new StringArgument(
- "trustStorePath",
- OPTION_SHORT_TRUSTSTOREPATH,
- OPTION_LONG_TRUSTSTOREPATH,
- false, false, true,
- INFO_TRUSTSTOREPATH_PLACEHOLDER.get(),
- null, null,
- INFO_DESCRIPTION_TRUSTSTOREPATH.get());
- trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
- argParser.addArgument(trustStorePath);
-
+ FileBasedArgument.builder(OPTION_LONG_KEYSTORE_PWD_FILE)
+ .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD_FILE)
+ .description(INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get())
+ .valuePlaceholder(INFO_KEYSTORE_PWD_FILE_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ certNickname =
+ StringArgument.builder("certNickname")
+ .shortIdentifier('N')
+ .description(INFO_DESCRIPTION_CERT_NICKNAME.get())
+ .valuePlaceholder(INFO_NICKNAME_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ trustStorePath =
+ StringArgument.builder(OPTION_LONG_TRUSTSTOREPATH)
+ .shortIdentifier(OPTION_SHORT_TRUSTSTOREPATH)
+ .description(INFO_DESCRIPTION_TRUSTSTOREPATH.get())
+ .valuePlaceholder(INFO_TRUSTSTOREPATH_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
trustStorePassword =
- new StringArgument("trustStorePassword", null,
- OPTION_LONG_TRUSTSTORE_PWD,
- false, false, true,
- INFO_TRUSTSTORE_PWD_PLACEHOLDER.get(), null,
- null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
- trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
- argParser.addArgument(trustStorePassword);
-
+ StringArgument.builder(OPTION_LONG_TRUSTSTORE_PWD)
+ .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get())
+ .valuePlaceholder(INFO_TRUSTSTORE_PWD_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
trustStorePasswordFile =
- new FileBasedArgument(
- "trustStorePasswordFile",
- OPTION_SHORT_TRUSTSTORE_PWD_FILE,
- OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
- INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
- trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
- argParser.addArgument(trustStorePasswordFile);
-
+ FileBasedArgument.builder(OPTION_LONG_TRUSTSTORE_PWD_FILE)
+ .shortIdentifier(OPTION_SHORT_TRUSTSTORE_PWD_FILE)
+ .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get())
+ .valuePlaceholder(INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
deleteSubtree =
- new BooleanArgument("deleteSubtree", 'x', "deleteSubtree",
- INFO_DELETE_DESCRIPTION_DELETE_SUBTREE.get());
- deleteSubtree.setPropertyName("deleteSubtree");
- argParser.addArgument(deleteSubtree);
-
+ BooleanArgument.builder("deleteSubtree")
+ .shortIdentifier('x')
+ .description(INFO_DELETE_DESCRIPTION_DELETE_SUBTREE.get())
+ .buildAndAddToParser(argParser);
controlStr =
- new StringArgument("control", 'J', "control", false, true, true,
- INFO_LDAP_CONTROL_PLACEHOLDER.get(),
- null, null, INFO_DESCRIPTION_CONTROLS.get());
- controlStr.setPropertyName("control");
- argParser.addArgument(controlStr);
-
- version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
- OPTION_LONG_PROTOCOL_VERSION, false, false,
- true,
- INFO_PROTOCOL_VERSION_PLACEHOLDER.get(), 3,
- null, INFO_DESCRIPTION_VERSION.get());
- version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
- argParser.addArgument(version);
-
- int defaultTimeout = CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT;
- connectTimeout = new IntegerArgument(OPTION_LONG_CONNECT_TIMEOUT,
- null, OPTION_LONG_CONNECT_TIMEOUT,
- false, false, true, INFO_TIMEOUT_PLACEHOLDER.get(),
- defaultTimeout, null,
- true, 0, false, Integer.MAX_VALUE,
- INFO_DESCRIPTION_CONNECTION_TIMEOUT.get());
- connectTimeout.setPropertyName(OPTION_LONG_CONNECT_TIMEOUT);
- argParser.addArgument(connectTimeout);
-
- encodingStr = new StringArgument("encoding", 'i',
- OPTION_LONG_ENCODING, false,
- false, true,
- INFO_ENCODING_PLACEHOLDER.get(), null,
- null,
- INFO_DESCRIPTION_ENCODING.get());
- encodingStr.setPropertyName(OPTION_LONG_ENCODING);
- argParser.addArgument(encodingStr);
-
+ StringArgument.builder("control")
+ .shortIdentifier('J')
+ .description(INFO_DESCRIPTION_CONTROLS.get())
+ .multiValued()
+ .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ version =
+ IntegerArgument.builder(OPTION_LONG_PROTOCOL_VERSION)
+ .shortIdentifier(OPTION_SHORT_PROTOCOL_VERSION)
+ .description(INFO_DESCRIPTION_VERSION.get())
+ .defaultValue(3)
+ .valuePlaceholder(INFO_PROTOCOL_VERSION_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ connectTimeout =
+ IntegerArgument.builder(OPTION_LONG_CONNECT_TIMEOUT)
+ .description(INFO_DESCRIPTION_CONNECTION_TIMEOUT.get())
+ .lowerBound(0)
+ .defaultValue(CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT)
+ .valuePlaceholder(INFO_TIMEOUT_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
+ encodingStr =
+ StringArgument.builder(OPTION_LONG_ENCODING)
+ .shortIdentifier('i')
+ .description(INFO_DESCRIPTION_ENCODING.get())
+ .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get())
+ .buildAndAddToParser(argParser);
continueOnError =
- new BooleanArgument("continueOnError", 'c', "continueOnError",
- INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
- continueOnError.setPropertyName("continueOnError");
- argParser.addArgument(continueOnError);
-
- noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
- OPTION_LONG_DRYRUN, INFO_DESCRIPTION_NOOP.get());
- noop.setPropertyName(OPTION_LONG_DRYRUN);
- argParser.addArgument(noop);
+ BooleanArgument.builder("continueOnError")
+ .shortIdentifier('c')
+ .description(INFO_DESCRIPTION_CONTINUE_ON_ERROR.get())
+ .buildAndAddToParser(argParser);
+ noop =
+ BooleanArgument.builder(OPTION_LONG_DRYRUN)
+ .shortIdentifier(OPTION_SHORT_DRYRUN)
+ .description(INFO_DESCRIPTION_NOOP.get())
+ .buildAndAddToParser(argParser);
verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
--
Gitblit v1.10.0