From 7bc3339b85cc77983bfbab733fc5069c6adac0e6 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-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 7e088a0..3e113e2 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/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
--
Gitblit v1.10.0