From 54e2d7e8d76a809ad6c57678cbc119fe04da43c2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 11 Mar 2014 13:54:04 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3157) Remove AttributeValue
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java | 6 +++---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java | 25 +++++++++----------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
index ef024c9..458df29 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
@@ -26,23 +26,20 @@
*/
package org.opends.server.backends.jeb;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.DN;
-import org.opends.server.types.RDN;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.util.StaticUtils;
-
-import java.util.TreeSet;
import java.util.Iterator;
+import java.util.TreeSet;
+
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.RDN;
+import org.opends.server.util.StaticUtils;
/**
* Handles the disk representation of LDAP data.
*/
public class JebFormat
{
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/**
* The format version used by this class to encode and decode a DatabaseEntry.
@@ -102,10 +99,7 @@
}
return v;
}
- else
- {
- return Long.MAX_VALUE;
- }
+ return Long.MAX_VALUE;
}
/**
@@ -351,13 +345,12 @@
for (int i=0; i < rdn.getNumValues(); i++)
{
StringBuilder b2 = new StringBuilder();
- rdn.getAVAString(i, b2);
+ rdn.getNormalizedAVAString(i, b2);
rdnElementStrings.add(b2.toString());
}
Iterator<String> iterator = rdnElementStrings.iterator();
buffer.append(iterator.next().replace("\u0001", "\\\u0001"));
-
while (iterator.hasNext())
{
buffer.append('\u0001');
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
index 78fe381..7134035 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
@@ -1012,7 +1012,7 @@
if (attributeNames.length == 1)
{
- getAVAString(0, buffer);
+ getNormalizedAVAString(0, buffer);
}
else
{
@@ -1022,7 +1022,7 @@
for (int i=0; i < attributeNames.length; i++)
{
StringBuilder b2 = new StringBuilder();
- getAVAString(i, b2);
+ getNormalizedAVAString(i, b2);
rdnElementStrings.add(b2.toString());
}
@@ -1051,7 +1051,7 @@
* retrieve.
* @param buffer The buffer to which to append the information.
*/
- public void getAVAString(int pos, StringBuilder buffer)
+ public void getNormalizedAVAString(int pos, StringBuilder buffer)
{
AttributeType type = attributeTypes[pos];
buffer.append(type.getNormalizedPrimaryNameOrOID());
--
Gitblit v1.10.0