From 352227d9327a40607111ed43bee145a743b812d3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 10 Feb 2016 13:41:18 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RDNs
---
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
index 6d1b930..9bbb015 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -35,6 +35,7 @@
import java.util.LinkedHashMap;
import java.util.List;
+import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.core.DirectoryServer;
@@ -148,40 +149,20 @@
{
if (dn == null)
{
- RDN rdn;
AttributeType[] rdnAttrs = template.getRDNAttributes();
- if (rdnAttrs.length == 1)
+ AVA[] avas = new AVA[rdnAttrs.length];
+ for (int i = 0; i < rdnAttrs.length; i++)
{
- AttributeType t = rdnAttrs[0];
+ AttributeType t = rdnAttrs[i];
TemplateValue v = getValue(t);
if (v == null)
{
return null;
}
-
- rdn = new RDN(t, ByteString.valueOfUtf8(v.getValue().toString()));
- }
- else
- {
- String[] names = new String[rdnAttrs.length];
- ByteString[] values = new ByteString[rdnAttrs.length];
- for (int i=0; i < rdnAttrs.length; i++)
- {
- AttributeType t = rdnAttrs[i];
- TemplateValue v = getValue(t);
- if (v == null)
- {
- return null;
- }
-
- names[i] = t.getNameOrOID();
- values[i] = ByteString.valueOfUtf8(v.getValue().toString());
- }
-
- rdn = new RDN(rdnAttrs, names, values);
+ avas[i] = new AVA(t, v.getValue());
}
- dn = parentDN.child(rdn);
+ dn = parentDN.child(new RDN(avas));
}
return dn;
--
Gitblit v1.10.0