From b24aef17bc8d92cc5438783fc38bc290c562b3bf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Nov 2014 16:10:46 +0000
Subject: [PATCH] OPENDJ-1591 (CR-5206) Switch to SDK matching rules
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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/AttributeIndexer.java
similarity index 93%
rename from opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java
rename to opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java
index a65e56c..1812bad 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/AttributeIndexer.java
@@ -42,16 +42,13 @@
import org.opends.server.types.Modification;
/**
- * This class implements an Indexer for extensible matching rules in JE Backend.
+ * This class implements an attribute indexer for matching rules in JE Backend.
*/
-public final class JEExtensibleIndexer extends Indexer
+public final class AttributeIndexer extends Indexer
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The attribute type for which this instance will
- * generate index keys.
- */
+ /** The attribute type for which this instance will generate index keys. */
private final AttributeType attributeType;
/**
@@ -67,7 +64,7 @@
* required.
* @param extensibleIndexer The extensible indexer to be used.
*/
- public JEExtensibleIndexer(AttributeType attributeType, org.forgerock.opendj.ldap.spi.Indexer extensibleIndexer)
+ public AttributeIndexer(AttributeType attributeType, org.forgerock.opendj.ldap.spi.Indexer extensibleIndexer)
{
this.attributeType = attributeType;
this.indexer = extensibleIndexer;
@@ -126,7 +123,10 @@
private void indexAttribute(List<Attribute> attrList, Set<ByteString> keys,
IndexingOptions options)
{
- if (attrList == null) return;
+ if (attrList == null)
+ {
+ return;
+ }
for (Attribute attr : attrList)
{
@@ -147,8 +147,6 @@
}
}
-
-
/**
* Generates the set of index keys for an attribute.
* @param attrList The attribute to be indexed.
@@ -161,7 +159,10 @@
Map<ByteString, Boolean> modifiedKeys, Boolean insert,
IndexingOptions options)
{
- if (attrList == null) return;
+ if (attrList != null)
+ {
+ return;
+ }
final Set<ByteString> keys = new HashSet<ByteString>();
indexAttribute(attrList, keys, options);
--
Gitblit v1.10.0