From 88496c3a54b4c6e969cb0dce5cf67e5da6846740 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 13:59:39 +0000
Subject: [PATCH] OPENDJ-2772 Code cleanup
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
index b0f839b..3643917 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
@@ -196,9 +196,10 @@
private int run(final String[] args) {
// Create the command-line argument parser for use with this program.
final LocalizableMessage toolDescription = INFO_SEARCHRATE_TOOL_DESCRIPTION.get();
- final ArgumentParser argParser =
- new ArgumentParser(SearchRate.class.getName(), toolDescription, false, true, 1, 0,
- "[filter format string] [attributes ...]");
+ final ArgumentParser argParser = LDAPToolArgumentParser.builder(SearchRate.class.getName())
+ .toolDescription(toolDescription)
+ .trailingArgumentsUnbounded(1, "[filter format string] [attributes ...]")
+ .build();
argParser.setVersionHandler(newSdkVersionHandler());
argParser.setShortToolDescription(REF_SHORT_DESC_SEARCHRATE.get());
argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RATE_TOOLS.get());
@@ -254,11 +255,8 @@
verbose = verboseArgument();
argParser.addArgument(verbose);
- scriptFriendly =
- BooleanArgument.builder("scriptFriendly")
- .shortIdentifier('S')
- .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get())
- .buildAndAddToParser(argParser);
+ scriptFriendly = scriptFriendlySdkArgument();
+ argParser.addArgument(scriptFriendly);
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
errPrintln(message);
--
Gitblit v1.10.0