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/GeneralizedTimeEqualityMatchingRule.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index 40e8522..2d22cc6 100644
--- a/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -28,19 +28,21 @@
-import java.util.Collections;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+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.protocols.asn1.ASN1OctetString;
+import org.opends.server.types.ByteSequence;
import org.opends.server.types.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.schema.SchemaConstants.*;
/**
@@ -70,6 +72,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -83,6 +86,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_GENERALIZED_TIME_NAME;
@@ -95,6 +99,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return EMR_GENERALIZED_TIME_OID;
@@ -108,6 +113,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.
@@ -122,6 +128,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_GENERALIZED_TIME_OID;
@@ -140,13 +147,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
{
long timestamp = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(value);
- return new ASN1OctetString(GeneralizedTimeSyntax.format(timestamp));
+ return ByteString.valueOf(GeneralizedTimeSyntax.format(timestamp));
}
catch (DirectoryException de)
{
@@ -162,10 +170,10 @@
case WARN:
logError(de.getMessageObject());
- return new ASN1OctetString(value.value());
+ return value.toByteString();
default:
- return new ASN1OctetString(value.value());
+ return value.toByteString();
}
}
}
@@ -182,7 +190,8 @@
* @return <CODE>true</CODE> if the provided values are equal, or
* <CODE>false</CODE> if not.
*/
- public boolean areEqual(ByteString value1, ByteString value2)
+ @Override
+ public boolean areEqual(ByteSequence value1, ByteSequence value2)
{
try
{
--
Gitblit v1.10.0