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/BooleanConfigAttribute.java | 47 +++++++++++++----------------------------------
1 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 9dd1fca..67ac6da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.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.Iterator;
import java.util.LinkedHashSet;
@@ -41,16 +40,12 @@
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.opends.server.types.AttributeValues;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class defines a Boolean configuration attribute, which can hold a single
* Boolean value of <CODE>true</CODE> or <CODE>false</CODE>. Boolean
@@ -236,23 +231,11 @@
*
* @return The value set constructed from the provided value.
*/
- private static LinkedHashSet<AttributeValue> getValueSet(boolean booleanValue)
+ private static LinkedHashSet<ByteString> getValueSet(boolean booleanValue)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- if (booleanValue)
- {
- valueSet.add(AttributeValues.create(
- ByteString.valueOf(CONFIG_VALUE_TRUE),
- ByteString.valueOf(CONFIG_VALUE_TRUE)));
- }
- else
- {
- valueSet.add(AttributeValues.create(
- ByteString.valueOf(CONFIG_VALUE_FALSE),
- ByteString.valueOf(CONFIG_VALUE_FALSE)));
- }
-
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ valueSet.add(ByteString.valueOf(
+ booleanValue ? CONFIG_VALUE_TRUE : CONFIG_VALUE_FALSE));
return valueSet;
}
@@ -288,10 +271,10 @@
* @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,
+ public boolean valueIsAcceptable(ByteString value,
StringBuilder rejectReason)
{
- String stringValue = value.getValue().toString();
+ String stringValue = value.toString();
if (stringValue.equalsIgnoreCase(CONFIG_VALUE_TRUE) ||
stringValue.equalsIgnoreCase(CONFIG_VALUE_FALSE))
{
@@ -324,10 +307,8 @@
* @throws ConfigException If an unrecoverable problem occurs while
* performing the conversion.
*/
- public LinkedHashSet<AttributeValue>
- stringsToValues(List<String> valueStrings,
- boolean allowFailures)
- throws ConfigException
+ public LinkedHashSet<ByteString> stringsToValues(List<String> valueStrings,
+ boolean allowFailures) throws ConfigException
{
if ((valueStrings == null) || valueStrings.isEmpty())
{
@@ -466,9 +447,8 @@
else
{
// Get the value and parse it as a Boolean.
- Iterator<AttributeValue> iterator = a.iterator();
- String valueString =
- iterator.next().getValue().toString().toLowerCase();
+ Iterator<ByteString> iterator = a.iterator();
+ String valueString = iterator.next().toString().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
valueString.equals("on") || valueString.equals("1"))
@@ -529,9 +509,8 @@
else
{
// Get the value and parse it as a Boolean.
- Iterator<AttributeValue> iterator = a.iterator();
- String valueString =
- iterator.next().getValue().toString().toLowerCase();
+ Iterator<ByteString> iterator = a.iterator();
+ String valueString = iterator.next().toString().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
valueString.equals("on") || valueString.equals("1"))
--
Gitblit v1.10.0