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/GeneralizedTimeOrderingMatchingRule.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 54335ee..01c02e0 100644
--- a/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -28,20 +28,21 @@
-import java.util.Collection;
-import java.util.Collections;
-import org.opends.server.api.OrderingMatchingRule;
-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.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.*;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.server.api.OrderingMatchingRule;
+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;
+
/**
@@ -81,6 +82,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Collection<String> getAllNames()
{
return Collections.singleton(getName());
@@ -94,6 +96,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_GENERALIZED_TIME_NAME;
@@ -106,6 +109,7 @@
*
* @return The OID for this matching rule.
*/
+ @Override
public String getOID()
{
return OMR_GENERALIZED_TIME_OID;
@@ -119,6 +123,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.
@@ -133,6 +138,7 @@
*
* @return The OID of the syntax with which this matching rule is associated.
*/
+ @Override
public String getSyntaxOID()
{
return SYNTAX_GENERALIZED_TIME_OID;
@@ -151,13 +157,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)
{
@@ -173,10 +180,10 @@
case WARN:
logError(de.getMessageObject());
- return new ASN1OctetString(value.value());
+ return value.toByteString();
default:
- return new ASN1OctetString(value.value());
+ return value.toByteString();
}
}
}
@@ -196,7 +203,8 @@
* 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)
{
try
{
@@ -244,7 +252,7 @@
*/
public int compare(byte[] b1, byte[] b2)
{
- return compareValues(new ASN1OctetString(b1), new ASN1OctetString(b2));
+ return compareValues(ByteString.wrap(b1), ByteString.wrap(b2));
}
}
--
Gitblit v1.10.0