directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1538477 [1/2] - in /directory/apacheds/trunk: core-annotations/src/main/java/org/apache/directory/server/core/factory/ jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-partition/src/test/java/or...
Date Sun, 03 Nov 2013 23:25:47 GMT
Author: elecharny
Date: Sun Nov  3 23:25:46 2013
New Revision: 1538477

URL: http://svn.apache.org/r1538477
Log:
o Removed the third parameter of the Index interface.
o Reflected the change o, the JDBM/AVL/Mavibot idexes

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/MavibotPartitionFactory.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotDnIndex.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java
    directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndexTest.java
    directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndexTest.java
    directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Sun Nov  3 23:25:46 2013
@@ -69,9 +69,9 @@ public class AvlPartitionFactory impleme
         }
 
         AvlPartition avlPartition = ( AvlPartition ) partition;
-        Set<Index<?, ?, String>> indexedAttributes = avlPartition.getIndexedAttributes();
+        Set<Index<?, String>> indexedAttributes = avlPartition.getIndexedAttributes();
 
-        AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId, false );
+        AvlIndex<Object> index = new AvlIndex<Object>( attributeId, false );
         //index.setCacheSize( cacheSize );
 
         indexedAttributes.add( index );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Sun Nov  3 23:25:46 2013
@@ -69,9 +69,9 @@ public class JdbmPartitionFactory implem
         }
 
         JdbmPartition jdbmPartition = ( JdbmPartition ) partition;
-        Set<Index<?, ?, String>> indexedAttributes = jdbmPartition.getIndexedAttributes();
+        Set<Index<?, String>> indexedAttributes = jdbmPartition.getIndexedAttributes();
 
-        JdbmIndex<Object, Entry> index = new JdbmIndex<Object, Entry>( attributeId, false );
+        JdbmIndex<Object> index = new JdbmIndex<Object>( attributeId, false );
         index.setCacheSize( cacheSize );
 
         indexedAttributes.add( index );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Sun Nov  3 23:25:46 2013
@@ -69,9 +69,9 @@ public class LdifPartitionFactory implem
         }
 
         LdifPartition ldifPartition = ( LdifPartition ) partition;
-        Set<Index<?, ?, String>> indexedAttributes = ldifPartition.getIndexedAttributes();
+        Set<Index<?, String>> indexedAttributes = ldifPartition.getIndexedAttributes();
 
-        AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId, false );
+        AvlIndex<Object> index = new AvlIndex<Object>( attributeId, false );
         //index.setCacheSize( cacheSize );
 
         indexedAttributes.add( index );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/MavibotPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/MavibotPartitionFactory.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/MavibotPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/MavibotPartitionFactory.java Sun Nov  3 23:25:46 2013
@@ -22,7 +22,6 @@ package org.apache.directory.server.core
 import java.io.File;
 import java.util.Set;
 
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.mavibot.btree.managed.RecordManager;
@@ -70,11 +69,11 @@ public class MavibotPartitionFactory imp
         }
 
         MavibotPartition mavibotPartition = ( MavibotPartition ) partition;
-        Set<Index<?, ?, String>> indexedAttributes = mavibotPartition.getIndexedAttributes();
+        Set<Index<?, String>> indexedAttributes = mavibotPartition.getIndexedAttributes();
 
         RecordManager recordMan = ( ( MavibotPartition ) partition ).getRecordMan();
 
