From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index fb200ec..d35129b 100644
--- a/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -28,23 +28,21 @@
-import java.util.Arrays;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.schema.SchemaConstants.*;
-import java.util.Collections;
import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.messages.Message;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-
-import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.types.ByteSequence;
import org.opends.server.types.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.messages.SchemaMessages.*;
-import org.opends.messages.Message;
-import static org.opends.server.schema.SchemaConstants.*;
-
/**
* This class defines the bitStringMatch matching rule defined in X.520 and
@@ -66,6 +64,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -79,6 +78,7 @@
* @return The common name for this matching rule, or <CODE>null</CODE> if
* it does not have a name.
*/
+ @Override
public String getName()
{
return EMR_BIT_STRING_NAME;
@@ -91,6 +91,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_BIT_STRING_OID;
@@ -104,6 +105,7 @@
* @return The description for this matching rule, or <CODE>null</CODE> if
* there is none.
*/
+ @Override
public String getDescription()
{
// There is no standard description for this matching rule.
@@ -118,6 +120,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_BIT_STRING_OID;
@@ -136,17 +139,18 @@
* @throws DirectoryException If the provided value is invalid according to
* the associated attribute syntax.
*/
- public ByteString normalizeValue(ByteString value)
+ @Override
+ public ByteString normalizeValue(ByteSequence value)
throws DirectoryException
{
- String valueString = value.stringValue().toUpperCase();
+ String valueString = value.toString().toUpperCase();
int length = valueString.length();
if (length < 3)
{
Message message = WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT.get(
- value.stringValue());
+ value.toString());
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
@@ -154,9 +158,9 @@
message);
case WARN:
logError(message);
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
default:
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
}
}
@@ -167,7 +171,7 @@
{
Message message = WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED.get(
- value.stringValue());
+ value.toString());
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
@@ -177,9 +181,9 @@
case WARN:
logError(
message);
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
default:
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
}
}
@@ -195,7 +199,7 @@
default:
Message message = WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT.get(
- value.stringValue(), String.valueOf(valueString.charAt(i)));
+ value.toString(), String.valueOf(valueString.charAt(i)));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
@@ -204,33 +208,14 @@
message);
case WARN:
logError(message);
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
default:
- return new ASN1OctetString(valueString);
+ return ByteString.valueOf(valueString);
}
}
}
- return new ASN1OctetString(valueString);
- }
-
-
-
- /**
- * Indicates whether the two provided normalized values are equal to each
- * other.
- *
- * @param value1 The normalized form of the first value to compare.
- * @param value2 The normalized form of the second value to compare.
- *
- * @return <CODE>true</CODE> if the provided values are equal, or
- * <CODE>false</CODE> if not.
- */
- public boolean areEqual(ByteString value1, ByteString value2)
- {
- // Since the values are already normalized, we just need to compare the
- // associated byte arrays.
- return Arrays.equals(value1.value(), value2.value());
+ return ByteString.valueOf(valueString);
}
}
--
Gitblit v1.10.0