From 2ca2955041a76c5d3f3bf5bd74c3bbcc4010fda1 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2772 Code cleanup
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index 9193ca8..f0e0b94 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -20,7 +20,6 @@
import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler;
import static com.forgerock.opendj.ldap.tools.LDAPToolException.newToolParamException;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
-import static com.forgerock.opendj.cli.Utils.filterExitCode;
import static com.forgerock.opendj.cli.Utils.readBytesFromFile;
import static com.forgerock.opendj.ldap.tools.Utils.addControlsToRequest;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
@@ -29,6 +28,8 @@
import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.ldap.tools.Utils.readControls;
+import static com.forgerock.opendj.ldap.tools.Utils.runTool;
+import static com.forgerock.opendj.ldap.tools.Utils.runToolAndExit;
import java.io.PrintStream;
import java.util.List;
@@ -46,11 +47,11 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ConnectionFactoryProvider;
-import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.StringArgument;
+import org.forgerock.util.annotations.VisibleForTesting;
/** A tool that can be used to issue Compare requests to the Directory Server. */
-public final class LDAPCompare extends ConsoleApplication {
+public final class LDAPCompare extends ToolConsoleApplication {
/**
* The main method for ldapcompare tool.
@@ -59,36 +60,29 @@
* The command-line arguments provided to this program.
*/
public static void main(final String[] args) {
- System.exit(filterExitCode(run(System.out, System.err, args)));
+ runToolAndExit(new LDAPCompare(System.out, System.err), args);
}
/**
- * Run {@link LDAPCompare} tool with the provided arguments.
- * Output and errors will be written on the provided streams.
- * This method can be used to run the tool programmatically.
+ * This method should be used to run this ldap tool programmatically.
+ * Output and errors will be printed on provided {@link PrintStream}.
*
* @param out
- * {@link PrintStream} which will be used by the tool to write results and information messages.
+ * The {@link PrintStream} to use to write tool output.
* @param err
- * {@link PrintStream} which will be used by the tool to write errors.
+ * The {@link PrintStream} to use to write tool errors.
* @param args
- * Arguments set to pass to the tool.
- * @return
- * An integer which represents the result code of the tool.
+ * The arguments to use with this tool.
+ * @return The code returned by the tool
*/
public static int run(final PrintStream out, final PrintStream err, final String... args) {
- final LDAPCompare ldapCompare = new LDAPCompare(out, err);
- try {
- return ldapCompare.run(args);
- } catch (final LDAPToolException e) {
- e.printErrorMessage(ldapCompare);
- return e.getResultCode();
- }
+ return runTool(new LDAPCompare(out, err), args);
}
private BooleanArgument verbose;
- private LDAPCompare(final PrintStream out, final PrintStream err) {
+ @VisibleForTesting
+ LDAPCompare(final PrintStream out, final PrintStream err) {
super(out, err);
}
@@ -102,7 +96,8 @@
return verbose.isPresent();
}
- private int run(final String[] args) throws LDAPToolException {
+ @Override
+ int run(final String... args) throws LDAPToolException {
// Create the command-line argument parser for use with this program.
final LocalizableMessage toolDescription = INFO_LDAPCOMPARE_TOOL_DESCRIPTION.get();
final LDAPToolArgumentParser argParser = LDAPToolArgumentParser.builder(LDAPCompare.class.getName())
--
Gitblit v1.10.0