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/CaseIgnoreEqualityMatchingRule.java | 83 ++++++++++++++---------------------------
1 files changed, 28 insertions(+), 55 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index 2f028de..c10f44e 100644
--- a/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -28,16 +28,18 @@
-import java.util.Collection;
-import java.util.Collections;
-import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.types.ByteSequence;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.util.ServerConstants;
+
/**
@@ -60,6 +62,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -73,6 +76,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_CASE_IGNORE_NAME;
@@ -85,6 +89,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_CASE_IGNORE_OID;
@@ -98,6 +103,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.
@@ -112,6 +118,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_DIRECTORY_STRING_OID;
@@ -130,15 +137,15 @@
* @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
{
- byte[] valueBytes = value.value();
- int valueLength = valueBytes.length;
+ int valueLength = value.length();
// Find the first non-space character.
int startPos = 0;
- while ((startPos < valueLength) && (valueBytes[startPos] == ' '))
+ while ((startPos < valueLength) && (value.byteAt(startPos) == ' '))
{
startPos++;
}
@@ -147,13 +154,13 @@
{
// This should only happen if the value is composed entirely of spaces.
// In that case, the normalized value is a single space.
- return new ASN1OctetString(" ");
+ return ServerConstants.SINGLE_SPACE_VALUE;
}
// Find the last non-space character;
int endPos = (valueLength-1);
- while ((endPos > startPos) && (valueBytes[endPos] == ' '))
+ while ((endPos > startPos) && (value.byteAt(endPos) == ' '))
{
endPos--;
}
@@ -166,7 +173,7 @@
boolean lastWasSpace = false;
for (int i=startPos; i <= endPos; i++)
{
- byte b = valueBytes[i];
+ byte b = value.byteAt(i);
if ((b & 0x7F) != b)
{
return normalizeNonASCII(value);
@@ -293,7 +300,7 @@
}
- return new ASN1OctetString(buffer.toString());
+ return ByteString.valueOf(buffer.toString());
}
@@ -305,24 +312,24 @@
*
* @return The normalized form of the provided value.
*/
- private ByteString normalizeNonASCII(ByteString value)
+ private ByteString normalizeNonASCII(ByteSequence value)
{
StringBuilder buffer = new StringBuilder();
- toLowerCase(value.value(), buffer, true);
+ toLowerCase(value.toString(), buffer);
int bufferLength = buffer.length();
if (bufferLength == 0)
{
- if (value.value().length > 0)
+ if (value.length() > 0)
{
// This should only happen if the value is composed entirely of spaces.
// In that case, the normalized value is a single space.
- return new ASN1OctetString(" ");
+ return ServerConstants.SINGLE_SPACE_VALUE;
}
else
{
// The value is empty, so it is already normalized.
- return new ASN1OctetString();
+ return ByteString.empty();
}
}
@@ -339,41 +346,7 @@
}
}
- return new ASN1OctetString(buffer.toString());
- }
-
-
-
- /**
- * 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)
- {
- byte[] b1 = value1.value();
- byte[] b2 = value2.value();
-
- int length = b1.length;
- if (b2.length != length)
- {
- return false;
- }
-
- for (int i=0; i < length; i++)
- {
- if (b1[i] != b2[i])
- {
- return false;
- }
- }
-
- return true;
+ return ByteString.valueOf(buffer.toString());
}
}
--
Gitblit v1.10.0