From cda973a9442a778ec9b167524b2dd042f5858c9c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Oct 2014 12:25:21 +0000
Subject: [PATCH] (CR-4811) Converted opendj3 code to use SearchRequest like API
---
opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 17 ++++-------------
opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 7e088a0..3e113e2 100644
--- a/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -220,7 +220,7 @@
final SearchFilter filter = toSearchFilter(request.getFilter());
final org.opends.server.protocols.internal.SearchRequest sr =
- Requests.newSearchRequest(toDN(request.getName()), request.getScope(), filter)
+ Requests.newSearchRequest(to(request.getName()), request.getScope(), filter)
.setDereferenceAliasesPolicy(request.getDereferenceAliasesPolicy())
.setSizeLimit(request.getSizeLimit())
.setTimeLimit(request.getTimeLimit())
@@ -230,14 +230,6 @@
return getResponseResult(icc.processSearch(sr, internalSearchListener));
}
- private org.opends.server.types.DN toDN(DN dn) {
- try {
- return org.opends.server.types.DN.valueOf(dn.toString());
- } catch (DirectoryException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
@Override
public void removeConnectionEventListener(ConnectionEventListener listener) {
// Internal client connection don't have any connection events.
@@ -296,10 +288,10 @@
return extendedResult;
} catch (DecodeException e) {
+ org.opends.server.types.DN matchedDN = extendedOperation.getMatchedDN();
return request.getResultDecoder().newExtendedErrorResult(
extendedOperation.getResultCode(),
- (extendedOperation.getMatchedDN() != null ? extendedOperation
- .getMatchedDN().toString() : null),
+ matchedDN != null ? matchedDN.toString() : null,
extendedOperation.getErrorMessage().toString());
}
}
@@ -319,8 +311,7 @@
request.getAssertionValue(), to(request.getControls()));
CompareResult result = Responses.newCompareResult(compareOperation.getResultCode());
- result = getResponseResult(compareOperation, result);
- return result;
+ return getResponseResult(compareOperation, result);
}
@Override
diff --git a/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 2777101..3891de1 100644
--- a/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-sdk/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -33,6 +33,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
@@ -135,7 +136,7 @@
try {
return org.opends.server.types.DN.valueOf(dn.toString());
} catch (Exception e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
@@ -155,7 +156,7 @@
}
return newSet;
} catch (Exception e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
@@ -175,7 +176,7 @@
}
return newDns;
} catch (Exception e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
@@ -191,7 +192,7 @@
try {
return org.opends.server.types.RDN.decode(rdn.toString());
} catch (Exception e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
@@ -464,11 +465,11 @@
sdkReaderASN1.readStartSequence();
oid = sdkReaderASN1.readOctetStringAsString();
if (sdkReaderASN1.hasNextElement()
- && (sdkReaderASN1.peekType() == org.forgerock.opendj.io.ASN1.UNIVERSAL_BOOLEAN_TYPE)) {
+ && sdkReaderASN1.peekType() == ASN1.UNIVERSAL_BOOLEAN_TYPE) {
isCritical = sdkReaderASN1.readBoolean();
}
if (sdkReaderASN1.hasNextElement()
- && (sdkReaderASN1.peekType() == org.forgerock.opendj.io.ASN1.UNIVERSAL_OCTET_STRING_TYPE)) {
+ && sdkReaderASN1.peekType() == ASN1.UNIVERSAL_OCTET_STRING_TYPE) {
value = sdkReaderASN1.readOctetString();
}
sdkReaderASN1.readEndSequence();
@@ -641,7 +642,7 @@
try {
return DN.valueOf(dn.toString());
} catch (Exception e) {
- throw new IllegalStateException(e.getMessage());
+ throw new IllegalStateException(e.getMessage(), e);
}
}
@@ -673,10 +674,10 @@
result.addControl(from(c));
}
}
- result.setDiagnosticMessage((operation.getErrorMessage() != null ? operation
- .getErrorMessage().toString() : null));
- result.setMatchedDN((operation.getMatchedDN() != null) ? operation.getMatchedDN()
- .toString() : null);
+ final LocalizableMessageBuilder errorMsg = operation.getErrorMessage();
+ final org.opends.server.types.DN matchedDN = operation.getMatchedDN();
+ result.setDiagnosticMessage(errorMsg != null ? errorMsg.toString() : null);
+ result.setMatchedDN(matchedDN != null ? matchedDN.toString() : null);
if (result.isSuccess()) {
return result;
} else {
--
Gitblit v1.10.0