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/protocols/internal/InternalClientConnection.java | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index 368d86c..3bc5f69 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -169,7 +169,7 @@
AttributeBuilder builder = new AttributeBuilder(privType);
for (Privilege p : Privilege.getDefaultRootPrivileges())
{
- builder.add(AttributeValues.create(privType, p.getName()));
+ builder.add(p.getName());
}
attrList = new LinkedList<Attribute>();
attrList.add(builder.toAttribute());
@@ -704,8 +704,7 @@
public AddOperation processAdd(String rawEntryDN,
List<RawAttribute> rawAttributes)
{
- return processAdd(ByteString.valueOf(rawEntryDN), rawAttributes,
- null);
+ return processAdd(ByteString.valueOf(rawEntryDN), rawAttributes, null);
}
@@ -880,21 +879,18 @@
LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
new LinkedHashMap<AttributeType,List<Attribute>>();
- Entry e = new Entry(addRecord.getDN(), objectClasses, userAttrs,
- opAttrs);
+ Entry e = new Entry(addRecord.getDN(), objectClasses, userAttrs, opAttrs);
- ArrayList<AttributeValue> duplicateValues =
- new ArrayList<AttributeValue>();
+ ArrayList<ByteString> duplicateValues = new ArrayList<ByteString>();
for (Attribute a : addRecord.getAttributes())
{
if (a.getAttributeType().isObjectClass())
{
- for (AttributeValue v : a)
+ for (ByteString v : a)
{
- String ocName = v.getValue().toString();
+ String ocName = v.toString();
String lowerName = toLowerCase(ocName);
- ObjectClass oc = DirectoryServer.getObjectClass(lowerName,
- true);
+ ObjectClass oc = DirectoryServer.getObjectClass(lowerName, true);
objectClasses.put(oc, ocName);
}
}
@@ -904,8 +900,7 @@
}
}
- return processAdd(addRecord.getDN(), objectClasses, userAttrs,
- opAttrs);
+ return processAdd(addRecord.getDN(), objectClasses, userAttrs, opAttrs);
}
@@ -926,8 +921,7 @@
String password)
{
return processSimpleBind(ByteString.valueOf(rawBindDN),
- ByteString.valueOf(password),
- null);
+ ByteString.valueOf(password), null);
}
@@ -1184,8 +1178,7 @@
String attributeType,
String assertionValue)
{
- return processCompare(ByteString.valueOf(rawEntryDN),
- attributeType,
+ return processCompare(ByteString.valueOf(rawEntryDN), attributeType,
ByteString.valueOf(assertionValue), null);
}
@@ -1212,10 +1205,8 @@
String assertionValue,
List<Control> controls)
{
- return processCompare(ByteString.valueOf(rawEntryDN),
- attributeType,
- ByteString.valueOf(assertionValue),
- controls);
+ return processCompare(ByteString.valueOf(rawEntryDN), attributeType,
+ ByteString.valueOf(assertionValue), controls);
}
@@ -1791,8 +1782,7 @@
String rawNewSuperior)
{
return processModifyDN(ByteString.valueOf(rawEntryDN),
- ByteString.valueOf(rawNewRDN),
- deleteOldRDN,
+ ByteString.valueOf(rawNewRDN), deleteOldRDN,
ByteString.valueOf(rawNewSuperior), null);
}
@@ -1823,10 +1813,8 @@
List<Control> controls)
{
return processModifyDN(ByteString.valueOf(rawEntryDN),
- ByteString.valueOf(rawNewRDN),
- deleteOldRDN,
- ByteString.valueOf(rawNewSuperior),
- controls);
+ ByteString.valueOf(rawNewRDN), deleteOldRDN,
+ ByteString.valueOf(rawNewSuperior), controls);
}
@@ -2039,8 +2027,7 @@
le.getErrorMessage(), le);
}
- return processSearch(ByteString.valueOf(rawBaseDN), scope,
- rawFilter);
+ return processSearch(ByteString.valueOf(rawBaseDN), scope, rawFilter);
}
--
Gitblit v1.10.0