From eaee3f6a42c1a129f07e2364a4c32c59b9e03e19 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 09 Feb 2016 15:22:22 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RDNs
---
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index d1c2f61..99f71b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -47,6 +47,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -1680,29 +1681,19 @@
Map<AttributeType,List<Attribute>>userAttributes,
Map<AttributeType,List<Attribute>> operationalAttributes)
{
- RDN rdn = entryDN.rdn();
- int numAVAs = rdn.getNumValues();
- for (int i=0; i < numAVAs; i++)
+ for (AVA ava : entryDN.rdn())
{
- AttributeType t = rdn.getAttributeType(i);
- ByteString v = rdn.getAttributeValue(i);
- String n = rdn.getAttributeName(i);
- if (t.isOperational())
- {
- addRDNAttributesIfNecessary(operationalAttributes, t, v, n);
- }
- else
- {
- addRDNAttributesIfNecessary(userAttributes, t, v, n);
- }
+ AttributeType t = ava.getAttributeType();
+ addRDNAttributesIfNecessary(t.isOperational() ? operationalAttributes : userAttributes, ava);
}
}
- private void addRDNAttributesIfNecessary(
- Map<AttributeType, List<Attribute>> attributes, AttributeType t,
- ByteString v, String n)
+ private void addRDNAttributesIfNecessary(Map<AttributeType, List<Attribute>> attributes, AVA ava)
{
+ AttributeType t = ava.getAttributeType();
+ String n = ava.getAttributeName();
+ ByteString v = ava.getAttributeValue();
final List<Attribute> attrList = attributes.get(t);
if (attrList == null)
{
--
Gitblit v1.10.0