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/UserPasswordEqualityMatchingRule.java | 65 +++++++++++---------------------
1 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 61ba9dc..de1337f 100644
--- a/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -28,23 +28,21 @@
-import java.util.Arrays;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.schema.SchemaConstants.*;
-import java.util.Collections;
import java.util.Collection;
+import java.util.Collections;
+
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.ByteSequence;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;
-import org.opends.server.types.DirectoryException;
-
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.schema.SchemaConstants.*;
+import org.opends.server.types.DirectoryException;
@@ -75,6 +73,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -88,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_USER_PASSWORD_NAME;
@@ -100,6 +100,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_USER_PASSWORD_OID;
@@ -113,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.
@@ -127,6 +129,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_USER_PASSWORD_OID;
@@ -145,39 +148,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
{
- // We will not alter the value in any way, but we'll create a new value
- // just in case something else is using the underlying array.
- byte[] currentValue = value.value();
- byte[] newValue = new byte[currentValue.length];
- System.arraycopy(currentValue, 0, newValue, 0, currentValue.length);
-
- return new ASN1OctetString(newValue);
+ // We will not alter the value in any way
+ return value.toByteString();
}
-
- /**
- * 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());
- }
-
-
-
/**
* Indicates whether the provided attribute value should be considered a match
* for the given assertion value. This will only be used for the purpose of
@@ -193,8 +172,9 @@
* match for the provided assertion value, or <CODE>false</CODE> if
* not.
*/
- public ConditionResult valuesMatch(ByteString attributeValue,
- ByteString assertionValue)
+ @Override
+ public ConditionResult valuesMatch(ByteSequence attributeValue,
+ ByteSequence assertionValue)
{
// We must be able to decode the attribute value using the user password
// syntax.
@@ -202,7 +182,7 @@
try
{
userPWComponents =
- UserPasswordSyntax.decodeUserPassword(attributeValue.stringValue());
+ UserPasswordSyntax.decodeUserPassword(attributeValue.toString());
}
catch (Exception e)
{
@@ -228,7 +208,7 @@
// We support the scheme, so make the determination.
if (storageScheme.passwordMatches(assertionValue,
- new ASN1OctetString(userPWComponents[1])))
+ ByteString.valueOf(userPWComponents[1])))
{
return ConditionResult.TRUE;
}
@@ -254,7 +234,8 @@
*
* @return The hash code generated for the provided attribute value.
*/
- public int generateHashCode(AttributeValue attributeValue)
+ @Override
+ public int generateHashCode(ByteSequence attributeValue)
{
// Because of the variable encoding that may be used, we have no way of
// comparing two user password values by hash code and therefore we'll
--
Gitblit v1.10.0