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/UUIDEqualityMatchingRule.java | 87 ++++++++++++++++++-------------------------
1 files changed, 37 insertions(+), 50 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 05ea4e5..0baa1b8 100644
--- a/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.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.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.*;
-
/**
@@ -67,6 +65,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -80,6 +79,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_UUID_NAME;
@@ -92,6 +92,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_UUID_OID;
@@ -105,6 +106,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.
@@ -119,6 +121,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_UUID_OID;
@@ -137,14 +140,14 @@
* @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();
- if (valueBytes.length != 36)
+ if (value.length() != 36)
{
Message message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(
- value.stringValue(), valueBytes.length);
+ value.toString(), value.length());
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
@@ -152,28 +155,29 @@
message);
case WARN:
logError(message);
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
default:
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
}
}
- byte[] normBytes = new byte[36];
- System.arraycopy(valueBytes, 0, normBytes, 0, 36);
+ StringBuilder builder = new StringBuilder(36);
+ char c;
for (int i=0; i < 36; i++)
{
// The 9th, 14th, 19th, and 24th characters must be dashes. All others
// must be hex. Convert all uppercase hex characters to lowercase.
+ c = (char)value.byteAt(i);
switch (i)
{
case 8:
case 13:
case 18:
case 23:
- if (normBytes[i] != '-')
+ if (c != '-')
{
Message message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
- value.stringValue(), i, String.valueOf(normBytes[i]));
+ value.toString(), i, String.valueOf(c));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
@@ -182,14 +186,15 @@
case WARN:
logError(
message);
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
default:
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
}
}
+ builder.append(c);
break;
default:
- switch (normBytes[i])
+ switch (c)
{
case '0':
case '1':
@@ -208,28 +213,29 @@
case 'e':
case 'f':
// These are all fine.
+ builder.append(c);
break;
case 'A':
- normBytes[i] = 'a';
+ builder.append('a');
break;
case 'B':
- normBytes[i] = 'b';
+ builder.append('b');
break;
case 'C':
- normBytes[i] = 'c';
+ builder.append('c');
break;
case 'D':
- normBytes[i] = 'd';
+ builder.append('d');
break;
case 'E':
- normBytes[i] = 'e';
+ builder.append('e');
break;
case 'F':
- normBytes[i] = 'f';
+ builder.append('f');
break;
default:
Message message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
- value.stringValue(), i, String.valueOf(normBytes[i]));
+ value.toString(), i, String.valueOf(value.byteAt(i)));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
@@ -238,34 +244,15 @@
case WARN:
logError(
message);
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
default:
- return new ASN1OctetString(valueBytes);
+ return value.toByteString();
}
}
}
}
- return new ASN1OctetString(normBytes);
- }
-
-
-
- /**
- * 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(builder.toString());
}
}
--
Gitblit v1.10.0