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/tools/makeldif/TemplateEntry.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
index 339f942..fa4c9be 100644
--- a/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -155,33 +155,22 @@
*/
public DN getDN()
{
- if (dn == null)
- {
- AttributeType[] rdnAttributes = template.getRDNAttributes();
- String[] rdnNames = new String[rdnAttributes.length];
- AttributeValue[] rdnValues = new AttributeValue[rdnAttributes.length];
+ if (dn == null) {
+ RDN.Builder builder = RDN.createBuilder();
- for (int i=0; i < rdnAttributes.length; i++)
- {
- TemplateValue v = getValue(rdnAttributes[i]);
- if (v == null)
- {
+ for (AttributeType type : template.getRDNAttributes()) {
+ TemplateValue v = getValue(type);
+ if (v == null) {
return null;
}
- rdnNames[i] = rdnAttributes[i].getNameOrOID();
- rdnValues[i] = new AttributeValue(rdnAttributes[i],
- v.getValue().toString());
+ AttributeValue value = new AttributeValue(type,
+ v.getValue().toString());
+
+ builder.append(type, value);
}
- RDN[] parentComponents = parentDN.getRDNComponents();
- RDN[] dnComponents = new RDN[parentComponents.length+1];
-
- dnComponents[0] = new RDN(rdnAttributes, rdnNames, rdnValues);
- System.arraycopy(parentComponents, 0, dnComponents, 1,
- parentComponents.length);
-
- dn = new DN(dnComponents);
+ dn = parentDN.concat(builder.getInstance());
}
return dn;
--
Gitblit v1.10.0