From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index 75abeae..1c724f5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -71,14 +71,10 @@
/** {@inheritDoc} */
@Override()
- public Set<AttributeValue> getValues(Entry entry,
- VirtualAttributeRule rule)
+ public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
String normDNString = entry.getName().toNormalizedString();
- AttributeValue value = AttributeValues.create(
- ByteString.valueOf(normDNString),
- ByteString.valueOf(normDNString));
- return Collections.singleton(value);
+ return Attributes.create(rule.getAttributeType(), normDNString);
}
/** {@inheritDoc} */
@@ -91,15 +87,14 @@
/** {@inheritDoc} */
@Override()
- public boolean hasValue(Entry entry, VirtualAttributeRule rule,
- AttributeValue value)
+ public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
{
try
{
MatchingRule eqRule = rule.getAttributeType().getEqualityMatchingRule();
ByteString dn = ByteString.valueOf(entry.getName().toString());
ByteString normalizedDN = eqRule.normalizeAttributeValue(dn);
- ByteString normalizedValue = eqRule.normalizeAttributeValue(value.getValue());
+ ByteString normalizedValue = eqRule.normalizeAttributeValue(value);
return normalizedDN.equals(normalizedValue);
}
catch (DecodeException e)
@@ -111,18 +106,6 @@
/** {@inheritDoc} */
@Override()
- public boolean hasAnyValue(Entry entry, VirtualAttributeRule rule,
- Collection<AttributeValue> values)
- {
- String ndnString = entry.getName().toNormalizedString();
-
- AttributeValue v = AttributeValues.create(ByteString.valueOf(ndnString),
- ByteString.valueOf(ndnString));
- return values.contains(v);
- }
-
- /** {@inheritDoc} */
- @Override()
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
ByteString subInitial,
@@ -137,7 +120,7 @@
@Override()
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
- AttributeValue value)
+ ByteString value)
{
// DNs cannot be used in ordering matching.
return ConditionResult.UNDEFINED;
@@ -147,7 +130,7 @@
@Override()
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
- AttributeValue value)
+ ByteString value)
{
// DNs cannot be used in ordering matching.
return ConditionResult.UNDEFINED;
@@ -157,7 +140,7 @@
@Override()
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
- AttributeValue value)
+ ByteString value)
{
// DNs cannot be used in approximate matching.
return ConditionResult.UNDEFINED;
@@ -313,7 +296,7 @@
{
try
{
- dnSet.add(DN.decode(filter.getAssertionValue().getValue()));
+ dnSet.add(DN.decode(filter.getAssertionValue()));
}
catch (Exception e)
{
--
Gitblit v1.10.0