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/plugins/ReferentialIntegrityPlugin.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 3a0142f..ee27932 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -45,6 +45,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
@@ -695,7 +696,7 @@
for(AttributeType attributeType : attributeTypes)
{
componentFilters.add(SearchFilter.createEqualityFilter(attributeType,
- AttributeValues.create(attributeType, oldEntryDN.toString())));
+ ByteString.valueOf(oldEntryDN.toString())));
}
InternalClientConnection conn =
@@ -784,15 +785,13 @@
{
if(e.hasAttribute(type))
{
- AttributeValue value = AttributeValues
- .create(type, oldEntryDN.toString());
+ ByteString value = ByteString.valueOf(oldEntryDN.toString());
if (e.hasValue(type, null, value))
{
mods.add(new Modification(ModificationType.DELETE, Attributes
.create(type, value)));
- // If the new entry DN exists, create an ADD modification for
- // it.
+ // If the new entry DN exists, create an ADD modification for it.
if(newEntryDN != null)
{
mods.add(new Modification(ModificationType.ADD, Attributes
@@ -1240,10 +1239,9 @@
final MatchingRule rule = attr.getAttributeType().getEqualityMatchingRule();
try
{
- for (AttributeValue attrVal : attr)
+ for (ByteString attrVal : attr)
{
- DN valueEntryDN =
- DN.decode(rule.normalizeAttributeValue(attrVal.getValue()));
+ DN valueEntryDN = DN.decode(rule.normalizeAttributeValue(attrVal));
final Entry valueEntry;
if (currentConfiguration.getCheckReferencesScopeCriteria()
--
Gitblit v1.10.0