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/LastModPlugin.java |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
index 23e7812..daa7275 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -166,13 +166,11 @@
     {
       // This must mean that the operation was performed anonymously.
       // Even so, we still need to update the creatorsName attribute.
-      builder.add(AttributeValues.create(creatorsNameType,
-          ByteString.empty()));
+      builder.add(ByteString.empty());
     }
     else
     {
-      builder.add(AttributeValues.create(creatorsNameType,
-          ByteString.valueOf(creatorDN.toString())));
+      builder.add(creatorDN.toString());
     }
     Attribute nameAttr = builder.toAttribute();
     ArrayList<Attribute> nameList = new ArrayList<Attribute>(1);
@@ -182,9 +180,7 @@
 
     //  Create the attribute list for the createTimestamp attribute.
     Attribute timeAttr = Attributes.create(createTimestampType,
-        OP_ATTR_CREATE_TIMESTAMP,
-        AttributeValues.create(createTimestampType,
-            ByteString.valueOf(getGMTTime())));
+        OP_ATTR_CREATE_TIMESTAMP, getGMTTime());
     ArrayList<Attribute> timeList = new ArrayList<Attribute>(1);
     timeList.add(timeAttr);
     addOperation.setAttribute(createTimestampType, timeList);
@@ -211,13 +207,11 @@
     {
       // This must mean that the operation was performed anonymously.
       // Even so, we still need to update the modifiersName attribute.
-      builder.add(AttributeValues.create(modifiersNameType,
-          ByteString.empty()));
+      builder.add(ByteString.empty());
     }
     else
     {
-      builder.add(AttributeValues.create(modifiersNameType,
-          ByteString.valueOf(modifierDN.toString())));
+      builder.add(modifierDN.toString());
     }
     Attribute nameAttr = builder.toAttribute();
     try
@@ -237,9 +231,7 @@
 
     //  Create the modifyTimestamp attribute.
     Attribute timeAttr = Attributes.create(modifyTimestampType,
-        OP_ATTR_MODIFY_TIMESTAMP,
-        AttributeValues.create(modifyTimestampType,
-            ByteString.valueOf(getGMTTime())));
+        OP_ATTR_MODIFY_TIMESTAMP, getGMTTime());
     try
     {
       modifyOperation.addModification(new Modification(ModificationType.REPLACE,
@@ -276,13 +268,11 @@
     {
       // This must mean that the operation was performed anonymously.
       // Even so, we still need to update the modifiersName attribute.
-      builder.add(AttributeValues.create(modifiersNameType,
-          ByteString.empty()));
+      builder.add(ByteString.empty());
     }
     else
     {
-      builder.add(AttributeValues.create(modifiersNameType,
-          ByteString.valueOf(modifierDN.toString())));
+      builder.add(modifierDN.toString());
     }
     Attribute nameAttr = builder.toAttribute();
     modifyDNOperation.addModification(new Modification(
@@ -291,9 +281,7 @@
 
     // Create the modifyTimestamp attribute.
     Attribute timeAttr = Attributes.create(modifyTimestampType,
-        OP_ATTR_MODIFY_TIMESTAMP,
-        AttributeValues.create(modifyTimestampType,
-            ByteString.valueOf(getGMTTime())));
+        OP_ATTR_MODIFY_TIMESTAMP, getGMTTime());
     modifyDNOperation.addModification(new Modification(
         ModificationType.REPLACE, timeAttr, true));
 

--
Gitblit v1.10.0