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/NumericStringOrderingMatchingRule.java | 71 +++++++++++++----------------------
1 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 54a82ac..6134cfb 100644
--- a/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -25,23 +25,26 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.schema;
-import java.util.Collection;
-import java.util.Collections;
-import org.opends.messages.Message;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
-
import static org.opends.messages.SchemaMessages.*;
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.messages.Message;
+import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
+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 org.opends.server.util.StaticUtils;
+
/**
@@ -74,6 +77,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -87,6 +91,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 OMR_NUMERIC_STRING_NAME;
@@ -99,6 +104,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return OMR_NUMERIC_STRING_OID;
@@ -112,6 +118,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.
@@ -126,6 +133,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_NUMERIC_STRING_OID;
@@ -144,10 +152,11 @@
* @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();
+ String valueString = value.toString();
int valueLength = valueString.length();
StringBuilder valueBuffer = new StringBuilder(valueLength);
@@ -181,7 +190,7 @@
}
}
- return new ASN1OctetString(getBytes(valueBuffer.toString()));
+ return ByteString.valueOf(valueBuffer.toString());
}
@@ -199,9 +208,10 @@
* ascending order, or zero if there is no difference between the
* values with regard to ordering.
*/
- public int compareValues(ByteString value1, ByteString value2)
+ @Override
+ public int compareValues(ByteSequence value1, ByteSequence value2)
{
- return compare(value1.value(), value2.value());
+ return StaticUtils.compare(value1, value2);
}
@@ -221,36 +231,7 @@
*/
public int compare(byte[] b1, byte[] b2)
{
- int minLength = Math.min(b1.length, b2.length);
-
- for (int i=0; i < minLength; i++)
- {
- if (b1[i] == b2[i])
- {
- continue;
- }
- else if (b1[i] < b2[i])
- {
- return -1;
- }
- else if (b1[i] > b2[i])
- {
- return 1;
- }
- }
-
- if (b1.length == b2.length)
- {
- return 0;
- }
- else if (b1.length < b2.length)
- {
- return -1;
- }
- else
- {
- return 1;
- }
+ return StaticUtils.compare(b1, b2);
}
}
--
Gitblit v1.10.0