From 32034d853f3a284424ccfa87b6de210f1ca814e1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 29 Nov 2011 00:31:21 +0000
Subject: [PATCH] Fix OPENDJ-43 (Synchronous Connection decorator implementations should not use AsynchronousConnections) and OPENDJ-328 (Make it easier to implement connection decorators).
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java | 83 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 41 deletions(-)
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 1d98481..1f2802e 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
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -64,18 +65,18 @@
* The request context.
* @param request
* The add request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle add requests.
*/
void handleAdd(C requestContext, AddRequest request,
- ResultHandler<? super Result> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super Result> resultHandler)
throws UnsupportedOperationException;
@@ -89,18 +90,18 @@
* The protocol version included with the bind request.
* @param request
* The bind request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle bind requests.
*/
void handleBind(C requestContext, int version, BindRequest request,
- ResultHandler<? super BindResult> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super BindResult> resultHandler)
throws UnsupportedOperationException;
@@ -112,18 +113,18 @@
* The request context.
* @param request
* The compare request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle compare requests.
*/
void handleCompare(C requestContext, CompareRequest request,
- ResultHandler<? super CompareResult> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super CompareResult> resultHandler)
throws UnsupportedOperationException;
@@ -135,18 +136,18 @@
* The request context.
* @param request
* The delete request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle delete requests.
*/
void handleDelete(C requestContext, DeleteRequest request,
- ResultHandler<? super Result> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super Result> resultHandler)
throws UnsupportedOperationException;
@@ -160,18 +161,19 @@
* The request context.
* @param request
* The extended request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle extended requests.
*/
<R extends ExtendedResult> void handleExtendedRequest(C requestContext,
- ExtendedRequest<R> request, ResultHandler<? super R> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ ExtendedRequest<R> request,
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super R> resultHandler)
throws UnsupportedOperationException;
@@ -183,18 +185,18 @@
* The request context.
* @param request
* The modify request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle modify requests.
*/
void handleModify(C requestContext, ModifyRequest request,
- ResultHandler<? super Result> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super Result> resultHandler)
throws UnsupportedOperationException;
@@ -206,18 +208,18 @@
* The request context.
* @param request
* The modify DN request.
- * @param resultHandler
- * The handler which should be used to send back the result to the
- * client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the result to the
+ * client.
* @throws UnsupportedOperationException
* If this request handler does not handle modify DN requests.
*/
void handleModifyDN(C requestContext, ModifyDNRequest request,
- ResultHandler<? super Result> resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
+ IntermediateResponseHandler intermediateResponseHandler,
+ ResultHandler<? super Result> resultHandler)
throws UnsupportedOperationException;
@@ -229,17 +231,16 @@
* The request context.
* @param request
* The search request.
- * @param resultHandler
- * The handler which should be used to send back the search results
- * to the client.
* @param intermediateResponseHandler
* The handler which should be used to send back any intermediate
* responses to the client.
+ * @param resultHandler
+ * The handler which should be used to send back the search results
+ * to the client.
* @throws UnsupportedOperationException
* If this request handler does not handle search requests.
*/
void handleSearch(C requestContext, SearchRequest request,
- SearchResultHandler resultHandler,
- IntermediateResponseHandler intermediateResponseHandler)
- throws UnsupportedOperationException;
+ IntermediateResponseHandler intermediateResponseHandler,
+ SearchResultHandler resultHandler) throws UnsupportedOperationException;
}
--
Gitblit v1.10.0