From 004a3a1b44409544debabe38296b09174c809aa3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 29 May 2013 08:28:29 +0000
Subject: [PATCH] Minor API cleanup in preparation for final release.
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 74 +++++++-------
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java | 99 +------------------
opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java | 24 ++--
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java | 14 +-
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java | 16 +-
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java | 34 +++---
opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java | 26 ++--
7 files changed, 100 insertions(+), 187 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java b/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
index 949f7a0..ac95d2a 100644
--- a/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
+++ b/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
@@ -97,7 +97,7 @@
}
private abstract class AbstractRequestCompletionHandler
- <R extends Result, H extends ResultHandler<? super R>>
+ <R extends Result, H extends ResultHandler<R>>
implements ResultHandler<R> {
final H resultHandler;
final Connection connection;
@@ -123,9 +123,9 @@
private abstract class ConnectionCompletionHandler<R extends Result> implements
ResultHandler<Connection> {
- private final ResultHandler<? super R> resultHandler;
+ private final ResultHandler<R> resultHandler;
- ConnectionCompletionHandler(final ResultHandler<? super R> resultHandler) {
+ ConnectionCompletionHandler(final ResultHandler<R> resultHandler) {
this.resultHandler = resultHandler;
}
@@ -140,9 +140,9 @@
}
private final class RequestCompletionHandler<R extends Result> extends
- AbstractRequestCompletionHandler<R, ResultHandler<? super R>> {
+ AbstractRequestCompletionHandler<R, ResultHandler<R>> {
RequestCompletionHandler(final Connection connection,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
super(connection, resultHandler);
}
}
@@ -182,7 +182,7 @@
@Override
public void handleAdd(final RequestContext requestContext, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -206,7 +206,7 @@
public void handleBind(final RequestContext requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler) {
+ final ResultHandler<BindResult> resultHandler) {
if (request.getAuthenticationType() != BindRequest.AUTHENTICATION_TYPE_SIMPLE) {
// TODO: SASL authentication not implemented.
@@ -259,7 +259,7 @@
public void handleCompare(final RequestContext requestContext,
final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler) {
+ final ResultHandler<CompareResult> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<CompareResult> outerHandler =
new ConnectionCompletionHandler<CompareResult>(resultHandler) {
@@ -284,7 +284,7 @@
@Override
public void handleDelete(final RequestContext requestContext, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -309,7 +309,7 @@
public <R extends ExtendedResult> void handleExtendedRequest(
final RequestContext requestContext, final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
if (request.getOID().equals(CancelExtendedRequest.OID)) {
// TODO: not implemented.
resultHandler.handleErrorResult(newErrorResult(ResultCode.PROTOCOL_ERROR,
@@ -345,7 +345,7 @@
@Override
public void handleModify(final RequestContext requestContext, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -370,7 +370,7 @@
public void handleModifyDN(final RequestContext requestContext,
final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
diff --git a/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java b/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java
index c9e716e..454aa0f 100644
--- a/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java
+++ b/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.examples;
@@ -137,7 +137,7 @@
}
private abstract class AbstractRequestCompletionHandler
- <R extends Result, H extends ResultHandler<? super R>>
+ <R extends Result, H extends ResultHandler<R>>
implements ResultHandler<R> {
final H resultHandler;
final Connection connection;
@@ -163,9 +163,9 @@
private abstract class ConnectionCompletionHandler<R extends Result> implements
ResultHandler<Connection> {
- private final ResultHandler<? super R> resultHandler;
+ private final ResultHandler<R> resultHandler;
- ConnectionCompletionHandler(final ResultHandler<? super R> resultHandler) {
+ ConnectionCompletionHandler(final ResultHandler<R> resultHandler) {
this.resultHandler = resultHandler;
}
@@ -180,9 +180,9 @@
}
private final class RequestCompletionHandler<R extends Result> extends
- AbstractRequestCompletionHandler<R, ResultHandler<? super R>> {
+ AbstractRequestCompletionHandler<R, ResultHandler<R>> {
RequestCompletionHandler(final Connection connection,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
super(connection, resultHandler);
}
}
@@ -257,7 +257,7 @@
@Override
public void handleAdd(final RequestContext requestContext, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -310,7 +310,7 @@
public void handleBind(final RequestContext requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler) {
+ final ResultHandler<BindResult> resultHandler) {
if (request.getAuthenticationType() != ((byte) 0x80)) {
// TODO: SASL authentication not implemented.
@@ -368,7 +368,7 @@
public void handleCompare(final RequestContext requestContext,
final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler) {
+ final ResultHandler<CompareResult> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<CompareResult> outerHandler =
new ConnectionCompletionHandler<CompareResult>(resultHandler) {
@@ -413,7 +413,7 @@
@Override
public void handleDelete(final RequestContext requestContext, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -444,7 +444,7 @@
public <R extends ExtendedResult> void handleExtendedRequest(
final RequestContext requestContext, final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
if (request.getOID().equals(CancelExtendedRequest.OID)) {
// TODO: not implemented.
resultHandler.handleErrorResult(newErrorResult(ResultCode.PROTOCOL_ERROR,
@@ -483,7 +483,7 @@
@Override
public void handleModify(final RequestContext requestContext, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
@@ -543,7 +543,7 @@
public void handleModifyDN(final RequestContext requestContext,
final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
addProxiedAuthControl(request);
final ConnectionCompletionHandler<Result> outerHandler =
new ConnectionCompletionHandler<Result>(resultHandler) {
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
index 23c4dbd..f0ce342 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
@@ -163,7 +163,7 @@
@Override
public void handleAdd(final RequestContext requestContext, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
try {
synchronized (writeLock) {
final DN dn = request.getName();
@@ -187,7 +187,7 @@
public void handleBind(final RequestContext requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler) {
+ final ResultHandler<BindResult> resultHandler) {
try {
final Entry entry;
synchronized (writeLock) {
@@ -227,7 +227,7 @@
@Override
public void handleCompare(final RequestContext requestContext, final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler) {
+ final ResultHandler<CompareResult> resultHandler) {
try {
final Entry entry;
final Attribute assertion;
@@ -248,7 +248,7 @@
@Override
public void handleDelete(final RequestContext requestContext, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
try {
final Entry entry;
synchronized (writeLock) {
@@ -279,7 +279,7 @@
public <R extends ExtendedResult> void handleExtendedRequest(
final RequestContext requestContext, final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
resultHandler.handleErrorResult(newErrorResult(ResultCode.UNWILLING_TO_PERFORM,
"Extended request operation not supported"));
}
@@ -287,7 +287,7 @@
@Override
public void handleModify(final RequestContext requestContext, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
try {
final Entry entry;
final Entry newEntry;
@@ -306,7 +306,7 @@
@Override
public void handleModifyDN(final RequestContext requestContext, final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
+ final ResultHandler<Result> resultHandler) {
resultHandler.handleErrorResult(newErrorResult(ResultCode.UNWILLING_TO_PERFORM,
"ModifyDN request operation not supported"));
}
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
index 8aadf26..c94f0ca 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -77,7 +77,7 @@
*/
void handleAdd(C requestContext, AddRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super Result> resultHandler);
+ ResultHandler<Result> resultHandler);
/**
* Invoked when a bind request is received from a client.
@@ -99,7 +99,7 @@
*/
void handleBind(C requestContext, int version, BindRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super BindResult> resultHandler);
+ ResultHandler<BindResult> resultHandler);
/**
* Invoked when a compare request is received from a client.
@@ -119,7 +119,7 @@
*/
void handleCompare(C requestContext, CompareRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super CompareResult> resultHandler);
+ ResultHandler<CompareResult> resultHandler);
/**
* Invoked when a delete request is received from a client.
@@ -139,7 +139,7 @@
*/
void handleDelete(C requestContext, DeleteRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super Result> resultHandler);
+ ResultHandler<Result> resultHandler);
/**
* Invoked when an extended request is received from a client.
@@ -161,7 +161,7 @@
*/
<R extends ExtendedResult> void handleExtendedRequest(C requestContext,
ExtendedRequest<R> request, IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super R> resultHandler);
+ ResultHandler<R> resultHandler);
/**
* Invoked when a modify request is received from a client.
@@ -181,7 +181,7 @@
*/
void handleModify(C requestContext, ModifyRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super Result> resultHandler);
+ ResultHandler<Result> resultHandler);
/**
* Invoked when a modify DN request is received from a client.
@@ -201,7 +201,7 @@
*/
void handleModifyDN(C requestContext, ModifyDNRequest request,
IntermediateResponseHandler intermediateResponseHandler,
- ResultHandler<? super Result> resultHandler);
+ ResultHandler<Result> resultHandler);
/**
* Invoked when a search request is received from a client.
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
index 191d943..2a4c610 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
@@ -75,7 +75,7 @@
/**
* Request context implementation.
*/
- private static class RequestContextImpl<S extends Result, H extends ResultHandler<? super S>>
+ private static class RequestContextImpl<S extends Result, H extends ResultHandler<S>>
implements RequestContext, ResultHandler<S> {
/*
@@ -84,10 +84,10 @@
*/
private static final class ExtendedResultHandlerHolder<R extends ExtendedResult> {
private final ExtendedRequest<R> request;
- private final ResultHandler<? super R> resultHandler;
+ private final ResultHandler<R> resultHandler;
private ExtendedResultHandlerHolder(final ExtendedRequest<R> request,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
this.request = request;
this.resultHandler = resultHandler;
}
@@ -285,8 +285,8 @@
}
private <R extends ExtendedResult> void cancel(final LocalizableMessage reason,
- final ExtendedRequest<R> cancelRequest,
- final ResultHandler<? super R> cancelResultHandler, final boolean sendResult) {
+ final ExtendedRequest<R> cancelRequest, final ResultHandler<R> cancelResultHandler,
+ final boolean sendResult) {
Validator.ensureNotNull(reason);
if (!isCancelSupported) {
@@ -501,10 +501,10 @@
@Override
public void handleAdd(final Integer messageID, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
- final RequestContextImpl<Result, ResultHandler<? super Result>> requestContext =
- new RequestContextImpl<Result, ResultHandler<? super Result>>(this,
- resultHandler, messageID, true);
+ final ResultHandler<Result> resultHandler) {
+ final RequestContextImpl<Result, ResultHandler<Result>> requestContext =
+ new RequestContextImpl<Result, ResultHandler<Result>>(this, resultHandler,
+ messageID, true);
if (addPendingRequest(requestContext)) {
requestHandler.handleAdd(requestContext, request, intermediateResponseHandler,
requestContext);
@@ -518,9 +518,9 @@
public void handleBind(final Integer messageID, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler) {
- final RequestContextImpl<BindResult, ResultHandler<? super BindResult>> requestContext =
- new RequestContextImpl<BindResult, ResultHandler<? super BindResult>>(this,
+ final ResultHandler<BindResult> resultHandler) {
+ final RequestContextImpl<BindResult, ResultHandler<BindResult>> requestContext =
+ new RequestContextImpl<BindResult, ResultHandler<BindResult>>(this,
resultHandler, messageID, false);
if (addPendingRequest(requestContext)) {
requestHandler.handleBind(requestContext, version, request,
@@ -534,10 +534,10 @@
@Override
public void handleCompare(final Integer messageID, final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler) {
- final RequestContextImpl<CompareResult, ResultHandler<? super CompareResult>> requestContext =
- new RequestContextImpl<CompareResult, ResultHandler<? super CompareResult>>(
- this, resultHandler, messageID, true);
+ final ResultHandler<CompareResult> resultHandler) {
+ final RequestContextImpl<CompareResult, ResultHandler<CompareResult>> requestContext =
+ new RequestContextImpl<CompareResult, ResultHandler<CompareResult>>(this,
+ resultHandler, messageID, true);
if (addPendingRequest(requestContext)) {
requestHandler.handleCompare(requestContext, request, intermediateResponseHandler,
requestContext);
@@ -577,10 +577,10 @@
@Override
public void handleDelete(final Integer messageID, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
- final RequestContextImpl<Result, ResultHandler<? super Result>> requestContext =
- new RequestContextImpl<Result, ResultHandler<? super Result>>(this,
- resultHandler, messageID, true);
+ final ResultHandler<Result> resultHandler) {
+ final RequestContextImpl<Result, ResultHandler<Result>> requestContext =
+ new RequestContextImpl<Result, ResultHandler<Result>>(this, resultHandler,
+ messageID, true);
if (addPendingRequest(requestContext)) {
requestHandler.handleDelete(requestContext, request, intermediateResponseHandler,
requestContext);
@@ -594,7 +594,7 @@
public <R extends ExtendedResult> void handleExtendedRequest(final Integer messageID,
final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) {
+ final ResultHandler<R> resultHandler) {
if (request.getOID().equals(CancelExtendedRequest.OID)) {
// Decode the request as a cancel request.
CancelExtendedRequest cancelRequest;
@@ -614,9 +614,9 @@
* though this request cannot be cancelled, it is important to
* do this in order to monitor the number of pending operations.
*/
- final RequestContextImpl<R, ResultHandler<? super R>> requestContext =
- new RequestContextImpl<R, ResultHandler<? super R>>(this, resultHandler,
- messageID, false);
+ final RequestContextImpl<R, ResultHandler<R>> requestContext =
+ new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler, messageID,
+ false);
if (addPendingRequest(requestContext)) {
// Find and cancel the request.
final RequestContextImpl<?, ?> cancelledRequest =
@@ -635,16 +635,16 @@
}
}
} else {
- final RequestContextImpl<R, ResultHandler<? super R>> requestContext;
+ final RequestContextImpl<R, ResultHandler<R>> requestContext;
if (request.getOID().equals(StartTLSExtendedRequest.OID)) {
// StartTLS requests cannot be cancelled.
requestContext =
- new RequestContextImpl<R, ResultHandler<? super R>>(this,
- resultHandler, messageID, false);
+ new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler,
+ messageID, false);
} else {
requestContext =
- new RequestContextImpl<R, ResultHandler<? super R>>(this,
- resultHandler, messageID, true);
+ new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler,
+ messageID, true);
}
if (addPendingRequest(requestContext)) {
@@ -660,10 +660,10 @@
@Override
public void handleModify(final Integer messageID, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
- final RequestContextImpl<Result, ResultHandler<? super Result>> requestContext =
- new RequestContextImpl<Result, ResultHandler<? super Result>>(this,
- resultHandler, messageID, true);
+ final ResultHandler<Result> resultHandler) {
+ final RequestContextImpl<Result, ResultHandler<Result>> requestContext =
+ new RequestContextImpl<Result, ResultHandler<Result>>(this, resultHandler,
+ messageID, true);
if (addPendingRequest(requestContext)) {
requestHandler.handleModify(requestContext, request, intermediateResponseHandler,
requestContext);
@@ -676,10 +676,10 @@
@Override
public void handleModifyDN(final Integer messageID, final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler) {
- final RequestContextImpl<Result, ResultHandler<? super Result>> requestContext =
- new RequestContextImpl<Result, ResultHandler<? super Result>>(this,
- resultHandler, messageID, true);
+ final ResultHandler<Result> resultHandler) {
+ final RequestContextImpl<Result, ResultHandler<Result>> requestContext =
+ new RequestContextImpl<Result, ResultHandler<Result>>(this, resultHandler,
+ messageID, true);
if (addPendingRequest(requestContext)) {
requestHandler.handleModifyDN(requestContext, request, intermediateResponseHandler,
requestContext);
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java
index 7ffd37e..5b878b1 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -64,10 +64,11 @@
public class LDAPListenerTestCase extends SdkTestCase {
private static class MockServerConnection implements ServerConnection<Integer> {
- final AsynchronousFutureResult<Throwable, ResultHandler<? super Throwable>> connectionError =
- new AsynchronousFutureResult<Throwable, ResultHandler<? super Throwable>>(null);
- final AsynchronousFutureResult<LDAPClientContext, ResultHandler<? super LDAPClientContext>> context =
- new AsynchronousFutureResult<LDAPClientContext, ResultHandler<? super LDAPClientContext>>(null);
+ final AsynchronousFutureResult<Throwable, ResultHandler<Throwable>> connectionError =
+ new AsynchronousFutureResult<Throwable, ResultHandler<Throwable>>(null);
+ final AsynchronousFutureResult<LDAPClientContext, ResultHandler<LDAPClientContext>> context =
+ new AsynchronousFutureResult<LDAPClientContext, ResultHandler<LDAPClientContext>>(
+ null);
final CountDownLatch isClosed = new CountDownLatch(1);
MockServerConnection() {
@@ -89,8 +90,7 @@
@Override
public void handleAdd(final Integer requestContext, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS));
}
@@ -101,8 +101,7 @@
public void handleBind(final Integer requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<BindResult> resultHandler) throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newBindResult(ResultCode.SUCCESS));
}
@@ -112,7 +111,7 @@
@Override
public void handleCompare(final Integer requestContext, final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler)
+ final ResultHandler<CompareResult> resultHandler)
throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newCompareResult(ResultCode.SUCCESS));
}
@@ -147,8 +146,7 @@
@Override
public void handleDelete(final Integer requestContext, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS));
}
@@ -159,7 +157,7 @@
public <R extends ExtendedResult> void handleExtendedRequest(final Integer requestContext,
final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) throws UnsupportedOperationException {
+ final ResultHandler<R> resultHandler) throws UnsupportedOperationException {
resultHandler.handleErrorResult(ErrorResultException.newErrorResult(request
.getResultDecoder().newExtendedErrorResult(ResultCode.PROTOCOL_ERROR, "",
"Extended operation " + request.getOID() + " not supported")));
@@ -171,8 +169,7 @@
@Override
public void handleModify(final Integer requestContext, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS));
}
@@ -182,8 +179,7 @@
@Override
public void handleModifyDN(final Integer requestContext, final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS));
}
@@ -381,7 +377,7 @@
public void handleBind(final Integer requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler)
+ final ResultHandler<BindResult> resultHandler)
throws UnsupportedOperationException {
// Get connection from load balancer, this should fail over
// twice before getting connection to online server.
@@ -533,7 +529,7 @@
public void handleBind(final Integer requestContext, final int version,
final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler)
+ final ResultHandler<BindResult> resultHandler)
throws UnsupportedOperationException {
// First attempt offline server.
LDAPConnectionFactory lcf = new LDAPConnectionFactory(findFreeSocketAddress());
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
index 26987ce..8ec3cdb 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
@@ -146,13 +146,6 @@
this.clientContext = clientContext;
}
- /**
- * Abandons the request sent by the client.
- *
- * @param context
- * @param request
- * @throws UnsupportedOperationException
- */
public void handleAbandon(final Integer context, final AbandonRequest request)
throws UnsupportedOperationException {
// Check if we have any concurrent operation with this message id.
@@ -166,18 +159,9 @@
// No response is needed.
}
- /**
- * Adds the request sent by the client.
- *
- * @param context
- * @param request
- * @param handler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleAdd(final Integer context, final AddRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> handler) throws UnsupportedOperationException {
+ final ResultHandler<Result> handler) throws UnsupportedOperationException {
Result result = null;
final AbandonableRequest abReq = new AbandonableRequest(request);
requestsInProgress.put(context, abReq);
@@ -217,18 +201,9 @@
handler.handleResult(result);
}
- /**
- * @param context
- * @param version
- * @param request
- * @param resultHandler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleBind(final Integer context, final int version, final BindRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super BindResult> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<BindResult> resultHandler) throws UnsupportedOperationException {
// TODO: all bind types.
final AbandonableRequest abReq = new AbandonableRequest(request);
requestsInProgress.put(context, abReq);
@@ -338,9 +313,6 @@
requestsInProgress.remove(context);
}
- /**
- * {@inheritDoc}
- */
public void handleConnectionClosed(final Integer context, final UnbindRequest request) {
close();
}
@@ -355,30 +327,17 @@
}
}
- /**
- * {@inheritDoc}
- */
public void handleConnectionDisconnected(ResultCode resultCode, String message) {
close();
}
- /**
- * {@inheritDoc}
- */
public void handleConnectionError(final Throwable error) {
close();
}
- /**
- * @param context
- * @param request
- * @param resultHandler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleCompare(final Integer context, final CompareRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super CompareResult> resultHandler)
+ final ResultHandler<CompareResult> resultHandler)
throws UnsupportedOperationException {
CompareResult result = null;
final AbandonableRequest abReq = new AbandonableRequest(request);
@@ -422,16 +381,9 @@
requestsInProgress.remove(context);
}
- /**
- * @param context
- * @param request
- * @param handler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleDelete(final Integer context, final DeleteRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> handler) throws UnsupportedOperationException {
+ final ResultHandler<Result> handler) throws UnsupportedOperationException {
Result result = null;
final AbandonableRequest abReq = new AbandonableRequest(request);
requestsInProgress.put(context, abReq);
@@ -459,17 +411,10 @@
requestsInProgress.remove(context);
}
- /**
- * @param context
- * @param request
- * @param resultHandler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public <R extends ExtendedResult> void handleExtendedRequest(final Integer context,
final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super R> resultHandler) throws UnsupportedOperationException {
+ final ResultHandler<R> resultHandler) throws UnsupportedOperationException {
if (request.getOID().equals(StartTLSExtendedRequest.OID)) {
final R result =
request.getResultDecoder().newExtendedErrorResult(ResultCode.SUCCESS, "",
@@ -480,41 +425,18 @@
}
}
- /**
- * @param context
- * @param request
- * @param resultHandler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleModify(final Integer context, final ModifyRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
// TODO:
}
- /**
- * @param context
- * @param request
- * @param resultHandler
- * @param intermediateResponseHandler
- * @throws UnsupportedOperationException
- */
public void handleModifyDN(final Integer context, final ModifyDNRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
- final ResultHandler<? super Result> resultHandler)
- throws UnsupportedOperationException {
+ final ResultHandler<Result> resultHandler) throws UnsupportedOperationException {
// TODO
}
- /**
- * @param request
- * @param intermediateResponseHandler
- * @param resultHandler
- * @param context
- * @throws UnsupportedOperationException
- */
public void handleSearch(final Integer context, final SearchRequest request,
final IntermediateResponseHandler intermediateResponseHandler,
final SearchResultHandler resultHandler) throws UnsupportedOperationException {
@@ -569,8 +491,7 @@
private volatile boolean isRunning;
// The mapping between the message id and the requests the server is
- // currently
- // handling.
+ // currently handling.
private final ConcurrentHashMap<Integer, AbandonableRequest> requestsInProgress =
new ConcurrentHashMap<Integer, AbandonableRequest>();
@@ -597,10 +518,6 @@
}
}
- /**
- * @param context
- * @return
- */
public ServerConnection<Integer> handleAccept(final LDAPClientContext context) {
return new LDAPServerConnection(context);
}
--
Gitblit v1.10.0