From 59685c84348f8d71dc3bbd3513c5eb10cc738a8e Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 03 Nov 2006 16:39:22 +0000
Subject: [PATCH] Refactor DN and RDN classes and improve their test coverage.
---
opends/src/server/org/opends/server/backends/MonitorBackend.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opends/src/server/org/opends/server/backends/MonitorBackend.java
index 9f84e20..206a778 100644
--- a/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -371,7 +371,7 @@
// See if the monitor base entry is the immediate parent for the requested
// entry. If not, then throw an exception.
- DN parentDN = entryDN.getParent();
+ DN parentDN = entryDN.getParentDNInSuffix();
if ((parentDN == null) || (! parentDN.equals(baseMonitorDN)))
{
if (baseMonitorDN.isAncestorOf(entryDN))
@@ -405,7 +405,7 @@
// Get the RDN value and see if it matches the instance name for one of
// the directory server monitor providers.
- String rdnValue = entryRDN.getAttributeValues()[0].getStringValue();
+ String rdnValue = entryRDN.getAttributeValue(0).getStringValue();
MonitorProvider monitorProvider =
DirectoryServer.getMonitorProvider(rdnValue.toLowerCase());
if (monitorProvider == null)
@@ -448,7 +448,7 @@
return true;
}
- DN parentDN = entryDN.getParent();
+ DN parentDN = entryDN.getParentDNInSuffix();
if ((parentDN == null) || (! parentDN.equals(baseMonitorDN)))
{
return false;
@@ -460,7 +460,7 @@
return false;
}
- String rdnValue = rdn.getAttributeValues()[0].getStringValue();
+ String rdnValue = rdn.getAttributeValue(0).getStringValue();
MonitorProvider monitorProvider =
DirectoryServer.getMonitorProvider(toLowerCase(rdnValue));
return (monitorProvider != null);
@@ -654,14 +654,14 @@
// Make sure to include the RDN attribute.
RDN entryRDN = entryDN.getRDN();
- AttributeType rdnType = entryRDN.getAttributeTypes()[0];
- AttributeValue rdnValue = entryRDN.getAttributeValues()[0];
+ AttributeType rdnType = entryRDN.getAttributeType(0);
+ AttributeValue rdnValue = entryRDN.getAttributeValue(0);
LinkedHashSet<AttributeValue> rdnValues =
new LinkedHashSet<AttributeValue>(1);
rdnValues.add(rdnValue);
- Attribute rdnAttr = new Attribute(rdnType, entryRDN.getAttributeNames()[0],
+ Attribute rdnAttr = new Attribute(rdnType, entryRDN.getAttributeName(0),
rdnValues);
ArrayList<Attribute> rdnList = new ArrayList<Attribute>(1);
rdnList.add(rdnAttr);
--
Gitblit v1.10.0