From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
index 52d100f..0139638 100644
--- a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
+++ b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchResultHandler;
@@ -147,13 +147,13 @@
}
@Override
- public Promise<Connection, ErrorResultException> getConnectionAsync() {
+ public Promise<Connection, LdapException> getConnectionAsync() {
// TODO change the path...
return newSuccessfulPromise(newConnection(icc));
}
@Override
- public Connection getConnection() throws ErrorResultException {
+ public Connection getConnection() throws LdapException {
return newConnection(icc);
}
};
@@ -183,15 +183,14 @@
* @param dn
* The DN of the user.
* @return A new connection for a specified user.
- * @throws ErrorResultException
+ * @throws LdapException
* If no such object.
*/
- public static Connection newConnectionForUser(final DN dn) throws ErrorResultException {
+ public static Connection newConnectionForUser(final DN dn) throws LdapException {
try {
return newConnection(new InternalClientConnection(to(dn)));
} catch (DirectoryException e) {
- throw ErrorResultException.newErrorResult(Responses
- .newResult(ResultCode.NO_SUCH_OBJECT));
+ throw LdapException.newErrorResult(Responses.newResult(ResultCode.NO_SUCH_OBJECT));
}
}
@@ -199,8 +198,7 @@
return new AbstractSynchronousConnection() {
@Override
- public Result search(final SearchRequest request, final SearchResultHandler handler)
- throws ErrorResultException {
+ public Result search(final SearchRequest request, final SearchResultHandler handler) throws LdapException {
InternalSearchListener internalSearchListener = new InternalSearchListener() {
@Override
@@ -234,7 +232,7 @@
}
@Override
- public Result modifyDN(final ModifyDNRequest request) throws ErrorResultException {
+ public Result modifyDN(final ModifyDNRequest request) throws LdapException {
final ModifyDNOperation modifyDNOperation =
icc.processModifyDN(to(valueOf(request.getName())), to(valueOf(request
.getNewRDN())), request.isDeleteOldRDN(),
@@ -244,7 +242,7 @@
}
@Override
- public Result modify(final ModifyRequest request) throws ErrorResultException {
+ public Result modify(final ModifyRequest request) throws LdapException {
final ModifyOperation modifyOperation =
icc.processModify(to(valueOf(request.getName())), toRawModifications(request
.getModifications()), to(request.getControls()));
@@ -264,7 +262,7 @@
@Override
public <R extends ExtendedResult> R extendedRequest(final ExtendedRequest<R> request,
- final IntermediateResponseHandler handler) throws ErrorResultException {
+ final IntermediateResponseHandler handler) throws LdapException {
final ExtendedOperation extendedOperation =
icc.processExtendedOperation(request.getOID(), to(request.getValue()),
@@ -295,14 +293,14 @@
}
@Override
- public Result delete(final DeleteRequest request) throws ErrorResultException {
+ public Result delete(final DeleteRequest request) throws LdapException {
final DeleteOperation deleteOperation =
icc.processDelete(to(valueOf(request.getName())), to(request.getControls()));
return getResponseResult(deleteOperation);
}
@Override
- public CompareResult compare(final CompareRequest request) throws ErrorResultException {
+ public CompareResult compare(final CompareRequest request) throws LdapException {
final CompareOperation compareOperation =
icc.processCompare(to(valueOf(request.getName())), request
.getAttributeDescription().toString(), to(request
@@ -320,7 +318,7 @@
}
@Override
- public BindResult bind(final BindRequest request) throws ErrorResultException {
+ public BindResult bind(final BindRequest request) throws LdapException {
BindOperation bindOperation = null;
if (request instanceof SimpleBindRequest) {
bindOperation =
@@ -348,7 +346,7 @@
bindClient.dispose();
} else { // not supported
- throw ErrorResultException.newErrorResult(Responses
+ throw LdapException.newErrorResult(Responses
.newResult(ResultCode.AUTH_METHOD_NOT_SUPPORTED));
}
BindResult result =
@@ -358,7 +356,7 @@
if (result.isSuccess()) {
return result;
} else {
- throw ErrorResultException.newErrorResult(result);
+ throw LdapException.newErrorResult(result);
}
}
@@ -368,7 +366,7 @@
}
@Override
- public Result add(final AddRequest request) throws ErrorResultException {
+ public Result add(final AddRequest request) throws LdapException {
final AddOperation addOperation =
icc.processAdd(to(valueOf(request.getName())), to(request
.getAllAttributes()), to(request.getControls()));
--
Gitblit v1.10.0