From 6ea56ecde3d05b84f42a7338d7c2c159817d00d0 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:44:57 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index babfc52..40dec53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -19,7 +19,6 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
-import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
@@ -1015,30 +1014,16 @@
attributes.addAll(filterAndAttributeStrings);
}
- if(bindPassword.isPresent() && bindPasswordFile.isPresent())
+ try
{
- printWrappedText(err,
- ERR_TOOL_CONFLICTING_ARGS.get(bindPassword.getLongIdentifier(), bindPasswordFile.getLongIdentifier()));
- return CLIENT_SIDE_PARAM_ERROR;
+ throwIfArgumentsConflict(bindPassword, bindPasswordFile);
+ throwIfArgumentsConflict(useSSL, startTLS);
+ throwIfArgumentsConflict(keyStorePassword, keyStorePasswordFile);
+ throwIfArgumentsConflict(trustStorePassword, trustStorePasswordFile);
}
-
- if (useSSL.isPresent() && startTLS.isPresent())
+ catch (final ArgumentException conflict)
{
- printWrappedText(err, ERR_TOOL_CONFLICTING_ARGS.get(useSSL.getLongIdentifier(), startTLS.getLongIdentifier()));
- return CLIENT_SIDE_PARAM_ERROR;
- }
-
- if (keyStorePassword.isPresent() && keyStorePasswordFile.isPresent())
- {
- printWrappedText(err, ERR_TOOL_CONFLICTING_ARGS.get(
- keyStorePassword.getLongIdentifier(), keyStorePasswordFile.getLongIdentifier()));
- return CLIENT_SIDE_PARAM_ERROR;
- }
-
- if (trustStorePassword.isPresent() && trustStorePasswordFile.isPresent())
- {
- printWrappedText(err, ERR_TOOL_CONFLICTING_ARGS.get(
- trustStorePassword.getLongIdentifier(), trustStorePasswordFile.getLongIdentifier()));
+ printWrappedText(err, conflict.getMessageObject());
return CLIENT_SIDE_PARAM_ERROR;
}
--
Gitblit v1.10.0