-        MavibotIndex<Object, Entry> index = new MavibotIndex<Object, Entry>( attributeId, false );
+        MavibotIndex<Object> index = new MavibotIndex<Object>( attributeId, false );
         index.setCacheSize( cacheSize );
 
         indexedAttributes.add( index );

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java Sun Nov  3 23:25:46 2013
@@ -32,7 +32,6 @@ import jdbm.recman.BaseRecordManager;
 import jdbm.recman.CacheRecordManager;
 import jdbm.recman.TransactionManager;
 
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.MatchingRule;
@@ -48,7 +47,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmDnIndex extends JdbmIndex<Dn, Entry>
+public class JdbmDnIndex extends JdbmIndex<Dn>
 {
 
     /** A logger for this class */

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Sun Nov  3 23:25:46 2013
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmIndex<K, V> extends AbstractIndex<K, V, String>
+public class JdbmIndex<K> extends AbstractIndex<K, String>
 {
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( JdbmIndex.class );

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Sun Nov  3 23:25:46 2013
@@ -184,18 +184,18 @@ public class JdbmPartition extends Abstr
             // then add all index objects to a list
             List<String> allIndices = new ArrayList<String>();
 
-            for ( Index<?, Entry, String> index : systemIndices.values() )
+            for ( Index<?, String> index : systemIndices.values() )
             {
                 allIndices.add( index.getAttribute().getOid() );
             }
 
-            List<Index<?, Entry, String>> indexToBuild = new ArrayList<Index<?, Entry, String>>();
+            List<Index<?, String>> indexToBuild = new ArrayList<Index<?, String>>();
 
             // this loop is used for two purposes
             // one for collecting all user indices
             // two for finding a new index to be built
             // just to avoid another iteration for determining which is the new index
-            for ( Index<?, Entry, String> index : userIndices.values() )
+            for ( Index<?, String> index : userIndices.values() )
             {
                 String indexOid = index.getAttribute().getOid();
                 allIndices.add( indexOid );
@@ -308,13 +308,13 @@ public class JdbmPartition extends Abstr
         }
 
         // Sync all system indices
-        for ( Index<?, Entry, String> idx : systemIndices.values() )
+        for ( Index<?, String> idx : systemIndices.values() )
         {
             idx.sync();
         }
 
         // Sync all user defined userIndices
-        for ( Index<?, Entry, String> idx : userIndices.values() )
+        for ( Index<?, String> idx : userIndices.values() )
         {
             idx.sync();
         }
@@ -330,7 +330,7 @@ public class JdbmPartition extends Abstr
      * @param userIndexes then user defined indexes to create
      * @throws Exception in case of any problems while building the index
      */
-    private void buildUserIndex( List<Index<?, Entry, String>> userIndexes ) throws Exception
+    private void buildUserIndex( List<Index<?, String>> userIndexes ) throws Exception
     {
         Cursor<Tuple<String, Entry>> cursor = master.cursor();
         cursor.beforeFirst();
@@ -420,9 +420,9 @@ public class JdbmPartition extends Abstr
     /**
      * {@inheritDoc}
      */
-    protected Index<?, Entry, String> convertAndInit( Index<?, Entry, String> index ) throws Exception
+    protected Index<?, String> convertAndInit( Index<?, String> index ) throws Exception
     {
-        JdbmIndex<?, Entry> jdbmIndex;
+        JdbmIndex<?> jdbmIndex;
 
         if ( index instanceof JdbmRdnIndex )
         {
@@ -432,9 +432,9 @@ public class JdbmPartition extends Abstr
         {
             jdbmIndex = ( JdbmDnIndex ) index;
         }
-        else if ( index instanceof JdbmIndex<?, ?> )
+        else if ( index instanceof JdbmIndex<?> )
         {
-            jdbmIndex = ( JdbmIndex<?, Entry> ) index;
+            jdbmIndex = ( JdbmIndex<?> ) index;
 
             if ( jdbmIndex.getWkDirPath() == null )
             {
@@ -511,7 +511,7 @@ public class JdbmPartition extends Abstr
     {
         LOG.debug( "Supplied index {} is not a JdbmIndex.  " +
             "Will create new JdbmIndex using copied configuration parameters." );
-        JdbmIndex<?, Entry> jdbmIndex;
+        JdbmIndex<?> jdbmIndex;
 
         if ( oid.equals( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
         {

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Sun Nov  3 23:25:46 2013
@@ -32,7 +32,6 @@ import jdbm.recman.BaseRecordManager;
 import jdbm.recman.CacheRecordManager;
 import jdbm.recman.TransactionManager;
 
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.MatchingRule;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
@@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmRdnIndex extends JdbmIndex<ParentIdAndRdn, Entry>
+public class JdbmRdnIndex extends JdbmIndex<ParentIdAndRdn>
 {
 
     /** A logger for this class */

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Sun Nov  3 23:25:46 2013
@@ -57,7 +57,7 @@ import org.junit.Test;
 public class JdbmIndexTest
 {
     private static File dbFileDir;
-    Index<String, Entry, String> idx;
+    Index<String, String> idx;
     private static SchemaManager schemaManager;
 
 
@@ -139,19 +139,19 @@ public class JdbmIndexTest
     void initIndex() throws Exception
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
-        JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>( attributeType.getName(), false );
+        JdbmIndex<String> index = new JdbmIndex<String>( attributeType.getName(), false );
         index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
     }
 
 
-    void initIndex( JdbmIndex<String, Entry> jdbmIdx ) throws Exception
+    void initIndex( JdbmIndex<String> jdbmIdx ) throws Exception
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
 
         if ( jdbmIdx == null )
         {
-            jdbmIdx = new JdbmIndex<String, Entry>( attributeType.getName(), false );
+            jdbmIdx = new JdbmIndex<String>( attributeType.getName(), false );
         }
 
         jdbmIdx.init( schemaManager, attributeType );
@@ -167,10 +167,10 @@ public class JdbmIndexTest
     public void testAttributeId() throws Exception
     {
         // uninitialized index
-        JdbmIndex<Object, Object> jdbmIndex1 = new JdbmIndex<Object, Object>( "foo", false );
+        JdbmIndex<Object> jdbmIndex1 = new JdbmIndex<Object>( "foo", false );
         assertEquals( "foo", jdbmIndex1.getAttributeId() );
 
-        JdbmIndex<Object, Object> jdbmIndex2 = new JdbmIndex<Object, Object>( "bar", false );
+        JdbmIndex<Object> jdbmIndex2 = new JdbmIndex<Object>( "bar", false );
         assertEquals( "bar", jdbmIndex2.getAttributeId() );
 
         // initialized index
@@ -188,7 +188,7 @@ public class JdbmIndexTest
         assertEquals( "ou", idx.getAttributeId() );
 
         destroyIndex();
-        JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>( "foo", false );
+        JdbmIndex<String> index = new JdbmIndex<String>( "foo", false );
         index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
         assertEquals( "foo", idx.getAttributeId() );
@@ -199,7 +199,7 @@ public class JdbmIndexTest
     public void testCacheSize() throws Exception
     {
         // uninitialized index
-        JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>( "ou", false );
+        JdbmIndex<Object> jdbmIndex = new JdbmIndex<Object>( "ou", false );
         jdbmIndex.setCacheSize( 337 );
         assertEquals( 337, jdbmIndex.getCacheSize() );
 
@@ -224,7 +224,7 @@ public class JdbmIndexTest
         File wkdir = new File( dbFileDir, "foo" );
 
         // uninitialized index
-        JdbmIndex<String, Entry> jdbmIndex = new JdbmIndex<String, Entry>( "foo", false );
+        JdbmIndex<String> jdbmIndex = new JdbmIndex<String>( "foo", false );
         jdbmIndex.setWkDirPath( wkdir.toURI() );
         assertEquals( "foo", new File( jdbmIndex.getWkDirPath() ).getName() );
 
@@ -243,7 +243,7 @@ public class JdbmIndexTest
         assertEquals( dbFileDir.toURI(), idx.getWkDirPath() );
 
         destroyIndex();
-        jdbmIndex = new JdbmIndex<String, Entry>( "ou", false );
+        jdbmIndex = new JdbmIndex<String>( "ou", false );
         wkdir.mkdirs();
         jdbmIndex.setWkDirPath( wkdir.toURI() );
         initIndex( jdbmIndex );
@@ -255,7 +255,7 @@ public class JdbmIndexTest
     public void testNumDupLimit() throws Exception
     {
         // uninitialized index
-        JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>( "ou", false );
+        JdbmIndex<Object> jdbmIndex = new JdbmIndex<Object>( "ou", false );
         jdbmIndex.setNumDupLimit( 337 );
         assertEquals( 337, jdbmIndex.getNumDupLimit() );
 
@@ -264,14 +264,14 @@ public class JdbmIndexTest
 
         try
         {
-            ( ( JdbmIndex<String, Entry> ) idx ).setNumDupLimit( 30 );
+            ( ( JdbmIndex<String> ) idx ).setNumDupLimit( 30 );
             fail( "Should not be able to set numDupLimit after initialization." );
         }
         catch ( Exception e )
         {
         }
 
-        assertEquals( JdbmIndex.DEFAULT_DUPLICATE_LIMIT, ( ( JdbmIndex<String, Entry> ) idx ).getNumDupLimit() );
+        assertEquals( JdbmIndex.DEFAULT_DUPLICATE_LIMIT, ( ( JdbmIndex<String> ) idx ).getNumDupLimit() );
     }
 
 
@@ -279,7 +279,7 @@ public class JdbmIndexTest
     public void testGetAttribute() throws Exception
     {
         // uninitialized index
-        JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>( "ou", false );
+        JdbmIndex<Object> jdbmIndex = new JdbmIndex<Object>( "ou", false );
         assertNull( jdbmIndex.getAttribute() );
 
         initIndex();
@@ -534,7 +534,7 @@ public class JdbmIndexTest
     @Test
     public void testNoEqualityMatching() throws Exception
     {
-        JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>( "1.1", false );
+        JdbmIndex<Object> jdbmIndex = new JdbmIndex<Object>( "1.1", false );
 
         try
         {
@@ -556,7 +556,7 @@ public class JdbmIndexTest
     @Test
     public void testSingleValuedAttribute() throws Exception
     {
-        JdbmIndex<Object, Object> jdbmIndex = new JdbmIndex<Object, Object>( SchemaConstants.CREATORS_NAME_AT, false );
+        JdbmIndex<Object> jdbmIndex = new JdbmIndex<Object>( SchemaConstants.CREATORS_NAME_AT, false );
         jdbmIndex.setWkDirPath( dbFileDir.toURI() );
         jdbmIndex.init( schemaManager, schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATORS_NAME_AT ) );
         jdbmIndex.close();

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Sun Nov  3 23:25:46 2013
@@ -57,7 +57,7 @@ import org.junit.Test;
 public class JdbmRdnIndexTest
 {
     private static File dbFileDir;
-    Index<ParentIdAndRdn, Entry, String> idx;
+    Index<ParentIdAndRdn, String> idx;
     private static SchemaManager schemaManager;
 
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sun Nov  3 23:25:46 2013
@@ -256,7 +256,7 @@ public class JdbmStoreTest
         jdbmPartition.setSyncOnWrite( true ); // for code coverage
 
         assertNull( jdbmPartition.getAliasIndex() );
-        Index<Dn, Entry, String> index = new JdbmIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
+        Index<Dn, String> index = new JdbmIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
             true );
         ( ( Store ) jdbmPartition ).addIndex( index );
         assertNotNull( jdbmPartition.getAliasIndex() );
@@ -266,7 +266,7 @@ public class JdbmStoreTest
         assertEquals( 24, jdbmPartition.getCacheSize() );
 
         assertNull( jdbmPartition.getPresenceIndex() );
-        jdbmPartition.addIndex( new JdbmIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
+        jdbmPartition.addIndex( new JdbmIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
         assertNotNull( jdbmPartition.getPresenceIndex() );
 
         assertNull( jdbmPartition.getId() );
@@ -278,12 +278,12 @@ public class JdbmStoreTest
         assertNotNull( jdbmPartition.getRdnIndex() );
 
         assertNull( jdbmPartition.getOneAliasIndex() );
-        ( ( Store ) jdbmPartition ).addIndex( new JdbmIndex<Long, Entry>(
+        ( ( Store ) jdbmPartition ).addIndex( new JdbmIndex<Long>(
             ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
         assertNotNull( jdbmPartition.getOneAliasIndex() );
 
         assertNull( jdbmPartition.getSubAliasIndex() );
-        jdbmPartition.addIndex( new JdbmIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
+        jdbmPartition.addIndex( new JdbmIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
         assertNotNull( jdbmPartition.getSubAliasIndex() );
 
         assertNull( jdbmPartition.getSuffixDn() );
@@ -293,7 +293,7 @@ public class JdbmStoreTest
         assertNotNull( jdbmPartition.getSuffixDn() );
 
         assertFalse( jdbmPartition.getUserIndices().hasNext() );
-        jdbmPartition.addIndex( new JdbmIndex<Object, Entry>( "2.5.4.3", false ) );
+        jdbmPartition.addIndex( new JdbmIndex<Object>( "2.5.4.3", false ) );
         assertEquals( true, jdbmPartition.getUserIndices().hasNext() );
 
         assertNull( jdbmPartition.getPartitionPath() );
@@ -317,7 +317,7 @@ public class JdbmStoreTest
         assertNotNull( store.getAliasIndex() );
         try
         {
-            store.addIndex( new JdbmIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID, true ) );
+            store.addIndex( new JdbmIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -336,7 +336,7 @@ public class JdbmStoreTest
         assertNotNull( store.getPresenceIndex() );
         try
         {
-            store.addIndex( new JdbmIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
+            store.addIndex( new JdbmIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -366,7 +366,7 @@ public class JdbmStoreTest
         assertNotNull( store.getOneAliasIndex() );
         try
         {
-            store.addIndex( new JdbmIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
+            store.addIndex( new JdbmIndex<Long>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -376,7 +376,7 @@ public class JdbmStoreTest
         assertNotNull( store.getSubAliasIndex() );
         try
         {
-            store.addIndex( new JdbmIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
+            store.addIndex( new JdbmIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotDnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotDnIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotDnIndex.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotDnIndex.java Sun Nov  3 23:25:46 2013
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MavibotDnIndex extends MavibotIndex<Dn, Entry>
+public class MavibotDnIndex extends MavibotIndex<Dn>
 {
 
     /** A logger for this class */

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java Sun Nov  3 23:25:46 2013
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MavibotIndex<K, V> extends AbstractIndex<K, V, String>
+public class MavibotIndex<K> extends AbstractIndex<K, String>
 {
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( MavibotIndex.class.getSimpleName() );

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java Sun Nov  3 23:25:46 2013
@@ -170,12 +170,12 @@ public class MavibotPartition extends Ab
             // then add all index objects to a list
             List<String> allIndices = new ArrayList<String>();
 
-            for ( Index<?, Entry, String> index : systemIndices.values() )
+            for ( Index<?, String> index : systemIndices.values() )
             {
                 allIndices.add( index.getAttribute().getOid() );
             }
 
-            List<Index<?, Entry, String>> indexToBuild = new ArrayList<Index<?, Entry, String>>();
+            List<Index<?, String>> indexToBuild = new ArrayList<Index<?, String>>();
 
             // this loop is used for two purposes
             // one for collecting all user indices
@@ -218,9 +218,9 @@ public class MavibotPartition extends Ab
 
 
     @Override
-    protected Index<?, Entry, String> convertAndInit( Index<?, Entry, String> index ) throws Exception
+    protected Index<?, String> convertAndInit( Index<?, String> index ) throws Exception
     {
-        MavibotIndex<?, Entry> mavibotIndex;
+        MavibotIndex<?> mavibotIndex;
 
         if ( index instanceof MavibotRdnIndex )
         {
@@ -230,9 +230,9 @@ public class MavibotPartition extends Ab
         {
             mavibotIndex = ( MavibotDnIndex ) index;
         }
-        else if ( index instanceof MavibotIndex<?, ?> )
+        else if ( index instanceof MavibotIndex<?> )
         {
-            mavibotIndex = ( MavibotIndex<?, Entry> ) index;
+            mavibotIndex = ( MavibotIndex<?> ) index;
 
             if ( mavibotIndex.getWkDirPath() == null )
             {
@@ -308,7 +308,7 @@ public class MavibotPartition extends Ab
     {
         LOG.debug( "Supplied index {} is not a MavibotIndex.  " +
             "Will create new MavibotIndex using copied configuration parameters." );
-        MavibotIndex<?, Entry> mavibotIndex;
+        MavibotIndex<?> mavibotIndex;
 
         if ( indexOid.equals( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
         {
@@ -340,13 +340,13 @@ public class MavibotPartition extends Ab
         }
 
         // Sync all system indices
-        for ( Index<?, Entry, String> idx : systemIndices.values() )
+        for ( Index<?, String> idx : systemIndices.values() )
         {
             idx.sync();
         }
 
         // Sync all user defined userIndices
-        for ( Index<?, Entry, String> idx : userIndices.values() )
+        for ( Index<?, String> idx : userIndices.values() )
         {
             idx.sync();
         }
@@ -371,7 +371,7 @@ public class MavibotPartition extends Ab
      * @param userIndexes then user defined indexes to create
      * @throws Exception in case of any problems while building the index
      */
-    private void buildUserIndex( List<Index<?, Entry, String>> userIndexes ) throws Exception
+    private void buildUserIndex( List<Index<?, String>> userIndexes ) throws Exception
     {
         Cursor<Tuple<String, Entry>> cursor = master.cursor();
         cursor.beforeFirst();

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java Sun Nov  3 23:25:46 2013
@@ -26,7 +26,6 @@ import java.io.IOException;
 
 import javax.naming.NamingException;
 
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.MatchingRule;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MavibotRdnIndex extends MavibotIndex<ParentIdAndRdn, Entry>
+public class MavibotRdnIndex extends MavibotIndex<ParentIdAndRdn>
 {
 
     /** A logger for this class */

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java Sun Nov  3 23:25:46 2013
@@ -34,6 +34,7 @@ import org.apache.directory.mavibot.btre
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
 import org.apache.directory.mavibot.btree.managed.BTree;
 import org.apache.directory.mavibot.btree.managed.RecordManager;
+import org.apache.directory.mavibot.btree.managed.ValueHolder;
 import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
 import org.apache.directory.server.core.avltree.ArrayMarshaller;
 import org.apache.directory.server.core.avltree.ArrayTree;
@@ -295,7 +296,7 @@ public class MavibotTable<K, V> extends 
 
             V replaced = bt.insert( key, value );
 
-            if ( replaced == null )
+            if  ( ( replaced == null ) || ( !replaced.equals( value ) ) )
             {
                 count++;
             }
@@ -318,6 +319,8 @@ public class MavibotTable<K, V> extends 
                 return;
             }
 
+            // Get the associated valueHolder
+            ValueCursor<V> valueCursor = bt.getValues( key );
             org.apache.directory.mavibot.btree.Tuple<K, V> returned = bt.delete( key );
 
             if ( null == returned )
@@ -325,7 +328,7 @@ public class MavibotTable<K, V> extends 
                 return;
             }
 
-            this.count--;
+            count -= valueCursor.size();
         }
         catch ( Exception e )
         {
@@ -351,8 +354,8 @@ public class MavibotTable<K, V> extends 
 
             org.apache.directory.mavibot.btree.Tuple<K, V> t = bt.delete( key, value );
 
-            // We decrement the counter only when the key was found and when it has no more values
-            if ( ( t != null ) && ( t.getValue() == null ) )
+            // We decrement the counter only when the key was found
+            if ( t != null )
             {
                 count--;
             }

Modified: directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndexTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndexTest.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndexTest.java Sun Nov  3 23:25:46 2013
@@ -47,6 +47,7 @@ import org.apache.directory.server.xdbm.
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -60,7 +61,7 @@ import org.junit.rules.TemporaryFolder;
 public class MavibotIndexTest
 {
     private static File dbFileDir;
-    Index<String, Entry, String> idx;
+    Index<String, String> idx;
     private static SchemaManager schemaManager;
 
     private RecordManager recordMan;
@@ -134,19 +135,19 @@ public class MavibotIndexTest
     void initIndex() throws Exception
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
-        MavibotIndex<String, Entry> index = new MavibotIndex<String, Entry>( attributeType.getName(), false );
+        MavibotIndex<String> index = new MavibotIndex<String>( attributeType.getName(), false );
         index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
     }
 
 
-    void initIndex( MavibotIndex<String, Entry> mavibotIdx ) throws Exception
+    void initIndex( MavibotIndex<String> mavibotIdx ) throws Exception
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
 
         if ( mavibotIdx == null )
         {
-            mavibotIdx = new MavibotIndex<String, Entry>( attributeType.getName(), false );
+            mavibotIdx = new MavibotIndex<String>( attributeType.getName(), false );
         }
 
         mavibotIdx.setRecordManager( recordMan );
@@ -163,10 +164,10 @@ public class MavibotIndexTest
     public void testAttributeId() throws Exception
     {
         // uninitialized index
-        MavibotIndex<Object, Object> MavibotIndex1 = new MavibotIndex<Object, Object>( "foo", false );
+        MavibotIndex<Object> MavibotIndex1 = new MavibotIndex<Object>( "foo", false );
         assertEquals( "foo", MavibotIndex1.getAttributeId() );
 
-        MavibotIndex<Object, Object> MavibotIndex2 = new MavibotIndex<Object, Object>( "bar", false );
+        MavibotIndex<Object> MavibotIndex2 = new MavibotIndex<Object>( "bar", false );
         assertEquals( "bar", MavibotIndex2.getAttributeId() );
 
         // initialized index
@@ -184,7 +185,7 @@ public class MavibotIndexTest
         assertEquals( "ou", idx.getAttributeId() );
 
         destroyIndex();
-        MavibotIndex<String, Entry> index = new MavibotIndex<String, Entry>( "foo", false );
+        MavibotIndex<String> index = new MavibotIndex<String>( "foo", false );
         index.setWkDirPath( dbFileDir.toURI() );
         initIndex( index );
         assertEquals( "foo", idx.getAttributeId() );
@@ -195,7 +196,7 @@ public class MavibotIndexTest
     public void testCacheSize() throws Exception
     {
         // uninitialized index
-        MavibotIndex<Object, Object> MavibotIndex = new MavibotIndex<Object, Object>( "ou", false );
+        MavibotIndex<Object> MavibotIndex = new MavibotIndex<Object>( "ou", false );
         MavibotIndex.setCacheSize( 337 );
         assertEquals( 337, MavibotIndex.getCacheSize() );
 
@@ -220,7 +221,7 @@ public class MavibotIndexTest
         File wkdir = new File( dbFileDir, "foo" );
 
         // uninitialized index
-        MavibotIndex<String, Entry> MavibotIndex = new MavibotIndex<String, Entry>( "foo", false );
+        MavibotIndex<String> MavibotIndex = new MavibotIndex<String>( "foo", false );
         MavibotIndex.setWkDirPath( wkdir.toURI() );
         assertEquals( "foo", new File( MavibotIndex.getWkDirPath() ).getName() );
 
@@ -239,7 +240,7 @@ public class MavibotIndexTest
         assertEquals( dbFileDir.toURI(), idx.getWkDirPath() );
 
         destroyIndex();
-        MavibotIndex = new MavibotIndex<String, Entry>( "ou", false );
+        MavibotIndex = new MavibotIndex<String>( "ou", false );
         wkdir.mkdirs();
         MavibotIndex.setWkDirPath( wkdir.toURI() );
         initIndex( MavibotIndex );
@@ -251,7 +252,7 @@ public class MavibotIndexTest
     public void testGetAttribute() throws Exception
     {
         // uninitialized index
-        MavibotIndex<Object, Object> MavibotIndex = new MavibotIndex<Object, Object>( "ou", false );
+        MavibotIndex<Object> MavibotIndex = new MavibotIndex<Object>( "ou", false );
         assertNull( MavibotIndex.getAttribute() );
 
         initIndex();
@@ -273,10 +274,10 @@ public class MavibotIndexTest
         assertEquals( 1, idx.count() );
 
         idx.add( "foo", Strings.getUUID( 333L ) );
-        assertEquals( 1, idx.count() );
+        assertEquals( 2, idx.count() );
 
         idx.add( "bar", Strings.getUUID( 555L ) );
-        assertEquals( 2, idx.count() );
+        assertEquals( 3, idx.count() );
     }
 
 
@@ -507,7 +508,7 @@ public class MavibotIndexTest
     @Test
     public void testNoEqualityMatching() throws Exception
     {
-        MavibotIndex<Object, Object> MavibotIndex = new MavibotIndex<Object, Object>( "1.1", false );
+        MavibotIndex<Object> MavibotIndex = new MavibotIndex<Object>( "1.1", false );
 
         try
         {
@@ -530,7 +531,7 @@ public class MavibotIndexTest
     @Test
     public void testSingleValuedAttribute() throws Exception
     {
-        MavibotIndex<Object, Object> MavibotIndex = new MavibotIndex<Object, Object>( SchemaConstants.CREATORS_NAME_AT,
+        MavibotIndex<Object> MavibotIndex = new MavibotIndex<Object>( SchemaConstants.CREATORS_NAME_AT,
             false );
         MavibotIndex.setWkDirPath( dbFileDir.toURI() );
         MavibotIndex.setRecordManager( recordMan );

Modified: directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndexTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndexTest.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndexTest.java Sun Nov  3 23:25:46 2013
@@ -59,7 +59,7 @@ import org.junit.rules.TemporaryFolder;
  */
 public class MavibotRdnIndexTest
 {
-    private Index<ParentIdAndRdn, Entry, String> idx;
+    private Index<ParentIdAndRdn, String> idx;
 
     private static SchemaManager schemaManager;
 
@@ -211,11 +211,11 @@ public class MavibotRdnIndexTest
 
         //count shouldn't get affected cause of inserting the same key
         idx.add( key, Strings.getUUID( 2L ) );
-        assertEquals( 2, idx.count() );
+        assertEquals( 3, idx.count() );
 
         key = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( "cn=key" ) );
         idx.add( key, Strings.getUUID( 3L ) );
-        assertEquals( 3, idx.count() );
+        assertEquals( 4, idx.count() );
     }
 
 

Modified: directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotStoreTest.java Sun Nov  3 23:25:46 2013
@@ -260,7 +260,7 @@ public class MavibotStoreTest
         MavibotPartition.setSyncOnWrite( true ); // for code coverage
 
         assertNull( MavibotPartition.getAliasIndex() );
-        Index<Dn, Entry, String> index = new MavibotIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
+        Index<Dn, String> index = new MavibotIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
             true );
         ( ( Store ) MavibotPartition ).addIndex( index );
         assertNotNull( MavibotPartition.getAliasIndex() );
@@ -271,7 +271,7 @@ public class MavibotStoreTest
 
         assertNull( MavibotPartition.getPresenceIndex() );
         MavibotPartition
-            .addIndex( new MavibotIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
+            .addIndex( new MavibotIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
         assertNotNull( MavibotPartition.getPresenceIndex() );
 
         assertNull( MavibotPartition.getId() );
@@ -283,13 +283,13 @@ public class MavibotStoreTest
         assertNotNull( MavibotPartition.getRdnIndex() );
 
         assertNull( MavibotPartition.getOneAliasIndex() );
-        ( ( Store ) MavibotPartition ).addIndex( new MavibotIndex<Long, Entry>(
+        ( ( Store ) MavibotPartition ).addIndex( new MavibotIndex<Long>(
             ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
         assertNotNull( MavibotPartition.getOneAliasIndex() );
 
         assertNull( MavibotPartition.getSubAliasIndex() );
         MavibotPartition
-            .addIndex( new MavibotIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
+            .addIndex( new MavibotIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
         assertNotNull( MavibotPartition.getSubAliasIndex() );
 
         assertNull( MavibotPartition.getSuffixDn() );
@@ -299,7 +299,7 @@ public class MavibotStoreTest
         assertNotNull( MavibotPartition.getSuffixDn() );
 
         assertFalse( MavibotPartition.getUserIndices().hasNext() );
-        MavibotPartition.addIndex( new MavibotIndex<Object, Entry>( "2.5.4.3", false ) );
+        MavibotPartition.addIndex( new MavibotIndex<Object>( "2.5.4.3", false ) );
         assertEquals( true, MavibotPartition.getUserIndices().hasNext() );
 
         assertNull( MavibotPartition.getPartitionPath() );
@@ -323,7 +323,7 @@ public class MavibotStoreTest
         assertNotNull( store.getAliasIndex() );
         try
         {
-            store.addIndex( new MavibotIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID, true ) );
+            store.addIndex( new MavibotIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -342,7 +342,7 @@ public class MavibotStoreTest
         assertNotNull( store.getPresenceIndex() );
         try
         {
-            store.addIndex( new MavibotIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
+            store.addIndex( new MavibotIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID, false ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -372,7 +372,7 @@ public class MavibotStoreTest
         assertNotNull( store.getOneAliasIndex() );
         try
         {
-            store.addIndex( new MavibotIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
+            store.addIndex( new MavibotIndex<Long>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -382,7 +382,7 @@ public class MavibotStoreTest
         assertNotNull( store.getSubAliasIndex() );
         try
         {
-            store.addIndex( new MavibotIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
+            store.addIndex( new MavibotIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, true ) );
             fail();
         }
         catch ( IllegalStateException e )
@@ -676,7 +676,7 @@ public class MavibotStoreTest
 
         store.move( childDn, parentDn, newDn, childEntry );
 
-        assertEquals( 3, store.getSubAliasIndex().count() );
+        assertEquals( 4, store.getSubAliasIndex().count() );
     }
 
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/IndexIT.java Sun Nov  3 23:25:46 2013
@@ -53,8 +53,8 @@ public class IndexIT
     private static File dbFileDir;
     private static SchemaManager schemaManager;
 
-    private JdbmIndex<String, Entry> jdbmIndex;
-    private AvlIndex<String, Entry> avlIndex;
+    private JdbmIndex<String> jdbmIndex;
+    private AvlIndex<String> avlIndex;
 
 
     @BeforeClass
@@ -95,11 +95,11 @@ public class IndexIT
 
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
 
-        jdbmIndex = new JdbmIndex<String, Entry>( attributeType.getName(), false );
+        jdbmIndex = new JdbmIndex<String>( attributeType.getName(), false );
         jdbmIndex.setWkDirPath( dbFileDir.toURI() );
         jdbmIndex.init( schemaManager, attributeType );
 
-        avlIndex = new AvlIndex<String, Entry>();
+        avlIndex = new AvlIndex<String>();
         avlIndex.init( schemaManager, attributeType );
     }
 
@@ -119,7 +119,7 @@ public class IndexIT
     }
 
 
-    private void doTest( Index<String, Entry, String> idx ) throws Exception
+    private void doTest( Index<String, String> idx ) throws Exception
     {
         String alphabet = "abcdefghijklmnopqrstuvwxyz";
 

Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Sun Nov  3 23:25:46 2013
@@ -32,7 +32,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.api.ldap.model.ldif.LdapLdifException;
@@ -1176,7 +1175,7 @@ public class ServiceBuilder
      * @return An JdbmIndex instance
      * @throws Exception If the instance cannot be created
      */
-    public static JdbmIndex<?, ?> createJdbmIndex( JdbmPartition partition,
+    public static JdbmIndex<?> createJdbmIndex( JdbmPartition partition,
         JdbmIndexBean jdbmIndexBean, DirectoryService directoryService )
     {
         if ( ( jdbmIndexBean == null ) || jdbmIndexBean.isDisabled() )
@@ -1191,7 +1190,7 @@ public class ServiceBuilder
             indexFileName = jdbmIndexBean.getIndexAttributeId();
         }
 
-        JdbmIndex<?, ?> index = null;
+        JdbmIndex<?> index = null;
 
         boolean hasReverse = jdbmIndexBean.getIndexHasReverse();
 
@@ -1207,7 +1206,7 @@ public class ServiceBuilder
         }
         else
         {
-            index = new JdbmIndex<String, Entry>( jdbmIndexBean.getIndexAttributeId(), hasReverse );
+            index = new JdbmIndex<String>( jdbmIndexBean.getIndexAttributeId(), hasReverse );
         }
 
         index.setCacheSize( jdbmIndexBean.getIndexCacheSize() );
@@ -1243,11 +1242,11 @@ public class ServiceBuilder
     /**
      * Create the list of Index from the configuration
      */
-    private static Set<Index<?, ?, String>> createJdbmIndexes( JdbmPartition partition,
+    private static Set<Index<?, String>> createJdbmIndexes( JdbmPartition partition,
         List<IndexBean> indexesBeans,
         DirectoryService directoryService ) //throws Exception
     {
-        Set<Index<?, ?, String>> indexes = new HashSet<Index<?, ?, String>>();
+        Set<Index<?, String>> indexes = new HashSet<Index<?, String>>();
 
         for ( IndexBean indexBean : indexesBeans )
         {
@@ -1506,11 +1505,11 @@ public class ServiceBuilder
     /**
      * Create the list of MavibotIndex from the configuration
      */
-    private static Set<Index<?, ?, String>> createMavibotIndexes( MavibotPartition partition,
+    private static Set<Index<?, String>> createMavibotIndexes( MavibotPartition partition,
         List<IndexBean> indexesBeans,
         DirectoryService directoryService ) //throws Exception
     {
-        Set<Index<?, ?, String>> indexes = new HashSet<Index<?, ?, String>>();
+        Set<Index<?, String>> indexes = new HashSet<Index<?, String>>();
 
         for ( IndexBean indexBean : indexesBeans )
         {
@@ -1531,7 +1530,7 @@ public class ServiceBuilder
      * @return An MavibotIndex instance
      * @throws Exception If the instance cannot be created
      */
-    public static MavibotIndex<?, ?> createMavibotIndex( MavibotPartition partition,
+    public static MavibotIndex<?> createMavibotIndex( MavibotPartition partition,
         MavibotIndexBean mavobotIndexBean, DirectoryService directoryService )
     {
         if ( ( mavobotIndexBean == null ) || mavobotIndexBean.isDisabled() )
@@ -1539,7 +1538,7 @@ public class ServiceBuilder
             return null;
         }
 
-        MavibotIndex<?, ?> index = null;
+        MavibotIndex<?> index = null;
 
         boolean hasReverse = mavobotIndexBean.getIndexHasReverse();
 
@@ -1555,7 +1554,7 @@ public class ServiceBuilder
         }
         else
         {
-            index = new MavibotIndex<String, Entry>( mavobotIndexBean.getIndexAttributeId(), hasReverse );
+            index = new MavibotIndex<String>( mavobotIndexBean.getIndexAttributeId(), hasReverse );
         }
 
         index.setWkDirPath( partition.getPartitionPath() );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java Sun Nov  3 23:25:46 2013
@@ -159,17 +159,17 @@ public class AvlPartition extends Abstra
 
 
     @Override
-    protected Index<?, Entry, String> convertAndInit( Index<?, Entry, String> index ) throws Exception
+    protected Index<?, String> convertAndInit( Index<?, String> index ) throws Exception
     {
-        AvlIndex<?, Entry> avlIndex;
+        AvlIndex<?> avlIndex;
 
         if ( index.getAttributeId().equals( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
         {
             avlIndex = new AvlRdnIndex( index.getAttributeId() );
         }
-        else if ( index instanceof AvlIndex<?, ?> )
+        else if ( index instanceof AvlIndex<?> )
         {
-            avlIndex = ( AvlIndex<?, Entry> ) index;
+            avlIndex = ( AvlIndex<?> ) index;
         }
         else
         {
@@ -192,7 +192,7 @@ public class AvlPartition extends Abstra
         LOG.debug( "Supplied index {} is not a JdbmIndex.  "
             + "Will create new JdbmIndex using copied configuration parameters." );
 
-        AvlIndex<?, Entry> avlIndex;
+        AvlIndex<?> avlIndex;
 
         if ( oid.equals( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Sun Nov  3 23:25:46 2013
@@ -127,40 +127,40 @@ public abstract class AbstractBTreeParti
     protected URI partitionPath;
 
     /** The set of indexed attributes */
-    private Set<Index<?, ?, String>> indexedAttributes;
+    private Set<Index<?, String>> indexedAttributes;
 
     /** the master table storing entries by primary key */
     protected MasterTable master;
 
     /** a map of attributeType numeric UUID to user userIndices */
-    protected Map<String, Index<?, Entry, String>> userIndices = new HashMap<String, Index<?, Entry, String>>();
+    protected Map<String, Index<?, String>> userIndices = new HashMap<String, Index<?, String>>();
 
     /** a map of attributeType numeric UUID to system userIndices */
-    protected Map<String, Index<?, Entry, String>> systemIndices = new HashMap<String, Index<?, Entry, String>>();
+    protected Map<String, Index<?, String>> systemIndices = new HashMap<String, Index<?, String>>();
 
     /** the relative distinguished name index */
-    protected Index<ParentIdAndRdn, Entry, String> rdnIdx;
+    protected Index<ParentIdAndRdn, String> rdnIdx;
 
     /** a system index on objectClass attribute*/
-    protected Index<String, Entry, String> objectClassIdx;
+    protected Index<String, String> objectClassIdx;
 
     /** the attribute presence index */
-    protected Index<String, Entry, String> presenceIdx;
+    protected Index<String, String> presenceIdx;
 
     /** a system index on entryCSN attribute */
-    protected Index<String, Entry, String> entryCsnIdx;
+    protected Index<String, String> entryCsnIdx;
 
     /** a system index on aliasedObjectName attribute */
-    protected Index<Dn, Entry, String> aliasIdx;
+    protected Index<Dn, String> aliasIdx;
 
     /** the subtree scope alias index */
-    protected Index<String, Entry, String> subAliasIdx;
+    protected Index<String, String> subAliasIdx;
 
     /** the one level scope alias index */
-    protected Index<String, Entry, String> oneAliasIdx;
+    protected Index<String, String> oneAliasIdx;
 
     /** a system index on administrativeRole attribute */
-    protected Index<String, Entry, String> adminRoleIdx;
+    protected Index<String, String> adminRoleIdx;
 
     /** Cached attributes types to avoid lookup all over the code */
     protected AttributeType OBJECT_CLASS_AT;
@@ -217,7 +217,7 @@ public abstract class AbstractBTreeParti
      */
     private void initInstance()
     {
-        indexedAttributes = new HashSet<Index<?, ?, String>>();
+        indexedAttributes = new HashSet<Index<?, String>>();
 
         // Initialize Attribute types used all over this method
         OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
@@ -318,14 +318,14 @@ public abstract class AbstractBTreeParti
         // add missing system indices
         if ( getPresenceIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID,
+            Index<String, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID,
                 partitionPath, NO_REVERSE );
             addIndex( index );
         }
 
         if ( getRdnIndex() == null )
         {
-            Index<ParentIdAndRdn, Entry, String> index = createSystemIndex(
+            Index<ParentIdAndRdn, String> index = createSystemIndex(
                 ApacheSchemaConstants.APACHE_RDN_AT_OID,
                 partitionPath, WITH_REVERSE );
             addIndex( index );
@@ -333,42 +333,42 @@ public abstract class AbstractBTreeParti
 
         if ( getAliasIndex() == null )
         {
-            Index<Dn, Entry, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
+            Index<Dn, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
                 partitionPath, WITH_REVERSE );
             addIndex( index );
         }
 
         if ( getOneAliasIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID,
+            Index<String, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID,
                 partitionPath, NO_REVERSE );
             addIndex( index );
         }
 
         if ( getSubAliasIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID,
+            Index<String, String> index = createSystemIndex( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID,
                 partitionPath, NO_REVERSE );
             addIndex( index );
         }
 
         if ( getObjectClassIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( SchemaConstants.OBJECT_CLASS_AT_OID, partitionPath,
+            Index<String, String> index = createSystemIndex( SchemaConstants.OBJECT_CLASS_AT_OID, partitionPath,
                 NO_REVERSE );
             addIndex( index );
         }
 
         if ( getEntryCsnIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( SchemaConstants.ENTRY_CSN_AT_OID, partitionPath,
+            Index<String, String> index = createSystemIndex( SchemaConstants.ENTRY_CSN_AT_OID, partitionPath,
                 NO_REVERSE );
             addIndex( index );
         }
 
         if ( getAdministrativeRoleIndex() == null )
         {
-            Index<String, Entry, String> index = createSystemIndex( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID,
+            Index<String, String> index = createSystemIndex( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID,
                 partitionPath,
                 NO_REVERSE );
             addIndex( index );
@@ -377,23 +377,23 @@ public abstract class AbstractBTreeParti
         // convert and initialize system indices
         for ( String oid : systemIndices.keySet() )
         {
-            Index<?, Entry, String> index = systemIndices.get( oid );
+            Index<?, String> index = systemIndices.get( oid );
             index = convertAndInit( index );
             systemIndices.put( oid, index );
         }
 
         // set index shortcuts
-        rdnIdx = ( Index<ParentIdAndRdn, Entry, String> ) systemIndices
+        rdnIdx = ( Index<ParentIdAndRdn, String> ) systemIndices
             .get( ApacheSchemaConstants.APACHE_RDN_AT_OID );
-        presenceIdx = ( Index<String, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID );
-        aliasIdx = ( Index<Dn, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
-        oneAliasIdx = ( Index<String, Entry, String> ) systemIndices
+        presenceIdx = ( Index<String, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID );
+        aliasIdx = ( Index<Dn, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
+        oneAliasIdx = ( Index<String, String> ) systemIndices
             .get( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
-        subAliasIdx = ( Index<String, Entry, String> ) systemIndices
+        subAliasIdx = ( Index<String, String> ) systemIndices
             .get( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
-        objectClassIdx = ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.OBJECT_CLASS_AT_OID );
-        entryCsnIdx = ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.ENTRY_CSN_AT_OID );
-        adminRoleIdx = ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID );
+        objectClassIdx = ( Index<String, String> ) systemIndices.get( SchemaConstants.OBJECT_CLASS_AT_OID );
+        entryCsnIdx = ( Index<String, String> ) systemIndices.get( SchemaConstants.ENTRY_CSN_AT_OID );
+        adminRoleIdx = ( Index<String, String> ) systemIndices.get( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID );
     }
 
 
@@ -403,7 +403,7 @@ public abstract class AbstractBTreeParti
     protected void setupUserIndices() throws Exception
     {
         // convert and initialize system indices
-        Map<String, Index<?, Entry, String>> tmp = new HashMap<String, Index<?, Entry, String>>();
+        Map<String, Index<?, String>> tmp = new HashMap<String, Index<?, String>>();
 
         for ( String oid : userIndices.keySet() )
         {
@@ -413,7 +413,7 @@ public abstract class AbstractBTreeParti
 
             if ( mr != null )
             {
-                Index<?, Entry, String> index = userIndices.get( oid );
+                Index<?, String> index = userIndices.get( oid );
                 index = convertAndInit( index );
                 tmp.put( oid, index );
             }
@@ -449,7 +449,7 @@ public abstract class AbstractBTreeParti
      * @return the converted and initialized index
      * @throws Exception
      */
-    protected abstract Index<?, Entry, String> convertAndInit( Index<?, Entry, String> index ) throws Exception;
+    protected abstract Index<?, String> convertAndInit( Index<?, String> index ) throws Exception;
 
 
     /**
@@ -483,7 +483,7 @@ public abstract class AbstractBTreeParti
 
         MultiException errors = new MultiException( I18n.err( I18n.ERR_577 ) );
 
-        for ( Index<?, Entry, String> index : userIndices.values() )
+        for ( Index<?, String> index : userIndices.values() )
         {
             try
             {
@@ -497,7 +497,7 @@ public abstract class AbstractBTreeParti
             }
         }
 
-        for ( Index<?, Entry, String> index : systemIndices.values() )
+        for ( Index<?, String> index : systemIndices.values() )
         {
             try
             {
@@ -767,7 +767,7 @@ public abstract class AbstractBTreeParti
 
                 if ( hasUserIndexOn( attributeType ) )
                 {
-                    Index<Object, Entry, String> idx = ( Index<Object, Entry, String> ) getUserIndex( attributeType );
+                    Index<Object, String> idx = ( Index<Object, String> ) getUserIndex( attributeType );
 
                     // here lookup by attributeId is OK since we got attributeId from
                     // the entry via the enumeration - it's in there as is for sure
@@ -1004,7 +1004,7 @@ public abstract class AbstractBTreeParti
 
                 if ( hasUserIndexOn( attributeType ) )
                 {
-                    Index<?, Entry, String> index = getUserIndex( attributeType );
+                    Index<?, String> index = getUserIndex( attributeType );
 
                     // here lookup by attributeId is ok since we got attributeId from
                     // the entry via the enumeration - it's in there as is for sure
@@ -1303,7 +1303,7 @@ public abstract class AbstractBTreeParti
         }
         else if ( hasUserIndexOn( attributeType ) )
         {
-            Index<?, Entry, String> index = getUserIndex( attributeType );
+            Index<?, String> index = getUserIndex( attributeType );
 
             if ( mods.size() > 0 )
             {
@@ -1414,7 +1414,7 @@ public abstract class AbstractBTreeParti
         }
         else if ( hasUserIndexOn( attributeType ) )
         {
-            Index<?, Entry, String> index = getUserIndex( attributeType );
+            Index<?, String> index = getUserIndex( attributeType );
 
             // Drop all the previous values
             Attribute oldAttribute = entry.get( mods.getAttributeType() );
@@ -1423,14 +1423,14 @@ public abstract class AbstractBTreeParti
             {
                 for ( Value<?> value : oldAttribute )
                 {
-                    ( ( Index<Object, Entry, String> ) index ).drop( value.getNormValue(), id );
+                    ( ( Index<Object, String> ) index ).drop( value.getNormValue(), id );
                 }
             }
 
             // And add the new ones
             for ( Value<?> value : mods )
             {
-                ( ( Index<Object, Entry, String> ) index ).add( value.getNormValue(), id );
+                ( ( Index<Object, String> ) index ).add( value.getNormValue(), id );
             }
 
             /*
@@ -1533,7 +1533,7 @@ public abstract class AbstractBTreeParti
         }
         else if ( hasUserIndexOn( attributeType ) )
         {
-            Index<?, Entry, String> index = getUserIndex( attributeType );
+            Index<?, String> index = getUserIndex( attributeType );
 
             Attribute attribute = entry.get( attributeType ).clone();
             int nbValues = 0;
@@ -1995,7 +1995,7 @@ public abstract class AbstractBTreeParti
 
             if ( hasUserIndexOn( newRdnAttrType ) )
             {
-                Index<?, Entry, String> index = getUserIndex( newRdnAttrType );
+                Index<?, String> index = getUserIndex( newRdnAttrType );
                 ( ( Index ) index ).add( newNormValue, oldId );
 
                 // Make sure the altered entry shows the existence of the new attrib
@@ -2051,7 +2051,7 @@ public abstract class AbstractBTreeParti
 
                     if ( hasUserIndexOn( oldRdnAttrType ) )
                     {
-                        Index<?, Entry, String> index = getUserIndex( oldRdnAttrType );
+                        Index<?, String> index = getUserIndex( oldRdnAttrType );
                         ( ( Index ) index ).drop( oldNormValue, id );
 
                         /*
@@ -2364,7 +2364,7 @@ public abstract class AbstractBTreeParti
     /**
      * {@inheritDoc}
      */
-    public void addIndex( Index<?, Entry, String> index ) throws Exception
+    public void addIndex( Index<?, String> index ) throws Exception
     {
         checkInitialized( "addIndex" );
 
@@ -2406,9 +2406,9 @@ public abstract class AbstractBTreeParti
      * Add some new indexes
      * @param indexes The added indexes
      */
-    public void addIndexedAttributes( Index<?, Entry, String>... indexes )
+    public void addIndexedAttributes( Index<?, String>... indexes )
     {
-        for ( Index<?, Entry, String> index : indexes )
+        for ( Index<?, String> index : indexes )
         {
             indexedAttributes.add( index );
         }
@@ -2419,7 +2419,7 @@ public abstract class AbstractBTreeParti
      * Set the list of indexes for this partition
      * @param indexedAttributes The list of indexes
      */
-    public void setIndexedAttributes( Set<Index<?, ?, String>> indexedAttributes )
+    public void setIndexedAttributes( Set<Index<?, String>> indexedAttributes )
     {
         this.indexedAttributes = indexedAttributes;
     }
@@ -2428,7 +2428,7 @@ public abstract class AbstractBTreeParti
     /**
      * @return The list of indexed attributes
      */
-    public Set<Index<?, ?, String>> getIndexedAttributes()
+    public Set<Index<?, String>> getIndexedAttributes()
     {
         return indexedAttributes;
     }
@@ -2455,7 +2455,7 @@ public abstract class AbstractBTreeParti
     /**
      * {@inheritDoc}
      */
-    public Index<?, Entry, String> getIndex( AttributeType attributeType ) throws IndexNotFoundException
+    public Index<?, String> getIndex( AttributeType attributeType ) throws IndexNotFoundException
     {
         String id = attributeType.getOid();
 
@@ -2476,7 +2476,7 @@ public abstract class AbstractBTreeParti
     /**
      * {@inheritDoc}
      */
-    public Index<?, Entry, String> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException
+    public Index<?, String> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException
     {
         if ( attributeType == null )
         {
@@ -2497,7 +2497,7 @@ public abstract class AbstractBTreeParti
     /**
      * {@inheritDoc}
      */
-    public Index<?, Entry, String> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException
+    public Index<?, String> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException
     {
         if ( attributeType == null )
         {
@@ -2519,9 +2519,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<Dn, Entry, String> getAliasIndex()
+    public Index<Dn, String> getAliasIndex()
     {
-        return ( Index<Dn, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
+        return ( Index<Dn, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
     }
 
 
@@ -2529,9 +2529,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getOneAliasIndex()
+    public Index<String, String> getOneAliasIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
     }
 
 
@@ -2539,9 +2539,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getSubAliasIndex()
+    public Index<String, String> getSubAliasIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
     }
 
 
@@ -2549,9 +2549,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getObjectClassIndex()
+    public Index<String, String> getObjectClassIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.OBJECT_CLASS_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( SchemaConstants.OBJECT_CLASS_AT_OID );
     }
 
 
@@ -2559,9 +2559,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getEntryCsnIndex()
+    public Index<String, String> getEntryCsnIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.ENTRY_CSN_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( SchemaConstants.ENTRY_CSN_AT_OID );
     }
 
 
@@ -2569,9 +2569,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getAdministrativeRoleIndex()
+    public Index<String, String> getAdministrativeRoleIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID );
     }
 
 
@@ -2579,9 +2579,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<String, Entry, String> getPresenceIndex()
+    public Index<String, String> getPresenceIndex()
     {
-        return ( Index<String, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID );
+        return ( Index<String, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID );
     }
 
 
@@ -2589,9 +2589,9 @@ public abstract class AbstractBTreeParti
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Index<ParentIdAndRdn, Entry, String> getRdnIndex()
+    public Index<ParentIdAndRdn, String> getRdnIndex()
     {
-        return ( Index<ParentIdAndRdn, Entry, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID );
+        return ( Index<ParentIdAndRdn, String> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID );
     }
 
 
@@ -2851,7 +2851,7 @@ public abstract class AbstractBTreeParti
     //---------------------------------------------------------------------------------------------
     // Debug methods
     //---------------------------------------------------------------------------------------------
-    private void dumpIndex( OutputStream stream, Index<?, Entry, String> index )
+    private void dumpIndex( OutputStream stream, Index<?, String> index )
     {
         try
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java Sun Nov  3 23:25:46 2013
@@ -32,7 +32,7 @@ import org.apache.directory.server.i18n.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractIndex<K, O, ID> implements Index<K, O, ID>
+public abstract class AbstractIndex<K, ID> implements Index<K, ID>
 {
     /** The attribute identifier for this index */
     protected String attributeId;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Sun Nov  3 23:25:46 2013
@@ -36,10 +36,9 @@ import org.apache.directory.api.ldap.mod
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <K> The Indexed value type, used to retrieve an element
- * @param <O> The indexed element type, when retrieved
  * @param <ID> The unique identifier type in the master table
  */
-public interface Index<K, O, ID>
+public interface Index<K, ID>
 {
     /** The default cache size (ie, the number of elements we stored in the cache) */
     int DEFAULT_INDEX_CACHE_SIZE = 100;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Sun Nov  3 23:25:46 2013
@@ -159,7 +159,7 @@ public interface Store
      * @param index The index to add
      * @throws Exception If the addition failed
      */
-    void addIndex( Index<?, Entry, String> index ) throws Exception;
+    void addIndex( Index<?, String> index ) throws Exception;
 
 
     //------------------------------------------------------------------------
@@ -168,43 +168,43 @@ public interface Store
     /**
      * @return The Presence system index
      */
-    Index<String, Entry, String> getPresenceIndex();
+    Index<String, String> getPresenceIndex();
 
 
     /**
      * @return The Alias system index
      */
-    Index<Dn, Entry, String> getAliasIndex();
+    Index<Dn, String> getAliasIndex();
 
 
     /**
      * @return The OneAlias system index
      */
-    Index<String, Entry, String> getOneAliasIndex();
+    Index<String, String> getOneAliasIndex();
 
 
     /**
      * @return The SubAlias system index
      */
-    Index<String, Entry, String> getSubAliasIndex();
+    Index<String, String> getSubAliasIndex();
 
 
     /**
      * @return The Rdn system index
      */
-    Index<ParentIdAndRdn, Entry, String> getRdnIndex();
+    Index<ParentIdAndRdn, String> getRdnIndex();
 
 
     /**
      * @return The ObjectClass system index
      */
-    Index<String, Entry, String> getObjectClassIndex();
+    Index<String, String> getObjectClassIndex();
 
 
     /**
      * @return The EntryCSN system index
      */
-    Index<String, Entry, String> getEntryCsnIndex();
+    Index<String, String> getEntryCsnIndex();
 
 
     /**
@@ -256,7 +256,7 @@ public interface Store
      * @return The associated user <strong>or</strong> system index
      * @throws IndexNotFoundException If the index does not exist
      */
-    Index<?, Entry, String> getIndex( AttributeType attributeType ) throws IndexNotFoundException;
+    Index<?, String> getIndex( AttributeType attributeType ) throws IndexNotFoundException;
 
 
     /**
@@ -265,7 +265,7 @@ public interface Store
      * @return The associated user index
      * @throws IndexNotFoundException If the index does not exist
      */
-    Index<?, Entry, String> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException;
+    Index<?, String> getUserIndex( AttributeType attributeType ) throws IndexNotFoundException;
 
 
     /**
@@ -274,7 +274,7 @@ public interface Store
      * @return The associated system index
      * @throws IndexNotFoundException If the index does not exist
      */
-    Index<?, Entry, String> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException;
+    Index<?, String> getSystemIndex( AttributeType attributeType ) throws IndexNotFoundException;
 
 
     /**



Mime
View raw message