From 22928337852f0af9e8b716ce5ba73c93dc28949d 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 Remove ignored ldapVersion argument
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java | 5 --
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 7 ---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java | 7 ---
opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java | 16 --------
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 7 ---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 7 ---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java | 11 -----
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPDelete.java | 9 ----
opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java | 3 -
9 files changed, 1 insertions(+), 71 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
index 9675329..3d1731f 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
@@ -207,11 +207,6 @@
*/
public static final String OPTION_LONG_EFFECTIVERIGHTSATTR = "getEffectiveRightsAttribute";
- /** The value for the short option protocol version attributes. */
- public static final char OPTION_SHORT_PROTOCOL_VERSION = 'V';
- /** The value for the long option protocol version attribute. */
- public static final String OPTION_LONG_PROTOCOL_VERSION = "ldapVersion";
-
/** The value for the long option version. */
public static final char OPTION_SHORT_PRODUCT_VERSION = 'V';
/** The value for the long option version. */
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
index 6d328c8..82afc52 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
@@ -1473,8 +1473,7 @@
|| OPTION_LONG_ADMIN_UID.equals(longId)
|| OPTION_LONG_REPORT_AUTHZ_ID.equals(longId)
|| OPTION_LONG_USE_PW_POLICY_CTL.equals(longId)
- || OPTION_LONG_USE_SASL_EXTERNAL.equals(longId)
- || OPTION_LONG_PROTOCOL_VERSION.equals(longId);
+ || OPTION_LONG_USE_SASL_EXTERNAL.equals(longId);
}
return false;
}
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
index 05685b0..a7590e9 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
@@ -160,22 +160,6 @@
}
/**
- * Returns the "ldapVersion" integer argument.
- *
- * @return The "ldapVersion" argument.
- * @throws ArgumentException
- * If there is a problem with any of the parameters used to create this argument.
- */
- public static IntegerArgument ldapVersionArgument() throws ArgumentException {
- return IntegerArgument.builder(OPTION_LONG_PROTOCOL_VERSION)
- .shortIdentifier(OPTION_SHORT_PROTOCOL_VERSION)
- .description(INFO_DESCRIPTION_VERSION.get())
- .defaultValue(3)
- .valuePlaceholder(INFO_PROTOCOL_VERSION_PLACEHOLDER.get())
- .buildArgument();
- }
-
- /**
* Returns the "quiet" boolean argument.
*
* @return The "quiet" argument.
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 d7cdf18..9193ca8 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
@@ -25,7 +25,6 @@
import static com.forgerock.opendj.ldap.tools.Utils.addControlsToRequest;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
import static com.forgerock.opendj.ldap.tools.Utils.readAssertionControl;
-import static com.forgerock.opendj.ldap.tools.Utils.ensureLdapProtocolVersionIsSupported;
import static com.forgerock.opendj.ldap.tools.Utils.getConnection;
import static com.forgerock.opendj.cli.CommonArguments.*;
@@ -48,7 +47,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ConnectionFactoryProvider;
import com.forgerock.opendj.cli.ConsoleApplication;
-import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
/** A tool that can be used to issue Compare requests to the Directory Server. */
@@ -118,7 +116,6 @@
BooleanArgument dryRun;
BooleanArgument showUsage;
- IntegerArgument ldapProtocolVersion;
StringArgument assertionFilter;
StringArgument controlStr;
StringArgument proxyAuthzID;
@@ -154,9 +151,6 @@
controlStr = controlArgument();
argParser.addArgument(controlStr);
- ldapProtocolVersion = ldapVersionArgument();
- argParser.addArgument(ldapProtocolVersion);
-
dryRun = noOpArgument();
argParser.addArgument(dryRun);
@@ -177,7 +171,6 @@
if (argParser.usageOrVersionDisplayed()) {
return ResultCode.SUCCESS.intValue();
}
- ensureLdapProtocolVersionIsSupported(ldapProtocolVersion);
final List<String> trailingArguments = argParser.getTrailingArguments();
final String attribute = trailingArguments.get(0);
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPDelete.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPDelete.java
index dd8169a..34ae3e2 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPDelete.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPDelete.java
@@ -19,7 +19,6 @@
import static com.forgerock.opendj.cli.ArgumentConstants.USE_SYSTEM_STREAM_TOKEN;
import static com.forgerock.opendj.cli.CommonArguments.continueOnErrorArgument;
import static com.forgerock.opendj.cli.CommonArguments.controlArgument;
-import static com.forgerock.opendj.cli.CommonArguments.ldapVersionArgument;
import static com.forgerock.opendj.cli.CommonArguments.noOpArgument;
import static com.forgerock.opendj.ldap.tools.LDAPToolException.newToolException;
import static com.forgerock.opendj.ldap.tools.LDAPToolException.newToolParamException;
@@ -31,7 +30,6 @@
import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
import static com.forgerock.opendj.ldap.tools.Utils.addControlsToRequest;
-import static com.forgerock.opendj.ldap.tools.Utils.ensureLdapProtocolVersionIsSupported;
import static com.forgerock.opendj.ldap.tools.Utils.getConnection;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
import static com.forgerock.opendj.ldap.tools.Utils.printSuccessMessage;
@@ -42,7 +40,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ConnectionFactoryProvider;
import com.forgerock.opendj.cli.ConsoleApplication;
-import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.Connection;
@@ -131,7 +128,6 @@
final BooleanArgument deleteSubtree;
final BooleanArgument dryRun;
final BooleanArgument showUsage;
- final IntegerArgument ldapProtocolVersion;
final StringArgument controlStr;
final StringArgument propertiesFileArgument;
final BooleanArgument noPropertiesFileArgument;
@@ -159,9 +155,6 @@
controlStr = controlArgument();
argParser.addArgument(controlStr);
- ldapProtocolVersion = ldapVersionArgument();
- argParser.addArgument(ldapProtocolVersion);
-
dryRun = noOpArgument();
argParser.addArgument(dryRun);
@@ -175,12 +168,10 @@
throw newToolParamException(ae, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
}
-
argParser.parseArguments(args, getErrStream(), connectionFactoryProvider);
if (argParser.usageOrVersionDisplayed()) {
return ResultCode.SUCCESS.intValue();
}
- ensureLdapProtocolVersionIsSupported(ldapProtocolVersion);
final List<Control> controls = readControls(controlStr);
if (deleteSubtree.isPresent()) {
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index b963f70..9f5f8b9 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -26,7 +26,6 @@
import static com.forgerock.opendj.ldap.tools.Utils.printSuccessMessage;
import static com.forgerock.opendj.ldap.tools.Utils.readAssertionControl;
import static com.forgerock.opendj.ldap.tools.Utils.readControls;
-import static com.forgerock.opendj.ldap.tools.Utils.ensureLdapProtocolVersionIsSupported;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
import static com.forgerock.opendj.cli.CommonArguments.*;
@@ -68,7 +67,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ConnectionFactoryProvider;
import com.forgerock.opendj.cli.ConsoleApplication;
-import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
/**
@@ -271,7 +269,6 @@
BooleanArgument continueOnError;
BooleanArgument noop;
BooleanArgument showUsage;
- IntegerArgument ldapProtocolVersion;
StringArgument assertionFilter;
StringArgument controlStr;
StringArgument filename;
@@ -325,9 +322,6 @@
controlStr = controlArgument();
argParser.addArgument(controlStr);
- ldapProtocolVersion = ldapVersionArgument();
- argParser.addArgument(ldapProtocolVersion);
-
continueOnError = continueOnErrorArgument();
argParser.addArgument(continueOnError);
@@ -349,7 +343,6 @@
if (argParser.usageOrVersionDisplayed()) {
return ResultCode.SUCCESS.intValue();
}
- ensureLdapProtocolVersionIsSupported(ldapProtocolVersion);
controls = readControls(controlStr);
if (proxyAuthzID.isPresent()) {
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index 4d8c329..9b0549c 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -24,7 +24,6 @@
import static com.forgerock.opendj.cli.Utils.filterExitCode;
import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.ldap.tools.Utils.addControlsToRequest;
-import static com.forgerock.opendj.ldap.tools.Utils.ensureLdapProtocolVersionIsSupported;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
import static com.forgerock.opendj.ldap.tools.Utils.readControls;
@@ -44,7 +43,6 @@
import com.forgerock.opendj.cli.ConnectionFactoryProvider;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.FileBasedArgument;
-import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
/**
@@ -126,7 +124,6 @@
FileBasedArgument currentPWFile;
FileBasedArgument newPWFile;
BooleanArgument showUsage;
- IntegerArgument ldapProtocolVersion;
StringArgument currentPW;
StringArgument controlStr;
StringArgument newPW;
@@ -178,9 +175,6 @@
controlStr = controlArgument();
argParser.addArgument(controlStr);
- ldapProtocolVersion = ldapVersionArgument();
- argParser.addArgument(ldapProtocolVersion);
-
verbose = verboseArgument();
argParser.addArgument(verbose);
@@ -196,7 +190,6 @@
if (argParser.usageOrVersionDisplayed()) {
return ResultCode.SUCCESS.intValue();
}
- ensureLdapProtocolVersionIsSupported(ldapProtocolVersion);
final PasswordModifyExtendedRequest request = Requests.newPasswordModifyExtendedRequest();
addControlsToRequest(request, readControls(controlStr));
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index 9404f88..3ef2b7c 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -74,7 +74,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.Utils.addControlsToRequest;
-import static com.forgerock.opendj.ldap.tools.Utils.ensureLdapProtocolVersionIsSupported;
import static com.forgerock.opendj.ldap.tools.Utils.computeWrapColumn;
import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults;
@@ -242,7 +241,6 @@
BooleanArgument typesOnly;
IntegerArgument simplePageSize;
IntegerArgument timeLimit;
- IntegerArgument ldapProtocolVersion;
StringArgument baseDN;
StringArgument controlStr;
MultiChoiceArgument<DereferenceAliasesPolicy> dereferencePolicy;
@@ -340,10 +338,6 @@
.multiValued()
.valuePlaceholder(INFO_ATTRIBUTE_PLACEHOLDER.get())
.buildAndAddToParser(argParser);
-
- ldapProtocolVersion = ldapVersionArgument();
- argParser.addArgument(ldapProtocolVersion);
-
dereferencePolicy =
MultiChoiceArgument.<DereferenceAliasesPolicy>builder("dereferencePolicy")
.shortIdentifier('a')
@@ -419,7 +413,6 @@
scope,
filter,
attributes.toArray(new String[attributes.size()]));
- ensureLdapProtocolVersionIsSupported(ldapProtocolVersion);
} catch (final LocalizedIllegalArgumentException e) {
errPrintln(e.getMessageObject());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
index aa4cf0c..207a99e 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
@@ -297,17 +297,6 @@
return filesLines;
}
- static void ensureLdapProtocolVersionIsSupported(final IntegerArgument version) throws LDAPToolException {
- try {
- final int versionNumber = version.getIntValue();
- if (versionNumber != 2 && versionNumber != 3) {
- throw newToolParamException(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
- }
- } catch (final ArgumentException e) {
- throw newToolParamException(e, ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
- }
- }
-
static void addControlsToRequest(final Request request, final List<Control> controls) throws LDAPToolException {
for (final Control control : controls) {
request.addControl(control);
--
Gitblit v1.10.0