From 92f86826768d4df9eb14367ba07c66af8af9f6b6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 20 Jul 2015 09:18:09 +0000
Subject: [PATCH] OPENDJ-1666 CR-7647 forgerock-util 2.0.0 migration
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index d3cc943..944980c 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -53,7 +53,7 @@
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ResultHandler;
+import org.forgerock.opendj.ldap.LdapResultHandler;
import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldif.EntryGenerator;
@@ -176,9 +176,9 @@
return doAdd(connection, currentTime);
} catch (final AddRateExecutionEndedException a) {
- return newSuccessfulPromise(OTHER);
+ return newResultPromise(OTHER);
} catch (final IOException e) {
- return newFailedPromise(newLdapException(OTHER, e));
+ return newExceptionPromise(newLdapException(OTHER, e));
}
}
@@ -236,18 +236,19 @@
entry = generator.readEntry();
}
- final ResultHandler<Result> addHandler = new AddStatsHandler(currentTime, entry.getName().toString());
+ final LdapResultHandler<Result> addHandler = new AddStatsHandler(
+ currentTime, entry.getName().toString());
return connection.addAsync(newAddRequest(entry))
- .onSuccess(addHandler)
- .onFailure(addHandler);
+ .thenOnResult(addHandler)
+ .thenOnException(addHandler);
}
private Promise<?, LdapException> doDelete(
final Connection connection, final long currentTime, final String entryToRemove) {
- final ResultHandler<Result> deleteHandler = new DeleteStatsHandler(currentTime);
+ final LdapResultHandler<Result> deleteHandler = new DeleteStatsHandler(currentTime);
return connection.deleteAsync(newDeleteRequest(entryToRemove))
- .onSuccess(deleteHandler)
- .onFailure(deleteHandler);
+ .thenOnResult(deleteHandler)
+ .thenOnException(deleteHandler);
}
}
--
Gitblit v1.10.0