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/util/LDIFReader.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index fd35864..3e5bc58 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -1114,7 +1114,7 @@
}
}
- AttributeValue attributeValue = AttributeValues.create(attrType, value);
+ ByteString attributeValue = value;
final Map<AttributeType, List<AttributeBuilder>> attrBuilders;
if (attrType.isOperational())
{
@@ -1214,9 +1214,7 @@
colonPos, attrName);
AttributeBuilder builder = new AttributeBuilder(attribute, true);
- AttributeType attrType = attribute.getAttributeType();
- builder.add(AttributeValues.create(attrType, value));
-
+ builder.add(value);
return builder.toAttribute();
}
@@ -1551,7 +1549,7 @@
{
Attribute attr =
readSingleValueAttribute(lines, line, entryDN, attributeName);
- return attr.iterator().next().getValue().toString();
+ return attr.iterator().next().toString();
}
@@ -1578,7 +1576,7 @@
String name = attr.getName();
// Get the attribute description
- String attrDescr = attr.iterator().next().getValue().toString();
+ String attrDescr = attr.iterator().next().toString();
ModificationType modType;
String lowerName = toLowerCase(name);
@@ -1681,7 +1679,7 @@
AttributeType ocType = DirectoryServer.getObjectClassAttributeType();
AttributeBuilder builder = new AttributeBuilder(ocType, "objectClass");
for (String value : objectClasses.values()) {
- builder.add(AttributeValues.create(ocType, value));
+ builder.add(value);
}
Map<AttributeType, List<Attribute>> attributes =
toAttributesMap(attrBuilders);
@@ -1924,7 +1922,7 @@
for (int i=0; i < numAVAs; i++)
{
AttributeType t = rdn.getAttributeType(i);
- AttributeValue v = rdn.getAttributeValue(i);
+ ByteString v = rdn.getAttributeValue(i);
String n = rdn.getAttributeName(i);
if (t.isOperational())
{
@@ -1940,7 +1938,7 @@
private void addRDNAttributesIfNecessary(
Map<AttributeType, List<Attribute>> attributes, AttributeType t,
- AttributeValue v, String n)
+ ByteString v, String n)
{
List<Attribute> attrList = attributes.get(t);
if (attrList == null)
--
Gitblit v1.10.0