From c01c421b26e6409febd6af1db1c9db11b7b347a4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 07 Jan 2014 15:06:31 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 2305812..fbf60d8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1095,7 +1095,7 @@
debugBuffer.toString());
Entry debugEntry =
- new Entry(DN.decode("cn=debugsearch"), null, null, null);
+ new Entry(DN.valueOf("cn=debugsearch"), null, null, null);
debugEntry.addAttribute(attr, new ArrayList<AttributeValue>());
searchOperation.returnEntry(debugEntry, null);
@@ -1239,7 +1239,7 @@
* "ou=people,dc=example,dc=com".
*/
byte[] baseDNKey = JebFormat.dnToDNKey(aBaseDN,
- this.baseDN.getNumComponents());
+ this.baseDN.size());
byte[] suffix = Arrays.copyOf(baseDNKey, baseDNKey.length+1);
suffix[suffix.length-1] = 0x00;
@@ -1532,8 +1532,8 @@
else if (searchScope == SearchScope.SINGLE_LEVEL)
{
// Check if this entry is an immediate child.
- if ((entryDN.getNumComponents() ==
- aBaseDN.getNumComponents() + 1) &&
+ if ((entryDN.size() ==
+ aBaseDN.size() + 1) &&
entryDN.isDescendantOf(aBaseDN))
{
isInScope = true;
@@ -1548,8 +1548,8 @@
}
else if (searchScope == SearchScope.SUBORDINATE_SUBTREE)
{
- if ((entryDN.getNumComponents() >
- aBaseDN.getNumComponents()) &&
+ if ((entryDN.size() >
+ aBaseDN.size()) &&
entryDN.isDescendantOf(aBaseDN))
{
isInScope = true;
@@ -1832,7 +1832,7 @@
* downwards.
*/
byte[] entryDNKey = JebFormat.dnToDNKey(entryDN,
- this.baseDN.getNumComponents());
+ this.baseDN.size());
byte[] suffix = Arrays.copyOf(entryDNKey, entryDNKey.length+1);
suffix[suffix.length-1] = 0x00;
@@ -2016,7 +2016,7 @@
{
leafDNKey =
new DatabaseEntry(JebFormat.dnToDNKey(
- targetDN, this.baseDN.getNumComponents()));
+ targetDN, this.baseDN.size()));
}
DatabaseEntry value = new DatabaseEntry();
OperationStatus status;
@@ -2493,7 +2493,7 @@
* downwards.
*/
byte[] currentDNKey = JebFormat.dnToDNKey(currentDN,
- this.baseDN.getNumComponents());
+ this.baseDN.size());
byte[] suffix = Arrays.copyOf(currentDNKey, currentDNKey.length+1);
suffix[suffix.length-1] = 0x00;
@@ -2541,7 +2541,7 @@
// Construct the new DN of the entry.
DN newDN = modDN(oldEntry.getDN(),
- currentDN.getNumComponents(),
+ currentDN.size(),
entry.getDN());
// Assign a new entry ID if we are renumbering.
@@ -2895,9 +2895,9 @@
*/
public static DN modDN(DN oldDN, int oldSuffixLen, DN newSuffixDN)
{
- int oldDNNumComponents = oldDN.getNumComponents();
+ int oldDNNumComponents = oldDN.size();
int oldDNKeepComponents = oldDNNumComponents - oldSuffixLen;
- int newSuffixDNComponents = newSuffixDN.getNumComponents();
+ int newSuffixDNComponents = newSuffixDN.size();
RDN[] newDNComponents = new RDN[oldDNKeepComponents+newSuffixDNComponents];
for (int i=0; i < oldDNKeepComponents; i++)
@@ -3567,7 +3567,7 @@
{
return null;
}
- return dn.getParent();
+ return dn.parent();
}
/**
--
Gitblit v1.10.0