From e4b6be3ae7c5f47e1e900a952d54009cf6b6054a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:44:14 +0000
Subject: [PATCH] DN.matchesBaseAndScope(DN, SearchScope) => DN.isInScopeOf(DN, SearchScope)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/DN.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 6809312..966d300 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -1439,7 +1439,7 @@
final SearchFilter filter = searchOp.getFilter();
final SearchScope scope = searchOp.getScope();
- if (ChangelogBackend.CHANGELOG_BASE_DN.matchesBaseAndScope(baseDN, scope))
+ if (ChangelogBackend.CHANGELOG_BASE_DN.isInScopeOf(baseDN, scope))
{
final Entry entry = buildBaseChangelogEntry();
if (filter.matchesEntry(entry) && !searchOp.returnEntry(entry, null))
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 a1ed6d0..e7327bf 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
@@ -588,7 +588,7 @@
for (final Map.Entry<DN, MonitorProvider<?>> e : dit.tailMap(baseDN).entrySet())
{
final DN dn = e.getKey();
- if (dn.matchesBaseAndScope(baseDN, scope))
+ if (dn.isInScopeOf(baseDN, scope))
{
final Entry entry = getEntry(dn, dit);
if (filter.matchesEntry(entry))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index 2677d81..2582ffe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -388,7 +388,7 @@
private boolean shouldInclude(final Entry entry) throws DirectoryException
{
- return entry.getName().matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry);
+ return entry.getName().isInScopeOf(baseDN, scope) && filter.matchesEntry(entry);
}
void modifyEntry(final IndexBuffer buffer, final EntryID entryID, final Entry oldEntry, final Entry newEntry,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index 087de9e..d616df7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -247,7 +247,7 @@
SearchScope scope = searchOperation.getScope();
for (DN dn : dnSet)
{
- if (! dn.matchesBaseAndScope(baseDN, scope))
+ if (! dn.isInScopeOf(baseDN, scope))
{
continue;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 8737f0b..d39797a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -1164,7 +1164,7 @@
final Entry valueEntry;
if (currentConfiguration.getCheckReferencesScopeCriteria() == CheckReferencesScopeCriteria.NAMING_CONTEXT
- && valueEntryDN.matchesBaseAndScope(entryBaseDN, SearchScope.SUBORDINATES))
+ && valueEntryDN.isInScopeOf(entryBaseDN, SearchScope.SUBORDINATES))
{
return PluginResult.PreOperation.stopProcessing(ResultCode.CONSTRAINT_VIOLATION,
ERR_PLUGIN_REFERENT_NAMINGCONTEXT_MISMATCH.get(valueEntryDN, attr.getName(), entryDN));
@@ -1218,7 +1218,7 @@
for (DN baseDN : baseDNs)
{
- if (dn.matchesBaseAndScope(baseDN, SearchScope.SUBORDINATES))
+ if (dn.isInScopeOf(baseDN, SearchScope.SUBORDINATES))
{
namingContext = baseDN;
break;
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 95ace5a..18b7f4b 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
@@ -474,7 +474,7 @@
* @return <CODE>true</CODE> if this entry is within the given
* base and scope, or <CODE>false</CODE> if it is not.
*/
- public boolean matchesBaseAndScope(DN baseDN, SearchScope scope)
+ public boolean isInScopeOf(DN baseDN, SearchScope scope)
{
switch (scope.asEnum())
{
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 181d8e0..ba72e51 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
@@ -2803,7 +2803,7 @@
*/
public boolean matchesBaseAndScope(DN baseDN, SearchScope scope)
{
- return dn.matchesBaseAndScope(baseDN, scope);
+ return dn.isInScopeOf(baseDN, scope);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
index 2029c17..143228b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
@@ -251,7 +251,7 @@
{
for (DN dn : baseDNs)
{
- if (entryDN.matchesBaseAndScope(dn, scope))
+ if (entryDN.isInScopeOf(dn, scope))
{
return true;
}
--
Gitblit v1.10.0