From ea900ba71bf5eb5e4126583e1852c6982f9ce5a7 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 14 Oct 2014 15:44:44 +0000
Subject: [PATCH] (CR-4811) Converted opendj3 code to use SearchRequest like API
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index e7ed2a1..130f8f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -36,6 +36,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.protocols.internal.SearchRequest;
+import static org.opends.server.protocols.internal.Requests.*;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.replication.common.CSN;
@@ -158,15 +160,13 @@
{
try
{
- SearchFilter filter =
- SearchFilter.createFilterFromString("objectclass=*");
+ final SearchRequest request =
+ newSearchRequest(baseDN, SearchScope.BASE_OBJECT, "objectclass=*").addAttribute(REPLICATION_STATE);
/*
* Search the database entry that is used to periodically
* save the ServerState
*/
- final InternalSearchOperation search = getRootConnection().processSearch(
- baseDN, SearchScope.BASE_OBJECT, DereferenceAliasesPolicy.NEVER,
- 0, 0, false, filter, Collections.singleton(REPLICATION_STATE));
+ final InternalSearchOperation search = getRootConnection().processSearch(request);
final ResultCode resultCode = search.getResultCode();
if (resultCode != ResultCode.SUCCESS
&& resultCode != ResultCode.NO_SUCH_OBJECT)
@@ -194,15 +194,11 @@
{
try
{
- SearchFilter filter = SearchFilter.createFilterFromString(
- "(&(objectclass=ds-cfg-replication-domain)"
- + "(ds-cfg-base-dn=" + baseDN + "))");
-
- final InternalSearchOperation op = getRootConnection().processSearch(
- DN.valueOf("cn=config"),
- SearchScope.SUBORDINATES,
- DereferenceAliasesPolicy.NEVER,
- 1, 0, false, filter, Collections.singleton(REPLICATION_STATE));
+ String filter = "(&(objectclass=ds-cfg-replication-domain)" + "(ds-cfg-base-dn=" + baseDN + "))";
+ final SearchRequest request = newSearchRequest("cn=config", SearchScope.SUBORDINATES, filter)
+ .setSizeLimit(1)
+ .addAttribute(REPLICATION_STATE);
+ final InternalSearchOperation op = getRootConnection().processSearch(request);
return getFirstResult(op);
}
catch (DirectoryException e)
--
Gitblit v1.10.0