From 942b39f9a6862b49a1c73a3a972dca1ca9cb3a77 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 09:45:19 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java | 4 ++--
opendj3-server-dev/replace.rb | 6 +++---
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 4 ++--
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java | 8 ++++----
opendj3-server-dev/tests/staf-tests/shared/functions/sdk.xml | 12 ++++--------
opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java | 12 ++++++------
opendj3-server-dev/src/server/org/opends/server/core/ConfigurationHandler.java | 8 ++++----
7 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index 25c6087..db9f248 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -128,16 +128,16 @@
'import org.forgerock.opendj.config.\1;',
/import org.forgerock.opendj.config.client.AuthorizationException;/,
- 'import org.forgerock.opendj.ldap.ErrorResultException;',
+ 'import org.forgerock.opendj.ldap.LdapException;',
/import org.forgerock.opendj.config.client.CommunicationException;$/,
'',
/catch \(AuthorizationException e\)/,
- 'catch (ErrorResultException e)',
+ 'catch (LdapException e)',
/catch \(CommunicationException e\)/,
- 'catch (ErrorResultException e)',
+ 'catch (LdapException e)',
# Now bring back removed imports that have no replacement
/import org.forgerock.opendj.config.client.ldap.JNDIDirContextAdaptor;/,
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ConfigurationHandler.java b/opendj3-server-dev/src/server/org/opends/server/core/ConfigurationHandler.java
index 653e8ed..1fe53a9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ConfigurationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ConfigurationHandler.java
@@ -53,7 +53,7 @@
import org.forgerock.opendj.ldap.CancelledResultException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.MemoryBackend;
import org.forgerock.opendj.ldap.RequestContext;
@@ -257,9 +257,9 @@
/** Handler for LDAP operations. */
private static final class ConfigResultHandler implements ResultHandler<Result> {
- private ErrorResultException resultError;
+ private LdapException resultError;
- ErrorResultException getResultError()
+ LdapException getResultError()
{
return resultError;
}
@@ -277,7 +277,7 @@
/** {@inheritDoc} */
@Override
- public void handleError(ErrorResultException error)
+ public void handleError(LdapException error)
{
resultError = error;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
index a0bccda..c718bcd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
@@ -59,6 +59,7 @@
import org.opends.server.util.Base64;
import static org.forgerock.opendj.adapter.server3x.Adapters.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
import static org.forgerock.util.promise.Promises.*;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
@@ -197,16 +198,15 @@
ctx.asyncContext = getAsyncContext(request);
newRootConnection().searchSingleEntryAsync(buildSearchRequest(ctx.userName)).thenAsync(
- new AsyncFunction<SearchResultEntry, BindResult, ErrorResultException>() {
+ new AsyncFunction<SearchResultEntry, BindResult, LdapException>() {
@Override
- public Promise<BindResult, ErrorResultException> apply(SearchResultEntry resultEntry)
- throws ErrorResultException
+ public Promise<BindResult, LdapException> apply(SearchResultEntry resultEntry) throws LdapException
{
final DN bindDN = resultEntry.getName();
if (bindDN == null)
{
sendAuthenticationFailure(ctx);
- return newFailedPromise(ErrorResultException.newErrorResult(ResultCode.CANCELLED));
+ return newFailedPromise(newErrorResult(ResultCode.CANCELLED));
}
else
{
@@ -234,9 +234,9 @@
onFailure(e, ctx);
}
}
- }).onFailure(new FailureHandler<ErrorResultException>(){
+ }).onFailure(new FailureHandler<LdapException>(){
@Override
- public void handleError(ErrorResultException error)
+ public void handleError(LdapException error)
{
final ResultCode rc = error.getResult().getResultCode();
if (ResultCode.CLIENT_SIDE_NO_RESULTS_RETURNED.equals(rc)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
index 5bb5dd7..62bd175 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -39,7 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.FutureResultImpl;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchResultHandler;
@@ -80,7 +80,7 @@
import org.opends.server.types.SearchResultReference;
import static org.forgerock.opendj.adapter.server3x.Converters.*;
-import static org.forgerock.opendj.ldap.ErrorResultException.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
@@ -419,7 +419,7 @@
.getMessageID(), toResponseProtocolOp(operation)));
}
}
- catch (ErrorResultException e)
+ catch (LdapException e)
{
op.futureResult.handleError(e);
}
@@ -755,7 +755,7 @@
{
try
{
- op.futureResult.handleError(ErrorResultException.newErrorResult(ResultCode.CANCELLED));
+ op.futureResult.handleError(newErrorResult(ResultCode.CANCELLED));
op.operation.abort(cancelRequest);
if (keepStats)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
index 897ad45..911174e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.AbstractAsynchronousConnection;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConnectionEventListener;
-import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.FutureResult;
import org.forgerock.opendj.ldap.FutureResultImpl;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -95,6 +94,7 @@
import static org.forgerock.opendj.adapter.server3x.Converters.*;
import static org.forgerock.opendj.ldap.ByteString.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
/**
* Adapter class between LDAP SDK's {@link org.forgerock.opendj.ldap.Connection}
@@ -170,7 +170,7 @@
logger.traceException(e);
clientConnection.removeOperationInProgress(operation.getMessageID());
// TODO JNR add error message??
- futureResult.handleError(ErrorResultException.newErrorResult(ResultCode.OPERATIONS_ERROR, e));
+ futureResult.handleError(newErrorResult(ResultCode.OPERATIONS_ERROR, e));
}
return futureResult;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java b/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
index 1b65727..ed528c6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
@@ -65,7 +65,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.AuthorizationException;
import org.forgerock.opendj.ldap.Connection;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.LDAPConnectionFactory;
import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.ResultCode;
@@ -1305,7 +1305,7 @@
connection.bind(bindDN, bindPassword.toCharArray());
break;
}
- catch (ErrorResultException e)
+ catch (LdapException e)
{
if (ci.isTrustStoreInMemory() && e.getCause() instanceof SSLException
&& e.getCause().getCause() instanceof CertificateException)
diff --git a/opendj3-server-dev/tests/staf-tests/shared/functions/sdk.xml b/opendj3-server-dev/tests/staf-tests/shared/functions/sdk.xml
index d99c102..2cc686c 100644
--- a/opendj3-server-dev/tests/staf-tests/shared/functions/sdk.xml
+++ b/opendj3-server-dev/tests/staf-tests/shared/functions/sdk.xml
@@ -22,7 +22,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2011-2013 ForgeRock AS
+ ! Copyright 2011-2014 ForgeRock AS
! -->
<stax>
<!-- SDK ldapsearch Function -->
@@ -151,15 +151,11 @@
writer.flush()
- except ErrorResultException, e:
+ except LdapException, e:
System.err.println(e.getMessage())
System.exit(e.getResult().getResultCode().intValue())
-
- except ErrorResultIOException, e:
- System.err.println(e.getMessage())
- System.exit(e.getCause().getResult().getResultCode().intValue())
-
- except InterruptedException, e:
+
+ except InterruptedException, e:
System.err.println(e.getMessage())
System.exit(ResultCode.CLIENT_SIDE_USER_CANCELLED.intValue())
--
Gitblit v1.10.0