OPENDJ-1591 Switch to SDK matching rules

Jean-Noel Rouvignac

06.20.2014 7498fb6c84105230f0ec3d52956e4f740004abde

OPENDJ-1591 Switch to SDK matching rules

After r11260 some code cleanup can be performed.

ExtensibleIndexer.java: REMOVED
Replaced with org.forgerock.opendj.ldap.spi.Indexer.

 opendj3-server-dev/src/server/org/opends/server/api/ExtensibleIndexer.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java

@@ -31,6 +31,7 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.spi.IndexQueryFactory;
import org.forgerock.opendj.ldap.spi.Indexer;

/**
 * This interface defines the set of methods that must be
@@ -51,9 +52,7 @@
   * @return The collection of extensible indexers associated with this matching
   *         rule.
   */
  Collection<ExtensibleIndexer> getIndexers();


  Collection<Indexer> getIndexers();

  /**
   * Returns an index query appropriate for the provided attribute

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java

@@ -31,16 +31,16 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.api.ExtensibleIndexer;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.Indexer;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.types.AttributeType;

/**
 * An implementation of an Indexer for attribute approximate matching.
 */
public class ApproximateIndexer extends ExtensibleIndexer
public class ApproximateIndexer implements Indexer
{

  /**
@@ -68,13 +68,6 @@

  /** {@inheritDoc} */
  @Override
  public String getExtensibleIndexID()
  {
    throw new RuntimeException("Code is not implemented");
  }

  /** {@inheritDoc} */
  @Override
  public void createKeys(Schema schema, ByteSequence value,
      IndexingOptions options, Collection<ByteString> keys)
      throws DecodeException

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java

@@ -44,7 +44,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
import org.opends.server.api.ExtensibleIndexer;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
@@ -1094,7 +1093,7 @@
  }

  private void applyChangeToIndex(LocalDBIndexCfg cfg, AttributeType attrType,
      String name, IndexType indexType, ExtensibleIndexer indexer,
      String name, IndexType indexType, org.forgerock.opendj.ldap.spi.Indexer indexer,
      AtomicBoolean adminActionRequired, ArrayList<LocalizableMessage> messages)
  {
    final int indexEntryLimit = cfg.getIndexEntryLimit();
@@ -1142,7 +1141,7 @@
  }

  private Index openNewIndex(String name, AttributeType attrType,
      int indexEntryLimit, ExtensibleIndexer indexer,
      int indexEntryLimit, org.forgerock.opendj.ldap.spi.Indexer indexer,
      AtomicBoolean adminActionRequired, ArrayList<LocalizableMessage> messages)
  {
    final String indexName = name + "." + indexer.getIndexID();

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/EqualityIndexer.java

@@ -31,16 +31,16 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.api.ExtensibleIndexer;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.Indexer;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.types.AttributeType;

/**
 * An implementation of an Indexer for attribute equality.
 */
public class EqualityIndexer extends ExtensibleIndexer
public class EqualityIndexer implements Indexer
{

  /**
@@ -68,13 +68,6 @@

  /** {@inheritDoc} */
  @Override
  public String getExtensibleIndexID()
  {
    throw new RuntimeException("Code is not implemented");
  }

  /** {@inheritDoc} */
  @Override
  public void createKeys(Schema schema, ByteSequence value,
      IndexingOptions options, Collection<ByteString> keys)
      throws DecodeException

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java

@@ -31,16 +31,16 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.api.ExtensibleIndexer;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.Indexer;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.types.AttributeType;

/**
 * An implementation of an Indexer for attribute ordering.
 */
public class OrderingIndexer extends ExtensibleIndexer
public class OrderingIndexer implements Indexer
{

  /**
@@ -69,13 +69,6 @@

  /** {@inheritDoc} */
  @Override
  public String getExtensibleIndexID()
  {
    throw new RuntimeException("Code is not implemented");
  }

  /** {@inheritDoc} */
  @Override
  public void createKeys(Schema schema, ByteSequence value,
      IndexingOptions options, Collection<ByteString> keys)
      throws DecodeException

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java

@@ -31,16 +31,16 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.api.ExtensibleIndexer;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.spi.Indexer;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.types.AttributeType;

/**
 * An implementation of an Indexer for attribute substrings.
 */
public class SubstringIndexer extends ExtensibleIndexer
public class SubstringIndexer implements Indexer
{

  private final MatchingRule substringRule;
@@ -65,13 +65,6 @@

  /** {@inheritDoc} */
  @Override
  public String getExtensibleIndexID()
  {
    throw new RuntimeException("Code is not implemented");
  }

  /** {@inheritDoc} */
  @Override
  public void createKeys(Schema schema, ByteSequence value,
      IndexingOptions options, Collection<ByteString> keys)
      throws DecodeException