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/WaitForFileDelete.java |   66 ++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
index 50d0d59..8e64b31 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
@@ -180,42 +180,40 @@
     try
     {
       targetFilePath =
-           new StringArgument("targetfile", 'f', "targetFile", true, false,
-                              true, INFO_PATH_PLACEHOLDER.get(), null, null,
-                              INFO_WAIT4DEL_DESCRIPTION_TARGET_FILE.get());
-      argParser.addArgument(targetFilePath);
+              StringArgument.builder("targetFile")
+                      .shortIdentifier('f')
+                      .description(INFO_WAIT4DEL_DESCRIPTION_TARGET_FILE.get())
+                      .required()
+                      .valuePlaceholder(INFO_PATH_PLACEHOLDER.get())
+                      .buildAndAddToParser(argParser);
+      logFilePath =
+              StringArgument.builder("logFile")
+                      .shortIdentifier('l')
+                      .description(INFO_WAIT4DEL_DESCRIPTION_LOG_FILE.get())
+                      .valuePlaceholder(INFO_PATH_PLACEHOLDER.get())
+                      .buildAndAddToParser(argParser);
+      outputFilePath =
+              StringArgument.builder("outputFile")
+                      .shortIdentifier('o')
+                      .description(INFO_WAIT4DEL_DESCRIPTION_OUTPUT_FILE.get())
+                      .valuePlaceholder(INFO_PATH_PLACEHOLDER.get())
+                      .buildAndAddToParser(argParser);
+      timeout =
+              IntegerArgument.builder("timeout")
+                      .shortIdentifier('t')
+                      .description(INFO_WAIT4DEL_DESCRIPTION_TIMEOUT.get())
+                      .required()
+                      .lowerBound(0)
+                      .defaultValue(DirectoryServer.DEFAULT_TIMEOUT)
+                      .valuePlaceholder(INFO_SECONDS_PLACEHOLDER.get())
+                      .buildAndAddToParser(argParser);
 
 
-      logFilePath = new StringArgument(
-              "logfile", 'l', "logFile", false, false,
-              true, INFO_PATH_PLACEHOLDER.get(), null, null,
-              INFO_WAIT4DEL_DESCRIPTION_LOG_FILE.get());
-      argParser.addArgument(logFilePath);
-
-
-      outputFilePath = new StringArgument(
-              "outputfile", 'o', "outputFile",
-              false, false,
-              true, INFO_PATH_PLACEHOLDER.get(), null, null,
-              INFO_WAIT4DEL_DESCRIPTION_OUTPUT_FILE.get());
-      argParser.addArgument(outputFilePath);
-
-
-      timeout = new IntegerArgument("timeout", 't', "timeout", true, false,
-                                    true, INFO_SECONDS_PLACEHOLDER.get(),
-                                    DirectoryServer.DEFAULT_TIMEOUT,
-                                    null, true, 0, false,
-                                    0, INFO_WAIT4DEL_DESCRIPTION_TIMEOUT.get());
-      argParser.addArgument(timeout);
-
-
-      // Not used in this class, but required by the start-ds script
-      // (see issue #3814)
-      useLastKnownGoodConfig =
-           new BooleanArgument("lastknowngoodconfig", 'L',
-                               "useLastKnownGoodConfig",
-                               INFO_DSCORE_DESCRIPTION_LASTKNOWNGOODCFG.get());
-      argParser.addArgument(useLastKnownGoodConfig);
+      // Not used in this class, but required by the start-ds script (see issue #3814)
+      BooleanArgument.builder("useLastKnownGoodConfig")
+              .shortIdentifier('L')
+              .description(INFO_DSCORE_DESCRIPTION_LASTKNOWNGOODCFG.get())
+              .buildAndAddToParser(argParser);
 
       // Not used in this class, but required by the start-ds script (see issue #3814)
       quietMode = CommonArguments.getQuiet();

--
Gitblit v1.10.0