From 05aed002704417713d01c11d40b637dad22fad4d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 20 Sep 2013 20:44:18 +0000
Subject: [PATCH] Minor API cleanup: load-balancer algorithm constructors usage of generics was too restrictive.
---
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java | 21 +++++++++++++--------
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java | 12 ++++++------
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
index cd99442..f7850b2 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
@@ -297,7 +297,7 @@
private ScheduledFuture<?> monitoringFuture;
private AtomicBoolean isClosed = new AtomicBoolean();
- AbstractLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ AbstractLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener, final long interval, final TimeUnit unit,
final ScheduledExecutorService scheduler) {
Validator.ensureNotNull(factories, unit);
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
index 9e9f6a1..6a8da1e 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
@@ -69,7 +69,7 @@
* @param factories
* The ordered collection of connection factories.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories) {
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories) {
this(factories, null, 1, TimeUnit.SECONDS, null);
}
@@ -84,7 +84,7 @@
* connection factory changes state from online to offline or
* vice-versa.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener) {
this(factories, listener, 1, TimeUnit.SECONDS, null);
}
@@ -106,7 +106,7 @@
* The time unit for the interval between attempts to poll
* offline factories.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener, final long interval, final TimeUnit unit) {
this(factories, listener, interval, unit, null);
}
@@ -130,7 +130,7 @@
* The scheduler which should for periodically monitoring dead
* connection factories to see if they are usable again.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener, final long interval, final TimeUnit unit,
final ScheduledExecutorService scheduler) {
super(factories, listener, interval, unit, scheduler);
@@ -149,7 +149,7 @@
* The time unit for the interval between attempts to poll
* offline factories.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final long interval, final TimeUnit unit) {
this(factories, null, interval, unit, null);
}
@@ -169,7 +169,7 @@
* The scheduler which should for periodically monitoring dead
* connection factories to see if they are usable again.
*/
- public FailoverLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public FailoverLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories,
final long interval, final TimeUnit unit, final ScheduledExecutorService scheduler) {
this(factories, null, interval, unit, scheduler);
}
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
index 236f070..2ec126e 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
@@ -65,7 +65,7 @@
* @param factories
* The ordered collection of connection factories.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories) {
+ public RoundRobinLoadBalancingAlgorithm(final Collection<? extends ConnectionFactory> factories) {
this(factories, null, 1, TimeUnit.SECONDS, null);
}
@@ -80,7 +80,8 @@
* connection factory changes state from online to offline or
* vice-versa.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public RoundRobinLoadBalancingAlgorithm(
+ final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener) {
this(factories, listener, 1, TimeUnit.SECONDS, null);
}
@@ -102,7 +103,8 @@
* The time unit for the interval between attempts to poll
* offline factories.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public RoundRobinLoadBalancingAlgorithm(
+ final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener, final long interval, final TimeUnit unit) {
this(factories, null, interval, unit, null);
}
@@ -126,7 +128,8 @@
* The scheduler which should for periodically monitoring dead
* connection factories to see if they are usable again.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
+ public RoundRobinLoadBalancingAlgorithm(
+ final Collection<? extends ConnectionFactory> factories,
final LoadBalancerEventListener listener, final long interval, final TimeUnit unit,
final ScheduledExecutorService scheduler) {
super(factories, listener, interval, unit, scheduler);
@@ -146,8 +149,9 @@
* The time unit for the interval between attempts to poll
* offline factories.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
- final long interval, final TimeUnit unit) {
+ public RoundRobinLoadBalancingAlgorithm(
+ final Collection<? extends ConnectionFactory> factories, final long interval,
+ final TimeUnit unit) {
this(factories, null, interval, unit, null);
}
@@ -166,8 +170,9 @@
* The scheduler which should for periodically monitoring dead
* connection factories to see if they are usable again.
*/
- public RoundRobinLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
- final long interval, final TimeUnit unit, final ScheduledExecutorService scheduler) {
+ public RoundRobinLoadBalancingAlgorithm(
+ final Collection<? extends ConnectionFactory> factories, final long interval,
+ final TimeUnit unit, final ScheduledExecutorService scheduler) {
this(factories, null, interval, unit, scheduler);
}
--
Gitblit v1.10.0