From 600f6cb4356f2355a004604b9353505f0c2f7f49 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 29 Sep 2014 10:04:51 +0000
Subject: [PATCH] OPENDJ-1536 OPENDJ-1285 Rename FutureResult classes hierarchy in the SDK to enhance code consistency

---
 opendj-cli/src/main/java/com/forgerock/opendj/cli/AuthenticatedConnectionFactory.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/AuthenticatedConnectionFactory.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/AuthenticatedConnectionFactory.java
index 6b2e17f..db64344 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/AuthenticatedConnectionFactory.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/AuthenticatedConnectionFactory.java
@@ -32,7 +32,7 @@
 import org.forgerock.opendj.ldap.Connection;
 import org.forgerock.opendj.ldap.ConnectionFactory;
 import org.forgerock.opendj.ldap.LdapException;
-import org.forgerock.opendj.ldap.FutureResult;
+import org.forgerock.opendj.ldap.LdapPromise;
 import org.forgerock.opendj.ldap.IntermediateResponseHandler;
 import org.forgerock.opendj.ldap.requests.BindRequest;
 import org.forgerock.opendj.ldap.responses.BindResult;
@@ -99,7 +99,7 @@
 
         /** {@inheritDoc} */
         @Override
-        public FutureResult<BindResult> bindAsync(BindRequest request,
+        public LdapPromise<BindResult> bindAsync(BindRequest request,
             IntermediateResponseHandler intermediateResponseHandler) {
             throw new UnsupportedOperationException();
         }
@@ -120,19 +120,19 @@
          * associated with this connection. If re-authentication fails for some
          * reason then this connection will be automatically closed.
          *
-         * @return A future representing the result of the operation.
+         * @return A promise representing the result of the operation.
          * @throws UnsupportedOperationException
          *             If this connection does not support rebind operations.
          * @throws IllegalStateException
          *             If this connection has already been closed, i.e. if
          *             {@code isClosed() == true}.
          */
-        public FutureResult<BindResult> rebindAsync() {
+        public LdapPromise<BindResult> rebindAsync() {
             if (request == null) {
                 throw new UnsupportedOperationException();
             }
 
-            return (FutureResult<BindResult>) connection.bindAsync(request)
+            return (LdapPromise<BindResult>) connection.bindAsync(request)
                     .onSuccess(new SuccessHandler<BindResult>() {
                         @Override
                         public void handleResult(final BindResult result) {

--
Gitblit v1.10.0