From c70f83faf35bebaa246e24249a2c3b0ca7392745 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:41:35 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs: isDescendantOf() => isSubordinateOrEqualTo()
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java | 4
opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/DN.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java | 6 +-
opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java | 12 ++--
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 2
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java | 10 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java | 10 +-
37 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
index d781d1a..1400201 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.task;
@@ -90,7 +90,7 @@
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- if (groupDn.isDescendantOf(baseDN.getDn()))
+ if (groupDn.isSubordinateOrEqualTo(baseDN.getDn()))
{
backendSet.add(backend.getBackendID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 5bb97d5..c36d424 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS
+ * Portions Copyright 2013-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -118,7 +118,7 @@
{
for (DN dn : entries)
{
- if (dn.isDescendantOf(baseDN.getDn()))
+ if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
{
backendSet.add(backend.getBackendID());
break;
@@ -208,7 +208,7 @@
boolean isDnDeleted = false;
for (DN deletedDn : alreadyDeleted)
{
- if (dn.isDescendantOf(deletedDn))
+ if (dn.isSubordinateOrEqualTo(deletedDn))
{
isDnDeleted = true;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 271fb5c..ca8142b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -114,8 +114,8 @@
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- if (newDn.isDescendantOf(baseDN.getDn()) ||
- oldDn.isDescendantOf(baseDN.getDn()))
+ if (newDn.isSubordinateOrEqualTo(baseDN.getDn()) ||
+ oldDn.isSubordinateOrEqualTo(baseDN.getDn()))
{
backendSet.add(backend.getBackendID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index d64a346..53dd41e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -93,7 +93,7 @@
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- if (dn.isDescendantOf(baseDN.getDn()))
+ if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
{
backendSet.add(backend.getBackendID());
}
@@ -319,7 +319,7 @@
try
{
DN nodeDN = DN.valueOf(node.getDN());
- if (dn.isDescendantOf(nodeDN))
+ if (dn.isSubordinateOrEqualTo(nodeDN))
{
if (dn.size() == nodeDN.size() + 1)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index a7f6e06..254cde0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -91,7 +91,7 @@
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- if (dn.isDescendantOf(baseDN.getDn()))
+ if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
{
backendSet.add(backend.getBackendID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index 9d745fd..3360c8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -477,7 +477,7 @@
try
{
DN dn = DN.valueOf(dnArray[i]);
- if (dn.isDescendantOf(baseDN.getDn()))
+ if (dn.isSubordinateOrEqualTo(baseDN.getDn()))
{
found = true;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index 126d4d9..cbc68ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -457,7 +457,7 @@
DN dn = DN.valueOf(sDn);
for (DN parentDN : parentReadOnly)
{
- if (dn.isDescendantOf(parentDN))
+ if (dn.isSubordinateOrEqualTo(parentDN))
{
isReadOnly = true;
break;
@@ -501,7 +501,7 @@
{
for (DN parentDN : parentDNs)
{
- if (dn.isDescendantOf(parentDN))
+ if (dn.isSubordinateOrEqualTo(parentDN))
{
return false;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index ce0d0da..9252002 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -951,7 +951,7 @@
{
for (DN dn : getBaseDNs())
{
- if (entryDN.isDescendantOf(dn))
+ if (entryDN.isSubordinateOrEqualTo(dn))
{
for (Backend<?> b : subordinateBackends)
{
@@ -983,7 +983,7 @@
{
for (DN baseDN : baseDNs)
{
- if (entryDN.isDescendantOf(baseDN) && !isExcluded(excludeDNs, entryDN))
+ if (entryDN.isSubordinateOrEqualTo(baseDN) && !isExcluded(excludeDNs, entryDN))
{
return true;
}
@@ -999,7 +999,7 @@
}
for (DN excludeDN : excludeDNs)
{
- if (entryDN.isDescendantOf(excludeDN))
+ if (entryDN.isSubordinateOrEqualTo(excludeDN))
{
return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java
index 109de18..d532018 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS
+ * Portions Copyright 2013-2016 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -422,7 +422,7 @@
aciList.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<DN,List<Aci>> hashEntry = iterator.next();
- if(hashEntry.getKey().isDescendantOf(oldDN)) {
+ if(hashEntry.getKey().isSubordinateOrEqualTo(oldDN)) {
int keyRDNCount=hashEntry.getKey().size();
int keepRDNCount=keyRDNCount - oldRDNCount;
RDN[] newRDNs = new RDN[keepRDNCount + newRDNCount];
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index 7b9d08a..0c05ec4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -621,14 +621,14 @@
}
break;
case WHOLE_SUBTREE:
- if(!entryDN.isDescendantOf(targetDN))
+ if(!entryDN.isSubordinateOrEqualTo(targetDN))
{
return false;
}
break;
case SUBORDINATES:
if (entryDN.size() <= targetDN.size() ||
- !entryDN.isDescendantOf(targetDN)) {
+ !entryDN.isSubordinateOrEqualTo(targetDN)) {
return false;
}
break;
@@ -645,7 +645,7 @@
EnumTargetOperator op=targets.getTarget().getOperator();
if(op == EnumTargetOperator.NOT_EQUALITY) {
DN tmpDN=targets.getTarget().getDN();
- if(entryDN.isDescendantOf(tmpDN))
+ if(entryDN.isSubordinateOrEqualTo(tmpDN))
{
return false;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
index e17d840..f294fe5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -147,7 +147,7 @@
for(ByteString v : attrs.get(0)) {
try {
DN groupDN = DN.valueOf(v.toString());
- if(suffixDN != null && !groupDN.isDescendantOf(suffixDN))
+ if(suffixDN != null && !groupDN.isSubordinateOrEqualTo(suffixDN))
{
continue;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java
index f1bd19c..32b787f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -91,7 +91,7 @@
patternDN = PatternDN.decodeSuffix(targetURL.getRawBaseDN());
} else {
urlDN=targetURL.getBaseDN();
- if(!urlDN.isDescendantOf(aciDN)) {
+ if(!urlDN.isSubordinateOrEqualTo(aciDN)) {
throw new AciException(WARN_ACI_SYNTAX_TARGET_DN_NOT_DESCENDENTOF.get(urlDN, aciDN));
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
index a8f71d7..14738a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
@@ -336,7 +336,7 @@
}
SearchScope scope=url.getScope();
if(scope == SearchScope.WHOLE_SUBTREE) {
- if(!evalCtx.getClientDN().isDescendantOf(urlDN))
+ if(!evalCtx.getClientDN().isSubordinateOrEqualTo(urlDN))
{
return EnumEvalResult.FALSE;
}
@@ -349,7 +349,7 @@
} else if(scope == SearchScope.SUBORDINATES) {
DN userDN = evalCtx.getClientDN();
if (userDN.size() <= urlDN.size() ||
- !userDN.isDescendantOf(urlDN)) {
+ !userDN.isSubordinateOrEqualTo(urlDN)) {
return EnumEvalResult.FALSE;
}
} else {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 21f4cf3..a1ed6d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -424,7 +424,7 @@
if (dit.containsKey(entryDN))
{
final DN nextDN = dit.higherKey(entryDN);
- return ConditionResult.valueOf(nextDN != null && nextDN.isDescendantOf(entryDN));
+ return ConditionResult.valueOf(nextDN != null && nextDN.isSubordinateOrEqualTo(entryDN));
}
return ConditionResult.UNDEFINED;
}
@@ -505,7 +505,7 @@
final int childDNSize = entryDN.size() + 1;
for (final DN dn : dit.tailMap(entryDN, false).navigableKeySet())
{
- if (!dn.isDescendantOf(entryDN))
+ if (!dn.isSubordinateOrEqualTo(entryDN))
{
break;
}
@@ -596,7 +596,7 @@
searchOperation.returnEntry(entry, null);
}
}
- else if (scope == SearchScope.BASE_OBJECT || !dn.isDescendantOf(baseDN))
+ else if (scope == SearchScope.BASE_OBJECT || !dn.isSubordinateOrEqualTo(baseDN))
{
// No more entries will be in scope.
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index ae31832..505aace 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -605,7 +605,7 @@
for (Map.Entry<DN, Backend<?>> entry : getSubordinateBaseDNs().entrySet())
{
DN baseDN = entry.getKey();
- if (entryDN.isDescendantOf(baseDN))
+ if (entryDN.isSubordinateOrEqualTo(baseDN))
{
Backend<?> b = entry.getValue();
if (b.entryExists(entryDN))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index d380364..c066dd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -1388,21 +1388,21 @@
{
// Check if this entry is an immediate child.
if (entryDN.size() == aBaseDN.size() + 1
- && entryDN.isDescendantOf(aBaseDN))
+ && entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
}
else if (searchScope == SearchScope.WHOLE_SUBTREE)
{
- if (entryDN.isDescendantOf(aBaseDN))
+ if (entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
}
else if (searchScope == SearchScope.SUBORDINATES
&& entryDN.size() > aBaseDN.size()
- && entryDN.isDescendantOf(aBaseDN))
+ && entryDN.isSubordinateOrEqualTo(aBaseDN))
{
return true;
}
@@ -2479,7 +2479,7 @@
private DN getMatchedDN(ReadableTransaction txn, DN targetDN) throws DirectoryException
{
DN parentDN = targetDN.getParentDNInSuffix();
- while (parentDN != null && parentDN.isDescendantOf(baseDN))
+ while (parentDN != null && parentDN.isSubordinateOrEqualTo(baseDN))
{
if (entryExists(txn, parentDN))
{
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 112fe05..b1d9e0b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.backends.pluggable;
@@ -100,7 +100,7 @@
{
for (DN includeBranch : includeBranches)
{
- if (includeBranch.isDescendantOf(baseDN) ||
+ if (includeBranch.isSubordinateOrEqualTo(baseDN) ||
includeBranch.isAncestorOf(baseDN))
{
exportContainers.add(entryContainer);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
index b184316..b39fdd3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.core;
@@ -316,7 +316,7 @@
logger.traceException(e);
}
}
- if (newAuthNDN != null && authNDN != null && authNDN.isDescendantOf(oldEntry.getName()))
+ if (newAuthNDN != null && authNDN != null && authNDN.isSubordinateOrEqualTo(oldEntry.getName()))
{
if (newAuthNSet == null)
{
@@ -325,7 +325,7 @@
conn.getAuthenticationInfo().setAuthenticationDN(newAuthNDN);
newAuthNSet.add(conn);
}
- if (newAuthZDN != null && authZDN != null && authZDN.isDescendantOf(oldEntry.getName()))
+ if (newAuthZDN != null && authZDN != null && authZDN.isSubordinateOrEqualTo(oldEntry.getName()))
{
if (newAuthZSet == null)
{
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 0d6873a..7cf8aa7 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.server.core;
@@ -95,7 +95,7 @@
{
otherBaseDNs.add(dn);
- if (baseDN.isAncestorOf(dn) || baseDN.isDescendantOf(dn))
+ if (baseDN.isAncestorOf(dn) || baseDN.isSubordinateOrEqualTo(dn))
{
LocalizableMessage message = ERR_REGISTER_BASEDN_HIERARCHY_CONFLICT.
get(baseDN, backend.getBackendID(), dn);
@@ -224,7 +224,7 @@
for (DN dn : otherBaseDNs)
{
- if (!dn.isDescendantOf(parentDN))
+ if (!dn.isSubordinateOrEqualTo(parentDN))
{
LocalizableMessage msg = ERR_REGISTER_BASEDN_DIFFERENT_PARENT_BASES.get(baseDN, backendID, dn);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, msg);
@@ -274,7 +274,7 @@
{
for (DN dn : b.getBaseDNs())
{
- if (dn.isDescendantOf(baseDN))
+ if (dn.isSubordinateOrEqualTo(baseDN))
{
subordinateBackends.add(b);
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
index 3d7a6be..9eeb73b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
@@ -435,11 +435,11 @@
final Entry entry = op.getEntryToAdd();
final DN entryDN = op.getEntryDN();
- if (entryDN.isDescendantOf(instanceKeysDN))
+ if (entryDN.isSubordinateOrEqualTo(instanceKeysDN))
{
handleInstanceKeyAddOperation(entry);
}
- else if (entryDN.isDescendantOf(secretKeysDN))
+ else if (entryDN.isSubordinateOrEqualTo(secretKeysDN))
{
try
{
@@ -480,7 +480,7 @@
public PostResponse doPostResponse(PostResponseDeleteOperation op)
{
if (op.getResultCode() != ResultCode.SUCCESS
- || !op.getEntryDN().isDescendantOf(instanceKeysDN))
+ || !op.getEntryDN().isSubordinateOrEqualTo(instanceKeysDN))
{
return PostResponse.continueOperationProcessing();
}
@@ -508,11 +508,11 @@
final Entry newEntry = op.getModifiedEntry();
final DN entryDN = op.getEntryDN();
- if (entryDN.isDescendantOf(instanceKeysDN))
+ if (entryDN.isSubordinateOrEqualTo(instanceKeysDN))
{
handleInstanceKeyModifyOperation(newEntry);
}
- else if (entryDN.isDescendantOf(secretKeysDN))
+ else if (entryDN.isSubordinateOrEqualTo(secretKeysDN))
{
try
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
index 71268a7..b3dc5e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
@@ -1357,7 +1357,7 @@
private DN getMatchedDNForDescendantOfConfig(DN dn)
{
- if (dn.isDescendantOf(configRootEntry.getDN()))
+ if (dn.isSubordinateOrEqualTo(configRootEntry.getDN()))
{
return getMatchedDN(dn);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
index 0d12b2b..b7754bc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -150,13 +150,13 @@
DN urlBaseDN = memberURL.getBaseDN();
if (baseDN != null)
{
- if (baseDN.isDescendantOf(urlBaseDN))
+ if (baseDN.isSubordinateOrEqualTo(urlBaseDN))
{
// The base DN requested by the user is below the base DN for this
// URL, so we'll use the base DN requested by the user.
urlBaseDN = baseDN;
}
- else if (! urlBaseDN.isDescendantOf(baseDN))
+ else if (! urlBaseDN.isSubordinateOrEqualTo(baseDN))
{
// The base DN from the URL is outside the base requested by the user,
// so we can skip this URL altogether.
@@ -187,7 +187,7 @@
while (iterator.hasNext())
{
DN existingBaseDN = iterator.next();
- if (urlBaseDN.isDescendantOf(existingBaseDN))
+ if (urlBaseDN.isSubordinateOrEqualTo(existingBaseDN))
{
// The base DN for the current URL is below an existing base DN,
// so we can just add this URL to the existing list and be done.
@@ -196,7 +196,7 @@
found = true;
break;
}
- else if (existingBaseDN.isDescendantOf(urlBaseDN))
+ else if (existingBaseDN.isSubordinateOrEqualTo(urlBaseDN))
{
// The base DN for the current URL is above the existing base DN,
// so we should use the base DN for the current URL instead of the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
index 4f08c9c..9e4d4ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -698,7 +698,7 @@
{
CacheEntry e = iterator.next();
DN entryDN = e.getEntry().getName();
- if (entryDN.isDescendantOf(baseDN))
+ if (entryDN.isSubordinateOrEqualTo(baseDN))
{
iterator.remove();
dnMap.remove(entryDN);
@@ -721,7 +721,7 @@
boolean isAppropriate = false;
for (DN subBase : subBackend.getBaseDNs())
{
- if (subBase.isDescendantOf(baseDN))
+ if (subBase.isSubordinateOrEqualTo(baseDN))
{
isAppropriate = true;
break;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index cf04a93..1c94fce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -396,7 +396,7 @@
{
for (DN baseDN: baseDNs)
{
- if (dn.isDescendantOf(baseDN))
+ if (dn.isSubordinateOrEqualTo(baseDN))
{
return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
index acd07bc..63e1170 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -571,7 +571,7 @@
for (DN baseDN : baseDNs)
{
- if (entryDN.isDescendantOf(baseDN))
+ if (entryDN.isSubordinateOrEqualTo(baseDN))
{
return baseDNs;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
index a93be31..0435c11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -206,7 +206,7 @@
// Is the entry a sub entry of the replicated domain main entry ?
DN replicatedDn = replicationDomainCfg.getBaseDN();
DN entryDn = entry.getName();
- if (entryDn.isDescendantOf(replicatedDn))
+ if (entryDn.isSubordinateOrEqualTo(replicatedDn))
{
// Found the matching replicated domain configuration object
matchingReplicatedDomainCfg = replicationDomainCfg;
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 27da159..70e282f 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -448,7 +448,7 @@
* Check if the operation to be run is a deleteOperation on a
* children of the current DeleteOperation.
*/
- if (pendingMsg.getDN().isDescendantOf(targetDN))
+ if (pendingMsg.getDN().isSubordinateOrEqualTo(targetDN))
{
hasDependencies = true;
addDependency(change, pendingChange);
@@ -473,7 +473,7 @@
* Check if the operation to be run is an ModifyDNOperation
* on a children of the current DeleteOperation
*/
- if (pendingMsg.getDN().isDescendantOf(targetDN)
+ if (pendingMsg.getDN().isSubordinateOrEqualTo(targetDN)
|| pendingModDn.newDNIsParent(targetDN))
{
hasDependencies = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index 2d0e595..529eb69 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -521,7 +521,7 @@
{
for (DN importBase : defaultIncludeBranches)
{
- if (!baseDN.equals(importBase) && baseDN.isDescendantOf(importBase))
+ if (!baseDN.equals(importBase) && baseDN.isSubordinateOrEqualTo(importBase))
{
excludeBranches.add(baseDN);
break;
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 ca3bf10..0b4417b 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
@@ -861,7 +861,7 @@
{
for (DN importBase : defaultIncludeBranches)
{
- if (!baseDN.equals(importBase) && baseDN.isDescendantOf(importBase))
+ if (!baseDN.equals(importBase) && baseDN.isSubordinateOrEqualTo(importBase))
{
excludeBranches.add(baseDN);
break;
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 f60588c..f1af2de 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
@@ -1460,7 +1460,7 @@
for (String adn : getCommonSuffixes(ctxSource, ctxDest, SuffixRelationType.REPLICATED))
{
DN dn = DN.valueOf(adn);
- if (DN.valueOf(targetDN).isDescendantOf(dn) && dn.isDescendantOf(targetBaseDN))
+ if (DN.valueOf(targetDN).isSubordinateOrEqualTo(dn) && dn.isSubordinateOrEqualTo(targetBaseDN))
{
targetBaseDN = dn;
}
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 45b9333..765c14f 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
@@ -264,7 +264,7 @@
{
Reject.ifNull(fromDN, toDN);
- if (!isDescendantOf(fromDN))
+ if (!isSubordinateOrEqualTo(fromDN))
{
return this;
}
@@ -438,7 +438,7 @@
* @return <CODE>true</CODE> if this DN is a descendant of the
* provided DN, or <CODE>false</CODE> if not.
*/
- public boolean isDescendantOf(DN dn)
+ public boolean isSubordinateOrEqualTo(DN dn)
{
int offset = numComponents - dn.numComponents;
if (offset < 0)
@@ -515,12 +515,12 @@
case WHOLE_SUBTREE:
// This DN must be a descendant of the provided base DN.
- return isDescendantOf(baseDN);
+ return isSubordinateOrEqualTo(baseDN);
case SUBORDINATES:
// This DN must be a descendant of the provided base DN, but
// not equal to it.
- return !equals(baseDN) && isDescendantOf(baseDN);
+ return !equals(baseDN) && isSubordinateOrEqualTo(baseDN);
default:
// This is a scope that we don't recognize.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index 5956742..ba3b203 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -2879,7 +2879,7 @@
{
inheritFromDN = DN.decode(value);
// Respect subentry root scope.
- if (!inheritFromDN.isDescendantOf(
+ if (!inheritFromDN.isSubordinateOrEqualTo(
subEntry.getDN().parent()))
{
inheritFromDN = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
index 24407a6..222b65e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.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.types;
@@ -1458,7 +1458,7 @@
public boolean isDNWithinScope(final DN dn)
{
- if (!dn.isDescendantOf(baseDN))
+ if (!dn.isSubordinateOrEqualTo(baseDN))
{
return false;
}
@@ -1489,7 +1489,7 @@
// Check exclusions.
for (final DN chopBeforeDN : chopBefore.keySet())
{
- if (dn.isDescendantOf(chopBeforeDN))
+ if (dn.isSubordinateOrEqualTo(chopBeforeDN))
{
return false;
}
@@ -1497,7 +1497,7 @@
for (final DN chopAfterDN : chopAfter.keySet())
{
- if (!dn.equals(chopAfterDN) && dn.isDescendantOf(chopAfterDN))
+ if (!dn.equals(chopAfterDN) && dn.isSubordinateOrEqualTo(chopAfterDN))
{
return false;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index a9d5cf6..c689d4d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -286,7 +286,7 @@
{
for (DN dn : b.getBaseDNs())
{
- if (dn.isDescendantOf(entryDN))
+ if (dn.isSubordinateOrEqualTo(entryDN))
{
setResultCodeAndMessageNoInfoDisclosure(entry,
ResultCode.NOT_ALLOWED_ON_NONLEAF,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 63b9c84..059da76 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -251,7 +251,7 @@
}
else
{
- if (newSuperior.isDescendantOf(entryDN))
+ if (newSuperior.isSubordinateOrEqualTo(entryDN))
{
setResultCode(ResultCode.UNWILLING_TO_PERFORM);
appendErrorMessage(ERR_MODDN_NEW_SUPERIOR_IN_SUBTREE.get(entryDN, newSuperior));
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 cdf3e9c..576ba49 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
+ * Portions Copyright 2011-2016 ForgeRock AS
*/
package org.opends.server.workflowelement.localbackend;
@@ -1103,7 +1103,7 @@
{
for (DN subordinateDN : subordinate.getBaseDNs())
{
- if (subordinateDN.isDescendantOf(baseDN))
+ if (subordinateDN.isSubordinateOrEqualTo(baseDN))
{
results.add(registeredLocalBackends.get(subordinateDN));
}
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 3cb8b61..f5dd7fd 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
@@ -589,8 +589,8 @@
assertTrue(p.isAncestorOf(c));
assertFalse(c.isAncestorOf(p));
- assertTrue(c.isDescendantOf(p));
- assertFalse(p.isDescendantOf(c));
+ assertTrue(c.isSubordinateOrEqualTo(p));
+ assertFalse(p.isSubordinateOrEqualTo(c));
assertEquals(p, e);
assertEquals(p.hashCode(), e.hashCode());
@@ -803,8 +803,8 @@
assertTrue(p.isAncestorOf(c));
assertFalse(c.isAncestorOf(p));
- assertTrue(c.isDescendantOf(p));
- assertFalse(p.isDescendantOf(c));
+ assertTrue(c.isSubordinateOrEqualTo(p));
+ assertFalse(p.isSubordinateOrEqualTo(c));
assertEquals(c, e);
assertEquals(c.hashCode(), e.hashCode());
@@ -1073,7 +1073,7 @@
DN dn = DN.valueOf(s);
DN other = DN.valueOf(d);
- assertEquals(dn.isDescendantOf(other), e, s + " isDescendantOf "
+ assertEquals(dn.isSubordinateOrEqualTo(other), e, s + " isDescendantOf "
+ d);
}
@@ -1089,7 +1089,7 @@
AssertionError.class })
public void testIsDescendantOfException() throws Exception {
DN dn = DN.valueOf("dc=com");
- dn.isDescendantOf(null);
+ dn.isSubordinateOrEqualTo(null);
}
--
Gitblit v1.10.0