From 77e0cf98df62ea367b263021fd67c58ed48a753c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 May 2016 13:41:27 +0000
Subject: [PATCH] Remove use of deprecated Duration methods
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java | 28 ++++++++++++++++------------
opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java | 4 ++--
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 5 +++--
opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java | 9 ++++-----
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java | 4 ++--
5 files changed, 27 insertions(+), 23 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 7a3c7c4..0d05cf9 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
@@ -25,6 +25,8 @@
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.CONNECT_TIMEOUT;
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.SSL_CONTEXT;
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.SSL_USE_STARTTLS;
+import static org.forgerock.util.time.Duration.*;
+
import static com.forgerock.opendj.cli.CommonArguments.*;
import java.io.File;
@@ -60,11 +62,8 @@
import org.forgerock.opendj.ldap.requests.PlainSASLBindRequest;
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.util.Options;
-import org.forgerock.util.time.Duration;
-/**
- * A connection factory designed for use with command line tools.
- */
+/** A connection factory designed for use with command line tools. */
public final class ConnectionFactoryProvider {
/** The Logger. */
static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -431,7 +430,7 @@
options.set(SSL_CONTEXT, sslContext)
.set(SSL_USE_STARTTLS, useStartTLSArg.isPresent());
}
- options.set(CONNECT_TIMEOUT, new Duration((long) getConnectTimeout(), TimeUnit.MILLISECONDS));
+ options.set(CONNECT_TIMEOUT, duration(getConnectTimeout(), TimeUnit.MILLISECONDS));
if (usePreAuthentication) {
options.set(AUTHN_BIND_REQUEST, getBindRequest());
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
index 320ed4a..599069e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
@@ -12,9 +12,8 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.ldap;
import static com.forgerock.opendj.ldap.CoreMessages.HBCF_CONNECTION_CLOSED_BY_CLIENT;
@@ -22,7 +21,8 @@
import static com.forgerock.opendj.ldap.CoreMessages.HBCF_HEARTBEAT_TIMEOUT;
import static com.forgerock.opendj.ldap.CoreMessages.LDAP_CONNECTION_CONNECT_TIMEOUT;
import static com.forgerock.opendj.util.StaticUtils.DEFAULT_SCHEDULER;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.*;
+
import static org.forgerock.opendj.ldap.LdapException.newLdapException;
import static org.forgerock.opendj.ldap.requests.Requests.newSearchRequest;
import static org.forgerock.opendj.ldap.requests.Requests.newStartTLSExtendedRequest;
@@ -34,6 +34,7 @@
import static org.forgerock.opendj.ldap.spi.LdapPromises.newFailedLdapPromise;
import static org.forgerock.util.Utils.closeSilently;
import static org.forgerock.util.promise.Promises.newResultPromise;
+import static org.forgerock.util.time.Duration.*;
import java.util.Collections;
import java.util.LinkedList;
@@ -120,6 +121,10 @@
* pending bind or startTLS requests.
*/
public final class LDAPConnectionFactory extends CommonLDAPOptions implements ConnectionFactory {
+ private static final String CONNECT_TIMEOUT_PROPERTY = "org.forgerock.opendj.io.connectTimeout";
+ private static final String REQUEST_TIMEOUT_PROPERTY = "org.forgerock.opendj.io.requestTimeout";
+ private static final String TIMEOUT_PROPERTY = "org.forgerock.opendj.io.timeout";
+
/**
* Configures the connection factory to return pre-authenticated connections using the specified {@link
* BindRequest}. The connections returned by the connection factory will support all operations with the exception
@@ -140,8 +145,7 @@
* used.
*/
public static final Option<Duration> CONNECT_TIMEOUT =
- Option.withDefault(new Duration((long) getIntProperty("org.forgerock.opendj.io.connectTimeout", 10000),
- TimeUnit.MILLISECONDS));
+ Option.withDefault(duration(getIntProperty(CONNECT_TIMEOUT_PROPERTY, 10000), MILLISECONDS));
/**
* Configures the connection factory to periodically send "heart-beat" or "keep-alive" requests to the Directory
@@ -176,7 +180,7 @@
*
* @see #HEARTBEAT_ENABLED
*/
- public static final Option<Duration> HEARTBEAT_INTERVAL = Option.withDefault(new Duration(10L, SECONDS));
+ public static final Option<Duration> HEARTBEAT_INTERVAL = Option.withDefault(duration(10, SECONDS));
/**
* Specifies the scheduler which will be used for periodically sending heart-beat requests. A system-wide scheduler
@@ -195,7 +199,7 @@
*
* @see #HEARTBEAT_ENABLED
*/
- public static final Option<Duration> HEARTBEAT_TIMEOUT = Option.withDefault(new Duration(3L, SECONDS));
+ public static final Option<Duration> HEARTBEAT_TIMEOUT = Option.withDefault(duration(3, SECONDS));
/**
* Specifies the operation timeout. If a response is not received from the Directory Server within the timeout
@@ -207,9 +211,9 @@
* property.
*/
public static final Option<Duration> REQUEST_TIMEOUT =
- Option.withDefault(new Duration((long) getIntProperty("org.forgerock.opendj.io.requestTimeout",
- getIntProperty("org.forgerock.opendj.io.timeout", 0)),
- TimeUnit.MILLISECONDS));
+ Option.withDefault(duration(getIntProperty(REQUEST_TIMEOUT_PROPERTY,
+ getIntProperty(TIMEOUT_PROPERTY, 0)),
+ MILLISECONDS));
/**
* Specifies the SSL context which will be used when initiating connections with the Directory Server.
@@ -336,7 +340,7 @@
heartBeatSent |= connection.sendHeartBeat();
}
if (heartBeatSent) {
- scheduler.get().schedule(checkHeartBeatRunnable, heartBeatTimeoutMS, TimeUnit.MILLISECONDS);
+ scheduler.get().schedule(checkHeartBeatRunnable, heartBeatTimeoutMS, MILLISECONDS);
}
}
};
@@ -453,7 +457,7 @@
releaseScheduler();
}
}
- }, connectTimeoutMS, TimeUnit.MILLISECONDS);
+ }, connectTimeoutMS, MILLISECONDS);
} else {
timeoutFuture = null;
}
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index 8782d36..7163989 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -26,6 +26,7 @@
import static org.forgerock.opendj.ldap.schema.CoreSchema.getEntryUUIDAttributeType;
import static org.forgerock.opendj.rest2ldap.ReadOnUpdatePolicy.CONTROLS;
import static org.forgerock.opendj.rest2ldap.Utils.ensureNotNull;
+import static org.forgerock.util.time.Duration.*;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -980,10 +981,10 @@
private static ConnectionFactory configureConnectionFactory(final JsonValue configuration,
final ClassLoader providerClassLoader) {
final long heartBeatIntervalSeconds = configuration.get("heartBeatIntervalSeconds").defaultTo(30L).asLong();
- final Duration heartBeatInterval = new Duration(Math.max(heartBeatIntervalSeconds, 1L), TimeUnit.SECONDS);
+ final Duration heartBeatInterval = duration(Math.max(heartBeatIntervalSeconds, 1L), TimeUnit.SECONDS);
final long heartBeatTimeoutMillis = configuration.get("heartBeatTimeoutMilliSeconds").defaultTo(500L).asLong();
- final Duration heartBeatTimeout = new Duration(Math.max(heartBeatTimeoutMillis, 100L), TimeUnit.MILLISECONDS);
+ final Duration heartBeatTimeout = duration(Math.max(heartBeatTimeoutMillis, 100L), TimeUnit.MILLISECONDS);
final Options options = Options.defaultOptions()
.set(TRANSPORT_PROVIDER_CLASS_LOADER, providerClassLoader)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
index 379968d..fbae3e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
@@ -17,6 +17,7 @@
import static org.forgerock.opendj.config.client.ldap.LDAPManagementContext.*;
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*;
+import static org.forgerock.util.time.Duration.*;
import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.admin.ads.util.PreferredConnection.Type.*;
import static org.opends.messages.AdminToolMessages.*;
@@ -43,7 +44,6 @@
import org.forgerock.opendj.ldap.requests.SimpleBindRequest;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.forgerock.util.Options;
-import org.forgerock.util.time.Duration;
import org.opends.admin.ads.util.PreferredConnection.Type;
import org.opends.server.types.HostPort;
import org.opends.server.util.StaticUtils;
@@ -169,7 +169,7 @@
final boolean isLdaps = LDAPS.equals(connectionType);
Options options = Options.defaultOptions();
- options.set(CONNECT_TIMEOUT, new Duration(connectTimeout, TimeUnit.MILLISECONDS));
+ options.set(CONNECT_TIMEOUT, duration(connectTimeout, TimeUnit.MILLISECONDS));
if (isLdaps || isStartTls)
{
options.set(SSL_CONTEXT, getSSLContext(trustManager, keyManager))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
index 2dc0f76..b7d58e6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
@@ -21,6 +21,7 @@
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*;
import static org.forgerock.util.Utils.*;
+import static org.forgerock.util.time.Duration.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.INFO_ERROR_READING_SERVER_CONFIGURATION;
import static org.opends.messages.QuickSetupMessages.INFO_NOT_AVAILABLE_LABEL;
@@ -61,7 +62,6 @@
import org.forgerock.opendj.ldap.SSLContextBuilder;
import org.forgerock.opendj.ldap.TrustManagers;
import org.forgerock.util.Options;
-import org.forgerock.util.time.Duration;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
@@ -1137,7 +1137,7 @@
// This connection should always be secure. useSSL = true.
Connection connection = null;
final Options options = Options.defaultOptions();
- options.set(CONNECT_TIMEOUT, new Duration((long) ci.getConnectTimeout(), TimeUnit.MILLISECONDS));
+ options.set(CONNECT_TIMEOUT, duration(ci.getConnectTimeout(), TimeUnit.MILLISECONDS));
LDAPConnectionFactory factory = null;
while (true)
{
--
Gitblit v1.10.0