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/admin/client/cli/SecureConnectionCliArgs.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 41abbdb..3b91ce1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -19,7 +19,6 @@
import static com.forgerock.opendj.cli.ReturnCode.*;
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.messages.AdminToolMessages.*;
@@ -298,22 +297,17 @@
*/
public int validateGlobalOptions(LocalizableMessageBuilder buf)
{
- List<LocalizableMessage> errors = new ArrayList<>();
-
- addIfArgsAreConflicting(errors, bindPasswordArg, bindPasswordFileArg);
-
- // Couldn't have at the same time trustAll and trustStore related args
- addIfArgsAreConflicting(errors, trustAllArg, trustStorePathArg);
- addIfArgsAreConflicting(errors, trustAllArg, trustStorePasswordArg);
- addIfArgsAreConflicting(errors, trustAllArg, trustStorePasswordFileArg);
-
- addIfArgsAreConflicting(errors, trustStorePasswordArg, trustStorePasswordFileArg);
+ final List<LocalizableMessage> errors = new ArrayList<>();
+ addErrorMessageIfArgumentsConflict(errors, bindPasswordArg, bindPasswordFileArg);
+ addErrorMessageIfArgumentsConflict(errors, trustAllArg, trustStorePathArg);
+ addErrorMessageIfArgumentsConflict(errors, trustAllArg, trustStorePasswordArg);
+ addErrorMessageIfArgumentsConflict(errors, trustAllArg, trustStorePasswordFileArg);
+ addErrorMessageIfArgumentsConflict(errors, trustStorePasswordArg, trustStorePasswordFileArg);
+ addErrorMessageIfArgumentsConflict(errors, useStartTLSArg, useSSLArg);
checkIfPathArgumentIsReadable(errors, trustStorePathArg, ERR_CANNOT_READ_TRUSTSTORE);
checkIfPathArgumentIsReadable(errors, keyStorePathArg, ERR_CANNOT_READ_KEYSTORE);
- addIfArgsAreConflicting(errors, useStartTLSArg, useSSLArg);
-
if (!errors.isEmpty())
{
for (LocalizableMessage error : errors)
@@ -330,14 +324,6 @@
return SUCCESS.get();
}
- private void addIfArgsAreConflicting(List<LocalizableMessage> errors, Argument arg1, Argument arg2)
- {
- if (arg1.isPresent() && arg2.isPresent())
- {
- errors.add(ERR_TOOL_CONFLICTING_ARGS.get(arg1.getLongIdentifier(), arg2.getLongIdentifier()));
- }
- }
-
private void checkIfPathArgumentIsReadable(List<LocalizableMessage> errors, StringArgument pathArg, Arg1<Object> msg)
{
if (pathArg.isPresent() && !canRead(pathArg.getValue()))
--
Gitblit v1.10.0