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/authorization/dseecompat/PatternRDN.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
index dbe698a..9a978c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ResultCode;
@@ -168,12 +169,13 @@
return true;
}
- if (rdn.getNumValues() != 1)
+ if (rdn.size() != 1)
{
return false;
}
- AttributeType thatType = rdn.getAttributeType(0);
+ AVA firstAVA = rdn.getFirstAVA();
+ AttributeType thatType = firstAVA.getAttributeType();
if (!typePatterns[0].equals("*"))
{
AttributeType thisType = DirectoryServer.getAttributeType(typePatterns[0]);
@@ -183,7 +185,7 @@
}
}
- return matchValuePattern(valuePatterns.get(0), thatType, rdn.getAttributeValue(0));
+ return matchValuePattern(valuePatterns.get(0), thatType, firstAVA.getAttributeValue());
}
if (hasTypeWildcard)
@@ -191,7 +193,7 @@
return false;
}
- if (numValues != rdn.getNumValues())
+ if (numValues != rdn.size())
{
return false;
}
@@ -200,10 +202,9 @@
TreeMap<String,ArrayList<ByteString>> patternMap = new TreeMap<>();
TreeMap<String, ByteString> rdnMap = new TreeMap<>();
- for (int i = 0; i < rdn.getNumValues(); i++)
+ for (AVA ava : rdn)
{
- rdnMap.put(rdn.getAttributeType(i).getNameOrOID(),
- rdn.getAttributeValue(i));
+ rdnMap.put(ava.getAttributeType().getNameOrOID(), ava.getAttributeValue());
}
for (int i = 0; i < numValues; i++)
--
Gitblit v1.10.0