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/AuthPasswordExactEqualityMatchingRule.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 26333f8..de78205 100644
--- a/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -28,24 +28,21 @@
-import java.util.Arrays;
-
-import java.util.Collections;
-import java.util.Collection;
-import org.opends.server.api.EqualityMatchingRule;
-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.DebugLogLevel;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.schema.SchemaConstants.*;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.ByteSequence;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.DirectoryException;
+
/**
@@ -76,6 +73,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -89,6 +87,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_AUTH_PASSWORD_EXACT_NAME;
@@ -101,6 +100,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_AUTH_PASSWORD_EXACT_OID;
@@ -114,6 +114,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.
@@ -128,6 +129,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_AUTH_PASSWORD_OID;
@@ -146,13 +148,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
{
try
{
StringBuilder[] authPWComponents =
- AuthPasswordSyntax.decodeAuthPassword(value.stringValue());
+ AuthPasswordSyntax.decodeAuthPassword(value.toString());
StringBuilder normalizedValue =
new StringBuilder(2 + authPWComponents[0].length() +
@@ -164,7 +167,7 @@
normalizedValue.append('$');
normalizedValue.append(authPWComponents[2]);
- return new ASN1OctetString(normalizedValue.toString());
+ return ByteString.valueOf(normalizedValue.toString());
}
catch (DirectoryException de)
{
@@ -179,30 +182,11 @@
throw de;
case WARN:
logError(de.getMessageObject());
- return new ASN1OctetString(value.stringValue());
+ return ByteString.valueOf(value.toString());
default:
- return new ASN1OctetString(value.stringValue());
+ return ByteString.valueOf(value.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)
- {
- // Since the values are already normalized, we just need to compare the
- // associated byte arrays.
- return Arrays.equals(value1.value(), value2.value());
- }
}
--
Gitblit v1.10.0