From e41a9d4d573a382c5e0536c970bd2878bd8dc6bc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:41:58 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs: isAncestorOf(DN) => isSuperiorOrEqualTo(DN)
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java | 2
opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java | 12 +++---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/DN.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java | 10 ++--
18 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index cfe5102..f9b6a37 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS
+ * Portions Copyright 2012-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.browser;
@@ -1129,7 +1129,7 @@
{
DN dn1 = DN.valueOf(getNode().getDN());
DN dn2 = url.getBaseDN();
- if (dn2.isAncestorOf(dn1))
+ if (dn2.isSuperiorOrEqualTo(dn1))
{
String host = url.getHost();
int port = url.getPort();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
index b37ada6..6dc5b37 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -836,7 +836,7 @@
{
isBaseDN = true;
}
- else if (baseDN.getDn().isAncestorOf(theDN))
+ else if (baseDN.getDn().isSuperiorOrEqualTo(theDN))
{
isSubordinate = true;
}
@@ -1681,7 +1681,7 @@
{
for (DN suffix : allSuffixes)
{
- if (suffix.isAncestorOf(dn) && !suffix.equals(dn))
+ if (suffix.isSuperiorOrEqualTo(dn) && !suffix.equals(dn))
{
return false;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 5a16a9e..a1bc440 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -623,11 +623,11 @@
{
return invalidBaseDNValue(dn, ERR_BASE_DN_ALREADY_EXISTS.get(dn), errors);
}
- else if (baseDN.getDn().isAncestorOf(theDN) && backendName.equalsIgnoreCase(backend.getBackendID()))
+ else if (baseDN.getDn().isSuperiorOrEqualTo(theDN) && backendName.equalsIgnoreCase(backend.getBackendID()))
{
return invalidBaseDNValue(dn, ERR_BASE_DN_ANCESTOR_EXISTS.get(baseDN.getDn()), errors);
}
- else if (theDN.isAncestorOf(baseDN.getDn()) && backendName.equalsIgnoreCase(backend.getBackendID()))
+ else if (theDN.isSuperiorOrEqualTo(baseDN.getDn()) && backendName.equalsIgnoreCase(backend.getBackendID()))
{
return invalidBaseDNValue(dn, ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(baseDN.getDn()), errors);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index 83fde96..b810d5c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -1130,7 +1130,7 @@
boolean isBelowBaseDN = false;
for (DN baseDN : baseDNs)
{
- if (baseDN.isAncestorOf(entryDN))
+ if (baseDN.isSuperiorOrEqualTo(entryDN))
{
isBelowBaseDN = true;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
index b8da8c2..488c8ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
@@ -513,7 +513,7 @@
boolean matchFound = false;
for (DN dn : baseDNs)
{
- if (dn.isAncestorOf(e.getName()))
+ if (dn.isSuperiorOrEqualTo(e.getName()))
{
matchFound = true;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 6d0f86f..cf03f0b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -3350,7 +3350,7 @@
found = true;
break;
}
- else if (dn.isAncestorOf(baseDN))
+ else if (dn.isSuperiorOrEqualTo(baseDN))
{
matchedDN = dn;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
index b1d9e0b..06c6431 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
@@ -101,7 +101,7 @@
for (DN includeBranch : includeBranches)
{
if (includeBranch.isSubordinateOrEqualTo(baseDN) ||
- includeBranch.isAncestorOf(baseDN))
+ includeBranch.isSuperiorOrEqualTo(baseDN))
{
exportContainers.add(entryContainer);
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
index 7cf8aa7..61eccf3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
@@ -95,7 +95,7 @@
{
otherBaseDNs.add(dn);
- if (baseDN.isAncestorOf(dn) || baseDN.isSubordinateOrEqualTo(dn))
+ if (baseDN.isSuperiorOrEqualTo(dn) || baseDN.isSubordinateOrEqualTo(dn))
{
LocalizableMessage message = ERR_REGISTER_BASEDN_HIERARCHY_CONFLICT.
get(baseDN, backend.getBackendID(), dn);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
index bd09c84..72fcf9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.server.core;
@@ -269,9 +269,9 @@
case SINGLE_LEVEL:
return baseDN.equals(dn.getParentDNInSuffix());
case WHOLE_SUBTREE:
- return baseDN.isAncestorOf(dn);
+ return baseDN.isSuperiorOrEqualTo(dn);
case SUBORDINATES:
- return !baseDN.equals(dn) && baseDN.isAncestorOf(dn);
+ return !baseDN.equals(dn) && baseDN.isSuperiorOrEqualTo(dn);
default:
return false;
}
@@ -356,9 +356,9 @@
case SINGLE_LEVEL:
return baseDN.equals(dn.parent());
case WHOLE_SUBTREE:
- return baseDN.isAncestorOf(dn);
+ return baseDN.isSuperiorOrEqualTo(dn);
case SUBORDINATES:
- return !baseDN.equals(dn) && baseDN.isAncestorOf(dn);
+ return !baseDN.equals(dn) && baseDN.isSuperiorOrEqualTo(dn);
default:
return false;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index e2bc102..7bad180 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -156,14 +156,14 @@
break;
case SUBORDINATES:
- if (baseDN.equals(nextDN) || !baseDN.isAncestorOf(nextDN))
+ if (baseDN.equals(nextDN) || !baseDN.isSuperiorOrEqualTo(nextDN))
{
continue;
}
break;
default:
- if (!baseDN.isAncestorOf(nextDN))
+ if (!baseDN.isSuperiorOrEqualTo(nextDN))
{
continue;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
index 70e282f..79edb18 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
@@ -226,7 +226,7 @@
* Check if the operation to be run is an addOperation on a
* parent of the current AddOperation.
*/
- if (pendingMsg.getDN().isAncestorOf(targetDN))
+ if (pendingMsg.getDN().isSuperiorOrEqualTo(targetDN))
{
hasDependencies = true;
addDependency(change, pendingChange);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
index 835c574..368297d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -395,7 +395,7 @@
try
{
DN newDN = computeNewDN();
- return newDN.isAncestorOf(targetDn);
+ return newDN.isSuperiorOrEqualTo(targetDn);
} catch (DirectoryException e)
{
// The DN was not a correct DN, and therefore does not a parent of the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 0b4417b..95df728 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -1131,7 +1131,7 @@
{
for (DN includeDN : includeBranches)
{
- if (baseDN.isAncestorOf(includeDN))
+ if (baseDN.isSuperiorOrEqualTo(includeDN))
{
return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
index 765c14f..d02fc8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
@@ -469,7 +469,7 @@
* @return <CODE>true</CODE> if this DN is an ancestor of the
* provided DN, or <CODE>false</CODE> if not.
*/
- public boolean isAncestorOf(DN dn)
+ public boolean isSuperiorOrEqualTo(DN dn)
{
int offset = dn.numComponents - numComponents;
if (offset < 0)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java
index b25786a..d816303 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java
@@ -877,7 +877,7 @@
{
for (DN excludeBranch : excludeBranches)
{
- if (excludeBranch.isAncestorOf(dn))
+ if (excludeBranch.isSuperiorOrEqualTo(dn))
{
return false;
}
@@ -888,7 +888,7 @@
{
for (DN includeBranch : includeBranches)
{
- if (includeBranch.isAncestorOf(dn))
+ if (includeBranch.isSuperiorOrEqualTo(dn))
{
break checkIncludeBranches;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java
index 4a8fd7c..8e903a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java
@@ -742,7 +742,7 @@
{
for (DN excludeBranch : excludeBranches)
{
- if (excludeBranch.isAncestorOf(dn))
+ if (excludeBranch.isSuperiorOrEqualTo(dn))
{
return false;
}
@@ -753,7 +753,7 @@
{
for (DN includeBranch : includeBranches)
{
- if (includeBranch.isAncestorOf(dn))
+ if (includeBranch.isSuperiorOrEqualTo(dn))
{
return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 576ba49..0492771 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -1065,7 +1065,7 @@
// If the request base DN is not a subordinate of the subordinate
// workflow base DN then do not search in the subordinate workflow.
- if (!originalBaseDN.isAncestorOf(subordinateDN))
+ if (!originalBaseDN.isSuperiorOrEqualTo(subordinateDN))
{
continue;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
index f5dd7fd..0133c19 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
@@ -586,8 +586,8 @@
assertTrue(p.compareTo(c) < 0);
assertTrue(c.compareTo(p) > 0);
- assertTrue(p.isAncestorOf(c));
- assertFalse(c.isAncestorOf(p));
+ assertTrue(p.isSuperiorOrEqualTo(c));
+ assertFalse(c.isSuperiorOrEqualTo(p));
assertTrue(c.isSubordinateOrEqualTo(p));
assertFalse(p.isSubordinateOrEqualTo(c));
@@ -800,8 +800,8 @@
assertTrue(c.compareTo(p) > 0);
assertTrue(p.compareTo(c) < 0);
- assertTrue(p.isAncestorOf(c));
- assertFalse(c.isAncestorOf(p));
+ assertTrue(p.isSuperiorOrEqualTo(c));
+ assertFalse(c.isSuperiorOrEqualTo(p));
assertTrue(c.isSubordinateOrEqualTo(p));
assertFalse(p.isSubordinateOrEqualTo(c));
@@ -1004,7 +1004,7 @@
DN dn = DN.valueOf(s);
DN other = DN.valueOf(d);
- assertEquals(dn.isAncestorOf(other), e, s + " isAncestoryOf " + d);
+ assertEquals(dn.isSuperiorOrEqualTo(other), e, s + " isAncestoryOf " + d);
}
@@ -1019,7 +1019,7 @@
AssertionError.class })
public void testIsAncestorOfException() throws Exception {
DN dn = DN.valueOf("dc=com");
- dn.isAncestorOf(null);
+ dn.isSuperiorOrEqualTo(null);
}
--
Gitblit v1.10.0