From 0c7ecbc4e3c91aa10086a9be077f97f25cd8ff0d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 09:32:37 +0000
Subject: [PATCH] OPENDJ-1591 (CR-5256) Switch to SDK matching rules
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
index 723405c..8481f8b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.Set;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.backends.jeb.AttributeIndex.BSKeyComparator;
@@ -45,12 +46,6 @@
public abstract class Indexer
{
/**
- * The comparator for keys generated by this class.
- */
- private static final KeyComparator comparator = new KeyComparator();
- private static final BSKeyComparator bsComparator = new BSKeyComparator();
-
- /**
* Get the comparator that must be used to compare index keys generated by
* this class.
*
@@ -58,7 +53,7 @@
*/
public final Comparator<byte[]> getComparator()
{
- return comparator;
+ return KeyComparator.INSTANCE;
}
/**
@@ -67,9 +62,9 @@
*
* @return A byte string comparator.
*/
- public final Comparator<ByteString> getBSComparator()
+ public final Comparator<ByteSequence> getBSComparator()
{
- return bsComparator;
+ return BSKeyComparator.INSTANCE;
}
/**
@@ -112,5 +107,6 @@
* used to name an index created using this object.
* @return A string representation of this object.
*/
+ @Override
public abstract String toString();
}
--
Gitblit v1.10.0