From 6439bba5cc09d6febc59bdc9e0d9bc25f1f1eb18 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 01 Sep 2010 09:04:15 +0000
Subject: [PATCH] Various improvements:

---
 sdk/src/org/opends/sdk/ServerConnection.java |   78 +++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/sdk/src/org/opends/sdk/ServerConnection.java b/sdk/src/org/opends/sdk/ServerConnection.java
index ef81e2a..950f6dc 100644
--- a/sdk/src/org/opends/sdk/ServerConnection.java
+++ b/sdk/src/org/opends/sdk/ServerConnection.java
@@ -56,7 +56,7 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle abandon requests.
    */
-  void abandon(C requestContext, AbandonRequest request)
+  void handleAbandon(C requestContext, AbandonRequest request)
       throws UnsupportedOperationException;
 
 
@@ -77,8 +77,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle add requests.
    */
-  void add(C requestContext, AddRequest request,
-      ResultHandler<Result> resultHandler,
+  void handleAdd(C requestContext, AddRequest request,
+      ResultHandler<? super Result> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
 
@@ -102,7 +102,7 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle bind requests.
    */
-  void bind(C requestContext, int version, BindRequest request,
+  void handleBind(C requestContext, int version, BindRequest request,
       ResultHandler<? super BindResult> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
@@ -110,30 +110,6 @@
 
 
   /**
-   * Invoked when the client closes the connection, possibly using an unbind
-   * request.
-   *
-   * @param requestContext
-   *          The request context.
-   * @param request
-   *          The unbind request, which may be {@code null} if one was not sent
-   *          before the connection was closed.
-   */
-  void closed(C requestContext, UnbindRequest request);
-
-
-
-  /**
-   * Invoked when an error occurs on the connection and it is no longer usable.
-   *
-   * @param error
-   *          The exception describing the problem that occurred.
-   */
-  void closed(Throwable error);
-
-
-
-  /**
    * Invoked when a compare request is received from a client.
    *
    * @param requestContext
@@ -149,7 +125,7 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle compare requests.
    */
-  void compare(C requestContext, CompareRequest request,
+  void handleCompare(C requestContext, CompareRequest request,
       ResultHandler<? super CompareResult> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
@@ -157,6 +133,30 @@
 
 
   /**
+   * Invoked when the client closes the connection, possibly using an unbind
+   * request.
+   *
+   * @param requestContext
+   *          The request context.
+   * @param request
+   *          The unbind request, which may be {@code null} if one was not sent
+   *          before the connection was closed.
+   */
+  void handleConnectionClosed(C requestContext, UnbindRequest request);
+
+
+
+  /**
+   * Invoked when an error occurs on the connection and it is no longer usable.
+   *
+   * @param error
+   *          The exception describing the problem that occurred.
+   */
+  void handleConnectionException(Throwable error);
+
+
+
+  /**
    * Invoked when a delete request is received from a client.
    *
    * @param requestContext
@@ -172,8 +172,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle delete requests.
    */
-  void delete(C requestContext, DeleteRequest request,
-      ResultHandler<Result> resultHandler,
+  void handleDelete(C requestContext, DeleteRequest request,
+      ResultHandler<? super Result> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
 
@@ -197,8 +197,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle extended requests.
    */
-  <R extends ExtendedResult> void extendedRequest(C requestContext,
-      ExtendedRequest<R> request, ResultHandler<R> resultHandler,
+  <R extends ExtendedResult> void handleExtendedRequest(C requestContext,
+      ExtendedRequest<R> request, ResultHandler<? super R> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
 
@@ -220,8 +220,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle modify requests.
    */
-  void modify(C requestContext, ModifyRequest request,
-      ResultHandler<Result> resultHandler,
+  void handleModify(C requestContext, ModifyRequest request,
+      ResultHandler<? super Result> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
 
@@ -243,8 +243,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle modify DN requests.
    */
-  void modifyDN(C requestContext, ModifyDNRequest request,
-      ResultHandler<Result> resultHandler,
+  void handleModifyDN(C requestContext, ModifyDNRequest request,
+      ResultHandler<? super Result> resultHandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;
 
@@ -269,8 +269,8 @@
    * @throws UnsupportedOperationException
    *           If this server connection does not handle search requests.
    */
-  void search(C requestContext, SearchRequest request,
-      ResultHandler<Result> resultHandler,
+  void handleSearch(C requestContext, SearchRequest request,
+      ResultHandler<? super Result> resultHandler,
       SearchResultHandler searchResulthandler,
       IntermediateResponseHandler intermediateResponseHandler)
       throws UnsupportedOperationException;

--
Gitblit v1.10.0