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/util/cli/LDAPConnectionConsoleInteraction.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index ff9f3fe..ad059be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.util.cli;
@@ -630,9 +630,9 @@
// Get the LDAP bind credentials.
state.bindDN = secureArgsList.bindDnArg.getValue();
- state.adminUID= secureArgsList.adminUidArg.getValue();
+ state.adminUID= secureArgsList.adminUidHiddenArg.getValue();
final boolean useAdmin = secureArgsList.useAdminUID();
- if (useAdmin && secureArgsList.adminUidArg.isPresent())
+ if (useAdmin && secureArgsList.adminUidHiddenArg.isPresent())
{
state.providedAdminUID = state.adminUID;
}
@@ -737,9 +737,9 @@
}
if (addAdmin)
{
- copySecureArgsList.adminUidArg.clearValues();
- copySecureArgsList.adminUidArg.addValue(getAdministratorUID());
- commandBuilder.addArgument(copySecureArgsList.adminUidArg);
+ copySecureArgsList.adminUidHiddenArg.clearValues();
+ copySecureArgsList.adminUidHiddenArg.addValue(getAdministratorUID());
+ commandBuilder.addArgument(copySecureArgsList.adminUidHiddenArg);
}
else if (addBindDN)
{
@@ -750,9 +750,9 @@
}
else if (useAdmin)
{
- copySecureArgsList.adminUidArg.clearValues();
- copySecureArgsList.adminUidArg.addValue(getAdministratorUID());
- commandBuilder.addArgument(copySecureArgsList.adminUidArg);
+ copySecureArgsList.adminUidHiddenArg.clearValues();
+ copySecureArgsList.adminUidHiddenArg.addValue(getAdministratorUID());
+ commandBuilder.addArgument(copySecureArgsList.adminUidHiddenArg);
}
else
{
@@ -1978,8 +1978,8 @@
secureArgsList.useStartTLSArg.setPresent(state.useStartTLS);
if (adminUid != null)
{
- secureArgsList.adminUidArg.addValue(adminUid);
- secureArgsList.adminUidArg.setPresent(true);
+ secureArgsList.adminUidHiddenArg.addValue(adminUid);
+ secureArgsList.adminUidHiddenArg.setPresent(true);
}
if (bindDn != null)
{
@@ -2025,8 +2025,8 @@
secureArgsList.bindPasswordFileArg.getNameToValueMap().clear();
secureArgsList.bindPasswordFileArg.setPresent(false);
state.bindPassword = null;
- secureArgsList.adminUidArg.clearValues();
- secureArgsList.adminUidArg.setPresent(false);
+ secureArgsList.adminUidHiddenArg.clearValues();
+ secureArgsList.adminUidHiddenArg.setPresent(false);
}
private void initializeTrustManager() throws ArgumentException
--
Gitblit v1.10.0