From a6726a7a52ff2925cddcaf76c72bb7ee86bfb34c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Aug 2016 07:37:38 +0000
Subject: [PATCH] use DN in dsreplication
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 10 +++++-----
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java | 8 +++++---
opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 10 +---------
4 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index 7afa413..56df7fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -854,15 +854,7 @@
{
return true;
}
-
- for (String dn : cacheFilter.getBaseDNsToSearch())
- {
- if (DN.valueOf(dn).equals(baseDn))
- {
- return true;
- }
- }
- return false;
+ return cacheFilter.getBaseDNsToSearch().contains(baseDn);
}
private static void updateReplication(ServerDescriptor desc, ConnectionWrapper conn, TopologyCacheFilter cacheFilter)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java
index 5d4210f..d73a285 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java
@@ -19,6 +19,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.forgerock.opendj.ldap.DN;
+
/**
* Class used to filter what we look for in the topology cache.
* This is done in particular to avoid problems of performance when we
@@ -27,7 +29,7 @@
*/
public class TopologyCacheFilter
{
- private final Set<String> baseDNs = new HashSet<>();
+ private final Set<DN> baseDNs = new HashSet<>();
private boolean searchMonitoringInformation = true;
private boolean searchBaseDNInformation = true;
@@ -80,7 +82,7 @@
* base DN is added, all the base DNs will be retrieved.
* @param dn the DN of the base DN to look for.
*/
- public void addBaseDNToSearch(String dn)
+ public void addBaseDNToSearch(DN dn)
{
baseDNs.add(dn);
}
@@ -90,7 +92,7 @@
* empty we will search for all the base DNs.
* @return the list of base DNs we will search for.
*/
- public Set<String> getBaseDNsToSearch()
+ public Set<DN> getBaseDNsToSearch()
{
return new HashSet<>(baseDNs);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index c0b1875..91e3bf0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -2472,8 +2472,8 @@
{
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(adminSuffixDn.toString());
- filter.addBaseDNToSearch(schemaDn.toString());
+ filter.addBaseDNToSearch(adminSuffixDn);
+ filter.addBaseDNToSearch(schemaDn);
ServerDescriptor s = createStandalone(remoteConn, filter);
for (ReplicaDescriptor replica : s.getReplicas())
{
@@ -2534,7 +2534,7 @@
{
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(dn.toString());
+ filter.addBaseDNToSearch(dn);
ServerDescriptor s = createStandalone(remoteConn, filter);
for (ReplicaDescriptor r : s.getReplicas())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 9cecb29..0d241ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -4606,8 +4606,8 @@
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN().toString());
- filter.addBaseDNToSearch(Constants.SCHEMA_DN.toString());
+ filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
+ filter.addBaseDNToSearch(Constants.SCHEMA_DN);
addBaseDNs(filter, uData.getBaseDNs());
ServerDescriptor serverDesc1 = createStandalone(conn1, filter);
ServerDescriptor serverDesc2 = createStandalone(conn2, filter);
@@ -5219,7 +5219,7 @@
filter.setSearchMonitoringInformation(false);
if (!uData.disableAll())
{
- filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN().toString());
+ filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
addBaseDNs(filter, uData.getBaseDNs());
}
ServerDescriptor server = createStandalone(conn, filter);
@@ -5618,7 +5618,7 @@
{
for (DN dn : baseDNs)
{
- filter.addBaseDNToSearch(dn.toString());
+ filter.addBaseDNToSearch(dn);
}
}
@@ -6612,7 +6612,7 @@
{
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(baseDN.toString());
+ filter.addBaseDNToSearch(baseDN);
ServerDescriptor source = ServerDescriptor.createStandalone(connSource, filter);
ReplicaDescriptor replica = findReplicaForSuffixDN(source.getReplicas(), baseDN);
if (replica != null)
--
Gitblit v1.10.0