From 16bdb19cdda5201d272cd6ca5bf876c88493327c Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 14 Sep 2015 09:32:51 +0000
Subject: [PATCH] OPENDJ-1654 LDAPOptions should be converted in a SchemaOptions style API
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
index 99611dd..33dca1b 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
@@ -30,6 +30,7 @@
import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.CliConstants.DEFAULT_LDAP_PORT;
import static com.forgerock.opendj.cli.Utils.getHostNameForLdapUrl;
+import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*;
import java.io.File;
import java.io.FileInputStream;
@@ -52,7 +53,6 @@
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.KeyManagers;
import org.forgerock.opendj.ldap.LDAPConnectionFactory;
-import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.SSLContextBuilder;
import org.forgerock.opendj.ldap.TrustManagers;
import org.forgerock.opendj.ldap.controls.AuthorizationIdentityRequestControl;
@@ -64,6 +64,7 @@
import org.forgerock.opendj.ldap.requests.GSSAPISASLBindRequest;
import org.forgerock.opendj.ldap.requests.PlainSASLBindRequest;
import org.forgerock.opendj.ldap.requests.Requests;
+import org.forgerock.util.Options;
/**
* A connection factory designed for use with command line tools.
@@ -413,12 +414,14 @@
e);
}
- LDAPOptions options = new LDAPOptions();
+ Options options = Options.defaultOptions();
if (sslContext != null) {
- options.setSSLContext(sslContext).setUseStartTLS(useStartTLSArg.isPresent());
+ options.set(SSL_CONTEXT, sslContext)
+ .set(USE_STARTTLS, useStartTLSArg.isPresent());
}
- options.setConnectTimeout(getConnectTimeout(), TimeUnit.MILLISECONDS);
+ options.set(CONNECT_TIMEOUT_IN_MILLISECONDS,
+ TimeUnit.MILLISECONDS.toMillis(getConnectTimeout()));
connFactory = new LDAPConnectionFactory(hostNameArg.getValue(), port, options);
}
return connFactory;
--
Gitblit v1.10.0