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/config/ReadOnlyConfigAttribute.java | 59 +++++++++++++++++++----------------------------------------
1 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index 7c7e03e..e363ed4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -25,10 +25,9 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
@@ -39,9 +38,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeValue;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.AttributeValues;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ConfigMessages.*;
@@ -276,14 +273,10 @@
*
* @return The constructed value set.
*/
- private static LinkedHashSet<AttributeValue> getValueSet(String value)
+ private static LinkedHashSet<ByteString> getValueSet(String value)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
-
- valueSet.add(AttributeValues.create(ByteString.valueOf(value),
- ByteString.valueOf(value)));
-
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ valueSet.add(ByteString.valueOf(value));
return valueSet;
}
@@ -296,23 +289,13 @@
*
* @return The constructed value set.
*/
- private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
+ private static LinkedHashSet<ByteString> getValueSet(List<String> values)
{
- if (values == null)
+ if (values != null)
{
- return null;
+ return toByteStrings(values);
}
-
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(values.size());
-
- for (String value : values)
- {
- valueSet.add(AttributeValues.create(ByteString.valueOf(value),
- ByteString.valueOf(value)));
- }
-
- return valueSet;
+ return null;
}
@@ -340,8 +323,7 @@
* @return <CODE>true</CODE> if the provided value is acceptable for use in
* this attribute, or <CODE>false</CODE> if not.
*/
- public boolean valueIsAcceptable(AttributeValue value,
- StringBuilder rejectReason)
+ public boolean valueIsAcceptable(ByteString value, StringBuilder rejectReason)
{
rejectReason.append(ERR_CONFIG_ATTR_READ_ONLY.get(getName()));
return false;
@@ -368,27 +350,24 @@
* @throws ConfigException If an unrecoverable problem occurs while
* performing the conversion.
*/
- public LinkedHashSet<AttributeValue>
- stringsToValues(List<String> valueStrings,
- boolean allowFailures)
+ public LinkedHashSet<ByteString>
+ stringsToValues(List<String> valueStrings, boolean allowFailures)
throws ConfigException
{
if ((valueStrings == null) || valueStrings.isEmpty())
{
- return new LinkedHashSet<AttributeValue>();
+ return new LinkedHashSet<ByteString>();
}
+ return toByteStrings(valueStrings);
+ }
-
- int numValues = valueStrings.size();
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(numValues);
- for (String valueString : valueStrings)
+ private static LinkedHashSet<ByteString> toByteStrings(List<String> strings)
+ {
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(strings.size());
+ for (String valueString : strings)
{
- valueSet.add(AttributeValues.create(ByteString.valueOf(valueString),
- ByteString.valueOf(valueString)));
+ valueSet.add(ByteString.valueOf(valueString));
}
-
-
return valueSet;
}
--
Gitblit v1.10.0