From 4cb8262e95fde77e6a0d2c84f1aa118e3b1ee850 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 06 Nov 2014 14:50:48 +0000
Subject: [PATCH] OPENDJ-1591 CR-5092 Switch server to SDK matching rules

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java
index b344668..85824ee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java
@@ -35,14 +35,13 @@
 import org.forgerock.opendj.ldap.ByteString;
 import org.forgerock.opendj.ldap.DecodeException;
 import org.forgerock.opendj.ldap.spi.IndexingOptions;
-import org.opends.server.api.ExtensibleIndexer;
 import org.opends.server.types.Attribute;
 import org.opends.server.types.AttributeType;
 import org.opends.server.types.Entry;
 import org.opends.server.types.Modification;
 
 /**
- *This class implements an Indexer for extensible matching rules in JE Backend.
+ * This class implements an Indexer for extensible matching rules in JE Backend.
  */
 public final class JEExtensibleIndexer extends Indexer
 {
@@ -54,15 +53,11 @@
    */
   private final AttributeType attributeType;
 
-
-
   /**
-   * The extensible indexer which will generate the keys
-   * for the associated  extensible matching rule.
+   * The indexer which will generate the keys
+   * for the associated extensible matching rule.
    */
-  private final ExtensibleIndexer extensibleIndexer;
-
-
+  private final org.forgerock.opendj.ldap.spi.Indexer indexer;
 
   /**
    * Creates a new extensible indexer for JE backend.
@@ -71,19 +66,17 @@
    *                                            required.
    * @param extensibleIndexer The extensible indexer to be used.
    */
-  public JEExtensibleIndexer(AttributeType attributeType,
-          ExtensibleIndexer extensibleIndexer)
+  public JEExtensibleIndexer(AttributeType attributeType, org.forgerock.opendj.ldap.spi.Indexer extensibleIndexer)
   {
     this.attributeType = attributeType;
-    this.extensibleIndexer = extensibleIndexer;
+    this.indexer = extensibleIndexer;
   }
 
   /** {@inheritDoc} */
   @Override
   public String toString()
   {
-    return attributeType.getNameOrOID() + "."
-            + extensibleIndexer.getExtensibleIndexID();
+    return attributeType.getNameOrOID() + "." + indexer.getIndexID();
   }
 
   /** {@inheritDoc} */
@@ -142,7 +135,7 @@
         {
           try
           {
-            extensibleIndexer.createKeys(null, value, options, keys);
+            indexer.createKeys(null, value, options, keys);
           }
           catch (DecodeException e)
           {

--
Gitblit v1.10.0