directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1158865 [1/2] - in /directory/apacheds/trunk: core-avl/src/test/java/org/apache/directory/server/core/avltree/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ ldif-partition/src/main/java/org/apache...
Date Wed, 17 Aug 2011 18:50:19 GMT
Author: elecharny
Date: Wed Aug 17 18:50:17 2011
New Revision: 1158865

URL: http://svn.apache.org/viewvc?rev=1158865&view=rev
Log:
o Removed the second generic parameter from the IndexEntry and ForwardIndexEntry : those interfaces are already using Entry
o Modified all the impacted classes

Modified:
    directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.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/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.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/core/partition/impl/btree/EntryCursorAdaptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.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
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java Wed Aug 17 18:50:17 2011
@@ -31,6 +31,7 @@ import java.util.Set;
 
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@ public class AvlTreePerfTest
     
     long start, end;
 
-    int numKeys = 100000;
+    int numKeys = 1000000;
 
     Comparator<Integer> comparator = new Comparator<Integer>() 
     {
@@ -109,12 +110,13 @@ public class AvlTreePerfTest
         
         end = System.nanoTime();
      
-        LOG.info( "total time for inserting " + numKeys + " items into the RBTree-->" +  getTime( start, end ) );
+        System.out.println( "total time for inserting " + numKeys + " items into the RBTree-->" +  getTime( start, end ) );
         
     }
 
     
     @Test
+    @Ignore
     public void testRBTreeLookupPerf()
     {
         for( int i=0; i < numKeys; i++ )
@@ -122,7 +124,7 @@ public class AvlTreePerfTest
             set.add( i );
         }
         
-       start = System.nanoTime();
+        start = System.nanoTime();
        
         set.contains( 70 );
         set.contains( -1000 );
@@ -132,11 +134,12 @@ public class AvlTreePerfTest
         
        end = System.nanoTime();
        
-       LOG.info( "total time took to read an item from set " + getTime( start, end ) ) ;
+       System.out.println( "total time took to read an item from set " + getTime( start, end ) ) ;
     }
     
     
     @Test
+    @Ignore
     public void testRemoveFromRBTree()
     {
         for( int i=0; i < numKeys; i++ )
@@ -153,7 +156,7 @@ public class AvlTreePerfTest
         
         end = System.nanoTime();
         
-        LOG.info( "total time took to remove an item from set " + getTime( start, end ) ) ;
+        System.out.println( "total time took to remove an item from set " + getTime( start, end ) ) ;
 
     }
     
@@ -170,11 +173,12 @@ public class AvlTreePerfTest
 
         end = System.nanoTime();
         
-        LOG.info("total time for inserting " + numKeys + " items into the AVLTree-->" + getTime(start, end));
+        System.out.println("total time for inserting " + numKeys + " items into the AVLTree-->" + getTime(start, end));
     }
     
     
     @Test
+    @Ignore
     public void testAVLTreeLookupPerf()
     {
         
@@ -193,11 +197,12 @@ public class AvlTreePerfTest
         
         end = System.nanoTime();
         
-        LOG.info("total time took to read an item from tree " + getTime( start, end ) ) ;
+        System.out.println("total time took to read an item from tree " + getTime( start, end ) ) ;
     }
     
     
     @Test
+    @Ignore
     public void testAVLTreeRemovePerf()
     {
         for( int i=0; i < numKeys; i++ )
@@ -214,12 +219,13 @@ public class AvlTreePerfTest
         
         end = System.nanoTime();
         
-        LOG.info("total time took to remove an item from AVLTree " + getTime( start, end ) ) ;
+        System.out.println("total time took to remove an item from AVLTree " + getTime( start, end ) ) ;
 
     }
     
     
     @Test
+    @Ignore
     public void testRBTreeSerializationPerf() throws Exception
     {
         FileOutputStream fout = new FileOutputStream( setSerialFile );
@@ -240,12 +246,13 @@ public class AvlTreePerfTest
         
         long end = System.nanoTime();
         
-        LOG.info( "total time taken for serializing HashSet ->" + getTime( start, end ) );
+        System.out.println( "total time taken for serializing HashSet ->" + getTime( start, end ) );
     }
     
     
     @SuppressWarnings("unchecked")
     @Test
+    @Ignore
     public void testRBTreeDeserializationPerf() throws Exception
     {
      // read test
@@ -258,11 +265,12 @@ public class AvlTreePerfTest
         
         end = System.nanoTime();
         
-        LOG.info("total time taken for reconstructing a serialized HashSet ->" + getTime( start, end ) );
+        System.out.println("total time taken for reconstructing a serialized HashSet ->" + getTime( start, end ) );
     }
     
     
     @Test
+    @Ignore
     public void testAVLTreeSerializationPerf() throws Exception
     {
       
@@ -281,11 +289,12 @@ public class AvlTreePerfTest
       
       end = System.nanoTime();
       
-      LOG.info( "total time taken for serializing AVLTree ->" + getTime( start, end ) );
+      System.out.println( "total time taken for serializing AVLTree ->" + getTime( start, end ) );
     }
 
     
     @Test
+    @Ignore
     public void testAVLTreeDeserializationPerf() throws Exception
     {
         FileInputStream fin = new FileInputStream( treeSerialFile );
@@ -298,7 +307,7 @@ public class AvlTreePerfTest
         tree = (AvlTree<Integer>) treeMarshaller.deserialize( data );
         
         end = System.nanoTime();
-        LOG.info("total time taken for reconstructing a serialized AVLTree ->" + getTime( start, end ) );
+        System.out.println("total time taken for reconstructing a serialized AVLTree ->" + getTime( start, end ) );
     }
     
     

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=1158865&r1=1158864&r2=1158865&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 Wed Aug 17 18:50:17 2011
@@ -522,21 +522,21 @@ public class JdbmIndexTest
         assertEquals( 3, idx.count() );
 
         // use forward index's cursor
-        Cursor<IndexEntry<String, Entry, Long>> cursor = idx.forwardCursor();
+        Cursor<IndexEntry<String, Long>> cursor = idx.forwardCursor();
         cursor.beforeFirst();
 
         cursor.next();
-        IndexEntry<String, Entry, Long> e1 = cursor.get();
+        IndexEntry<String, Long> e1 = cursor.get();
         assertEquals( 555L, ( long ) e1.getId() );
         assertEquals( "bar", e1.getValue() );
 
         cursor.next();
-        IndexEntry<String, Entry, Long> e2 = cursor.get();
+        IndexEntry<String, Long> e2 = cursor.get();
         assertEquals( 333L, ( long ) e2.getId() );
         assertEquals( "foo", e2.getValue() );
 
         cursor.next();
-        IndexEntry<String, Entry, Long> e3 = cursor.get();
+        IndexEntry<String, Long> e3 = cursor.get();
         assertEquals( 1234L, ( long ) e3.getId() );
         assertEquals( "foo", e3.getValue() );
 

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=1158865&r1=1158864&r2=1158865&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 Wed Aug 17 18:50:17 2011
@@ -345,23 +345,23 @@ public class JdbmRdnIndexTest
         assertEquals( 5, idx.count() );
         
         // use forward index's cursor
-        Cursor<IndexEntry<ParentIdAndRdn<Long>, Long, Long>> cursor = idx.forwardCursor();
+        Cursor<IndexEntry<ParentIdAndRdn<Long>, Long>> cursor = idx.forwardCursor();
         cursor.beforeFirst();
 
         cursor.next();
-        IndexEntry<ParentIdAndRdn<Long>, Long, Long> e1 = cursor.get();
+        IndexEntry<ParentIdAndRdn<Long>, Long> e1 = cursor.get();
         assertEquals( 0, ( long ) e1.getId() );
         assertEquals( "cn=key", e1.getValue().getRdns()[0].getName() );
         assertEquals( 0, e1.getValue().getParentId().longValue() );
 
         cursor.next();
-        IndexEntry<ParentIdAndRdn<Long>, Long, Long> e2 = cursor.get();
+        IndexEntry<ParentIdAndRdn<Long>, Long> e2 = cursor.get();
         assertEquals( 1, ( long ) e2.getId() );
         assertEquals( "cn=key1", e2.getValue().getRdns()[0].getName() );
         assertEquals( 1, e2.getValue().getParentId().longValue() );
         
         cursor.next();
-        IndexEntry<ParentIdAndRdn<Long>, Long, Long> e3 = cursor.get();
+        IndexEntry<ParentIdAndRdn<Long>, Long> e3 = cursor.get();
         assertEquals( 2, ( long ) e3.getId() );
         assertEquals( "cn=key2", e3.getValue().getRdns()[0].getName() );
         assertEquals( 2, e3.getValue().getParentId().longValue() );

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=1158865&r1=1158864&r2=1158865&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 Wed Aug 17 18:50:17 2011
@@ -510,7 +510,7 @@ public class JdbmStoreTest
     {
         assertEquals( 3, store.getChildCount( 1L ) );
 
-        Cursor<IndexEntry<Long, Entry, Long>> cursor = store.list( 1L );
+        Cursor<IndexEntry<Long, Long>> cursor = store.list( 1L );
         assertNotNull( cursor );
         cursor.beforeFirst();
         assertTrue( cursor.next() );
@@ -547,7 +547,7 @@ public class JdbmStoreTest
 
         assertEquals( 19, idx.count() );
 
-        Cursor<IndexEntry<Long, Entry, Long>> cursor = idx.forwardCursor( 2L );
+        Cursor<IndexEntry<Long, Long>> cursor = idx.forwardCursor( 2L );
 
         assertTrue( cursor.next() );
         assertEquals( 2, ( long ) cursor.get().getId() );

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Wed Aug 17 18:50:17 2011
@@ -363,7 +363,7 @@ public class LdifPartition extends Abstr
 
             while ( cursor.next() )
             {
-                IndexEntry<Long, Entry, Long> entry = cursor.get();
+                IndexEntry<Long, Long> entry = cursor.get();
 
                 // except the parent entry add the rest of entries
                 if ( entry.getId() != entryIdOld )

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Wed Aug 17 18:50:17 2011
@@ -363,7 +363,7 @@ public class SingleFileLdifPartition ext
             {
                 do
                 {
-                    IndexEntry<Long, Entry, Long> idxEntry = cursor.get();
+                    IndexEntry<Long, Long> idxEntry = cursor.get();
                     Entry entry = lookup( idxEntry.getId() );
 
                     Long childId = getEntryId( entry.getDn() );

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Wed Aug 17 18:50:17 2011
@@ -761,7 +761,7 @@ public class ConfigPartitionReader
             // Loop on all the found elements
             do
             {
-                ForwardIndexEntry<Long, Entry, Long> forwardEntry = ( ForwardIndexEntry<Long, Entry, Long> ) cursor
+                ForwardIndexEntry<Long, Long> forwardEntry = ( ForwardIndexEntry<Long, Long> ) cursor
                     .get();
 
                 // Now, get the entry

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=1158865&r1=1158864&r2=1158865&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 Wed Aug 17 18:50:17 2011
@@ -1848,7 +1848,7 @@ public abstract class AbstractBTreeParti
         }
 
         // find all the children of the childId
-        Cursor<IndexEntry<ID, Entry, ID>> cursor = subLevelIdx.forwardCursor( entryId );
+        Cursor<IndexEntry<ID, ID>> cursor = subLevelIdx.forwardCursor( entryId );
 
         List<ID> childIds = new ArrayList<ID>();
         childIds.add( entryId );
@@ -2568,7 +2568,7 @@ public abstract class AbstractBTreeParti
             
             while ( cursor.next() )
             {
-                IndexEntry<?, Entry, ID> entry = cursor.get();
+                IndexEntry<?, ID> entry = cursor.get();
                 
                 System.out.println( entry );
             }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java Wed Aug 17 18:50:17 2011
@@ -132,14 +132,14 @@ public class EntryCursorAdaptor<ID exten
      */
     public Entry get() throws Exception
     {
-        IndexEntry<ID, Entry, ID> indexEntry = indexCursor.get();
+        IndexEntry<ID, ID> indexEntry = indexCursor.get();
 
-        if ( indexEntry.getObject() == null )
+        if ( indexEntry.getEntry() == null )
         {
-            indexEntry.setObject( db.lookup( indexEntry.getId() ) );
+            indexEntry.setEntry( db.lookup( indexEntry.getId() ) );
         }
 
-        return indexEntry.getObject();
+        return indexEntry.getEntry();
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java Wed Aug 17 18:50:17 2011
@@ -44,5 +44,5 @@ public interface IndexAssertion<K, E, ID
      * @throws Exception if their are failures while asserting the 
      * condition
      */
-    boolean assertCandidate( IndexEntry<K, E, ID> entry ) throws Exception;
+    boolean assertCandidate( IndexEntry<K, ID> entry ) throws Exception;
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Wed Aug 17 18:50:17 2011
@@ -44,8 +44,8 @@ public class IndexCursorAdaptor<K, O, ID
 {
     @SuppressWarnings("unchecked")
     final Cursor<Tuple> wrappedCursor;
-    final ForwardIndexEntry<K, O, ID> forwardEntry;
-    final ReverseIndexEntry<K, O, ID> reverseEntry;
+    final ForwardIndexEntry<K, ID> forwardEntry;
+    final ReverseIndexEntry<K, ID> reverseEntry;
 
 
     /**
@@ -63,13 +63,13 @@ public class IndexCursorAdaptor<K, O, ID
         
         if ( forwardIndex )
         {
-            forwardEntry = new ForwardIndexEntry<K, O, ID>();
+            forwardEntry = new ForwardIndexEntry<K, ID>();
             reverseEntry = null;
         }
         else
         {
             forwardEntry = null;
-            reverseEntry = new ReverseIndexEntry<K, O, ID>();
+            reverseEntry = new ReverseIndexEntry<K, ID>();
         }
     }
 
@@ -100,13 +100,13 @@ public class IndexCursorAdaptor<K, O, ID
     }
 
 
-    public void before( IndexEntry<K, O, ID> element ) throws Exception
+    public void before( IndexEntry<K, ID> element ) throws Exception
     {
         wrappedCursor.before( element.getTuple() );
     }
 
 
-    public void after( IndexEntry<K, O, ID> element ) throws Exception
+    public void after( IndexEntry<K, ID> element ) throws Exception
     {
         wrappedCursor.after( element.getTuple() );
     }
@@ -155,7 +155,7 @@ public class IndexCursorAdaptor<K, O, ID
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<K, O, ID> get() throws Exception
+    public IndexEntry<K, ID> get() throws Exception
     {
         if ( forwardEntry != null )
         {
@@ -190,9 +190,9 @@ public class IndexCursorAdaptor<K, O, ID
     }
 
 
-    public Iterator<IndexEntry<K, O, ID>> iterator()
+    public Iterator<IndexEntry<K, ID>> iterator()
     {
-        return new CursorIterator<IndexEntry<K, O, ID>>( this );
+        return new CursorIterator<IndexEntry<K, ID>>( this );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Wed Aug 17 18:50:17 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractIndexCursor<V, Entry, ID> extends AbstractCursor<IndexEntry<V, Entry, ID>> implements IndexCursor<V, Entry, ID>
+public abstract class AbstractIndexCursor<V, Entry, ID> extends AbstractCursor<IndexEntry<V, ID>> implements IndexCursor<V, Entry, ID>
 {
     /** Tells if there are some element available in the cursor */
     private boolean available = false;
@@ -60,7 +60,7 @@ public abstract class AbstractIndexCurso
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void after( IndexEntry<V, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( getUnsupportedMessage() );
     }
@@ -69,7 +69,7 @@ public abstract class AbstractIndexCurso
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void before( IndexEntry<V, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( getUnsupportedMessage() );
     }
@@ -105,9 +105,9 @@ public abstract class AbstractIndexCurso
     /**
      * {@inheritDoc}
      */
-    public Iterator<IndexEntry<V, Entry, ID>> iterator()
+    public Iterator<IndexEntry<V, ID>> iterator()
     {
-        return new CursorIterator<IndexEntry<V, Entry, ID>>( this );
+        return new CursorIterator<IndexEntry<V, ID>>( this );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java Wed Aug 17 18:50:17 2011
@@ -20,6 +20,7 @@
 package org.apache.directory.server.xdbm;
 
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**
@@ -28,21 +29,20 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <V> The value stored in the Tuple, associated key for the object
  * @param <ID> The ID of the object
- * @param <O> The associated object
  */
-public abstract class AbstractIndexEntry<V, O, ID> implements IndexEntry<V, O, ID>
+public abstract class AbstractIndexEntry<V, ID> implements IndexEntry<V, ID>
 {
-    /** The referenced object if loaded from the store */
-    private O object;
+    /** The referenced Entry if loaded from the store */
+    private Entry entry;
 
     /**
      * Creates an instance of AbstractIndexEntry
      * 
-     * @param object The interned object
+     * @param object The interned Entry
      */
-    protected AbstractIndexEntry( O object )
+    protected AbstractIndexEntry( Entry entry )
     {
-        this.object = object;
+        this.entry = entry;
     }
     
     
@@ -73,9 +73,9 @@ public abstract class AbstractIndexEntry
     /**
      * {@inheritDoc}
      */
-    public O getObject()
+    public Entry getEntry()
     {
-        return object;
+        return entry;
     }
 
     
@@ -88,9 +88,9 @@ public abstract class AbstractIndexEntry
     /**
      * {@inheritDoc}
      */
-    public void setObject( O object )
+    public void setEntry( Entry entry )
     {
-        this.object = object;
+        this.entry = entry;
     }
 
     
@@ -99,15 +99,15 @@ public abstract class AbstractIndexEntry
      */
     public void clear()
     {
-        object = null;
+        entry = null;
     }
 
     
     /**
      * {@inheritDoc}
      */
-    public void copy( IndexEntry<V, O, ID> entry )
+    public void copy( IndexEntry<V, ID> entry )
     {
-        object = entry.getObject();
+        this.entry = entry.getEntry();
     }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Wed Aug 17 18:50:17 2011
@@ -33,7 +33,7 @@ public class EmptyIndexCursor<K, E, ID> 
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<K, E, ID> element ) throws Exception
+    public void before( IndexEntry<K, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
     }
@@ -51,7 +51,7 @@ public class EmptyIndexCursor<K, E, ID> 
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<K, E, ID> element ) throws Exception
+    public void after( IndexEntry<K, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
     }
@@ -97,7 +97,7 @@ public class EmptyIndexCursor<K, E, ID> 
     }
 
 
-    public IndexEntry<K, E, ID> get() throws Exception
+    public IndexEntry<K, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_703 ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java Wed Aug 17 18:50:17 2011
@@ -20,18 +20,18 @@
 package org.apache.directory.server.xdbm;
 
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**
  * An index id value pair based on a Tuple which can optionally reference the
- * indexed object if one has already been loaded.
+ * indexed Entry if one has already been loaded.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <V> The value stored in the Tuple, associated key for the object
  * @param <ID> The ID of the object
- * @param <O> The associated object
  */
-public class ForwardIndexEntry<V, O, ID> extends AbstractIndexEntry<V, O, ID>
+public class ForwardIndexEntry<V, ID> extends AbstractIndexEntry<V, ID>
 {
     /** The underlying Tuple */
     private final Tuple<V, ID> tuple = new Tuple<V, ID>();
@@ -48,15 +48,15 @@ public class ForwardIndexEntry<V, O, ID>
     
     /**
      * Sets the key value tuple represented by this ForwardIndexEntry optionally
-     * setting the obj associated with the id if one was loaded from the
+     * setting the Entry associated with the id if one was loaded from the
      * master table.
      *
      * @param tuple the tuple for the ForwardIndexEntry
-     * @param object the resuscitated object if any
+     * @param entry the resuscitated Entry if any
      */
-    public void setTuple( Tuple<V, ID> tuple, O object )
+    public void setTuple( Tuple<V, ID> tuple, Entry entry )
     {
-        setObject( object );
+        setEntry( entry );
         this.tuple.setKey( tuple.getKey() );
         this.tuple.setValue( tuple.getValue() );
     }
@@ -121,7 +121,7 @@ public class ForwardIndexEntry<V, O, ID>
     /**
      * {@inheritDoc}
      */
-    public void copy( IndexEntry<V, O, ID> entry )
+    public void copy( IndexEntry<V, ID> entry )
     {
         super.copy( entry );
         tuple.setKey( entry.getValue() );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java Wed Aug 17 18:50:17 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface IndexCursor<V, E, ID> extends Cursor<IndexEntry<V, E, ID>>
+public interface IndexCursor<V, E, ID> extends Cursor<IndexEntry<V, ID>>
 {
     /**
      * An alternative to calling before(IndexEntry) which often may require

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java Wed Aug 17 18:50:17 2011
@@ -20,24 +20,24 @@
 package org.apache.directory.server.xdbm;
 
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**
- * Interface for index entries. An index entry associate an Entry object with 
- * a value (the key) and the Object ID in the table where it's stored. The Object
- * may be present in this instance once we read it from the tabe.
+ * Interface for index entries. An index entry associate an Entry with 
+ * a value (the key) and the Entry ID in the table where it's stored. The Entry
+ * may be present in this instance once we read it from the table.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <V> The value stored in the Tuple, associated key for the object
  * @param <ID> The ID of the object
- * @param <O> The associated object
  */
-public interface IndexEntry<V, O, ID>
+public interface IndexEntry<V, ID>
 {
     /**
      * Gets the value referred to by this IndexEntry.
      *
-     * @return the value of the object referred to
+     * @return the value of the Entry referred to
      */
     V getValue();
 
@@ -45,33 +45,33 @@ public interface IndexEntry<V, O, ID>
     /**
      * Sets the value referred to by this IndexEntry.
      *
-     * @param value the value of the object referred to
+     * @param value the value of the Entry referred to
      */
     void setValue( V value );
 
 
     /**
-     * Gets the id of the indexed object.
+     * Gets the id of the indexed Entry.
      *
-     * @return the id of the indexed object
+     * @return the id of the indexed Entry
      */
     ID getId();
 
 
     /**
-     * Sets the id of the indexed.object
+     * Sets the id of the indexed.Entry
      *
-     * @param id the id of the indexed object
+     * @param id the id of the indexed Entry
      */
     void setId( ID id );
 
 
     /**
-     * Gets the object indexed if resuscitated.
+     * Gets the Entry indexed if found.
      *
-     * @return the object indexed
+     * @return the indexed Entry
      */
-    O getObject();
+    Entry getEntry();
 
 
     /**
@@ -83,15 +83,15 @@ public interface IndexEntry<V, O, ID>
 
 
     /**
-     * Sets the indexed object.
+     * Sets the indexed Entry.
      *
-     * @param obj the indexed object
+     * @param entry the indexed Entry
      */
-    void setObject( O obj );
+    void setEntry( Entry entry );
 
 
     /**
-     * Clears the id, value and object in this IndexEntry.
+     * Clears the id, value and Entry in this IndexEntry.
      */
     void clear();
 
@@ -101,5 +101,5 @@ public interface IndexEntry<V, O, ID>
      *
      * @param entry the entry to copy fields of
      */
-    void copy( IndexEntry<V, O, ID> entry );
+    void copy( IndexEntry<V, ID> entry );
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java Wed Aug 17 18:50:17 2011
@@ -20,18 +20,18 @@
 package org.apache.directory.server.xdbm;
 
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**
- * An index id value pair which can optionally reference the indexed obj
+ * An index id value pair which can optionally reference the indexed Entry
  * if one has already been loaded.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @param <V> The value stored in the Tuple, associated key for the object
- * @param <ID> The ID of the object
- * @param <O> The associated object
+ * @param <V> The value stored in the Tuple, associated key for the Entry
+ * @param <ID> The ID of the Entry
  */
-public class ReverseIndexEntry<V, O, ID> extends AbstractIndexEntry<V, O, ID>
+public class ReverseIndexEntry<V, ID> extends AbstractIndexEntry<V, ID>
 {
     /** The underlying Tuple */
     private final Tuple<ID, V> tuple = new Tuple<ID, V>();
@@ -49,15 +49,15 @@ public class ReverseIndexEntry<V, O, ID>
 
     /**
      * Sets the Tuple value represented by this ReverseIndexEntry optionally
-     * setting the obj associated with the id if one was loaded from the
+     * setting the Entry associated with the id if one was loaded from the
      * master table.
      *
      * @param tuple the tuple for the ReverseIndexEntry
-     * @param obj the resusitated object that is indexed if any
+     * @param obj the resusitated Entry that is indexed if any
      */
-    public void setTuple( Tuple<ID, V> tuple, O object )
+    public void setTuple( Tuple<ID, V> tuple, Entry entry )
     {
-        setObject( object );
+        setEntry( entry );
         this.tuple.setKey( tuple.getKey() );
         this.tuple.setValue( tuple.getValue() );
     }
@@ -122,9 +122,9 @@ public class ReverseIndexEntry<V, O, ID>
     /**
      * {@inheritDoc}
      */
-    public void copy( IndexEntry<V, O, ID> entry )
+    public void copy( IndexEntry<V, ID> entry )
     {
-        setObject( entry.getObject() );
+        setEntry( entry.getEntry() );
         tuple.setKey( entry.getId() );
         tuple.setValue( entry.getValue() );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Wed Aug 17 18:50:17 2011
@@ -34,10 +34,10 @@ public class SingletonIndexCursor<V, ID>
     private boolean beforeFirst = true;
     private boolean afterLast;
     private boolean onSingleton;
-    private final IndexEntry<V, Entry, ID> singleton;
+    private final IndexEntry<V, ID> singleton;
 
 
-    public SingletonIndexCursor( IndexEntry<V, Entry, ID> singleton )
+    public SingletonIndexCursor( IndexEntry<V, ID> singleton )
     {
         this.singleton = singleton;
     }
@@ -172,9 +172,10 @@ public class SingletonIndexCursor<V, ID>
     }
 
 
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "()" );
+        
         if ( onSingleton )
         {
             return singleton;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java Wed Aug 17 18:50:17 2011
@@ -62,7 +62,7 @@ public interface Evaluator<N extends Exp
      * @return true if filter selects the candidate false otherwise
      * @throws Exception if there are faults during evaluation
      */
-    boolean evaluate( IndexEntry<?, E, ID> entry ) throws Exception;
+    boolean evaluate( IndexEntry<?, ID> entry ) throws Exception;
 
 
     /**

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java Wed Aug 17 18:50:17 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
  */
 public class AllEntriesCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
 {
-    private IndexEntry<ID, Entry, ID> indexEntry = new ForwardIndexEntry<ID, Entry, ID>();
+    private IndexEntry<ID, ID> indexEntry = new ForwardIndexEntry<ID, ID>();
     private final IndexCursor<String, Entry, ID> wrapped;
 
 
@@ -78,7 +78,7 @@ public class AllEntriesCursor<ID extends
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<ID, Entry, ID> indexEntry ) throws Exception
+    public void after( IndexEntry<ID, ID> indexEntry ) throws Exception
     {
         checkNotClosed( "after()" );
         wrapped.afterValue( indexEntry.getId(), null );
@@ -107,7 +107,7 @@ public class AllEntriesCursor<ID extends
     /* 
      * @see org.apache.directory.server.core.cursor.Cursor#before(java.lang.Object)
      */
-    public void before( IndexEntry<ID, Entry, ID> indexEntry ) throws Exception
+    public void before( IndexEntry<ID, ID> indexEntry ) throws Exception
     {
         checkNotClosed( "before()" );
         wrapped.beforeValue( indexEntry.getId(), null );
@@ -137,13 +137,14 @@ public class AllEntriesCursor<ID extends
     /* 
      * @see org.apache.directory.server.core.cursor.Cursor#get()
      */
-    public IndexEntry<ID, Entry, ID> get() throws Exception
+    public IndexEntry<ID, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        IndexEntry<String, Entry, ID> wrappedEntry = wrapped.get();
+        IndexEntry<String, ID> wrappedEntry = wrapped.get();
         indexEntry.setId( wrappedEntry.getId() );
         indexEntry.setValue( wrappedEntry.getId() );
-        indexEntry.setObject( wrappedEntry.getObject() );
+        indexEntry.setEntry( wrappedEntry.getEntry() );
+        
         return indexEntry;
     }
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Wed Aug 17 18:50:17 2011
@@ -47,6 +47,13 @@ public class AndCursor<V, ID> extends Ab
     private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
 
 
+    /**
+     * Creates an instance of a AndCursor. It wraps an index cursor and the list
+     * of evaluators associated with all the elements connected by the And.
+     * 
+     * @param wrapped The encapsulated IndexCursor
+     * @param evaluators The list of evaluators associated wth the elements
+     */
     public AndCursor( IndexCursor<V, Entry, ID> wrapped,
         List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
     {
@@ -64,6 +71,9 @@ public class AndCursor<V, ID> extends Ab
     }
 
     
+    /**
+     * {@inheritDoc}
+     */
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -72,6 +82,9 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void afterLast() throws Exception
     {
         checkNotClosed( "afterLast()" );
@@ -80,27 +93,38 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean first() throws Exception
     {
         beforeFirst();
+        
         return next();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean last() throws Exception
     {
         afterLast();
+        
         return previous();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean previous() throws Exception
     {
         while ( wrapped.previous() )
         {
             checkNotClosed( "previous()" );
 
-            IndexEntry<?, Entry, ID> candidate = wrapped.get();
+            IndexEntry<V, ID> candidate = wrapped.get();
             
             if ( matches( candidate ) )
             {
@@ -112,12 +136,15 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean next() throws Exception
     {
         while ( wrapped.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, Entry, ID> candidate = wrapped.get();
+            IndexEntry<V, ID> candidate = wrapped.get();
             
             if ( matches( candidate ) )
             {
@@ -129,7 +156,10 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    /**
+     * {@inheritDoc}
+     */
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         
@@ -142,6 +172,9 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void close() throws Exception
     {
         super.close();
@@ -201,7 +234,10 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    private boolean matches( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    /**
+     * Checks if the entry is a valid candidate by using the evaluators.
+     */
+    private boolean matches( IndexEntry<V, ID> indexEntry ) throws Exception
     {
         for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java Wed Aug 17 18:50:17 2011
@@ -116,7 +116,7 @@ public class AndEvaluator<ID> implements
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Wed Aug 17 18:50:17 2011
@@ -134,7 +134,7 @@ public class ApproximateCursor<V, ID ext
     }
 
 
-    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         
@@ -153,7 +153,7 @@ public class ApproximateCursor<V, ID ext
      * {@inheritDoc}
      */
     @Override
-    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         
@@ -222,7 +222,7 @@ public class ApproximateCursor<V, ID ext
         while ( uuidIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, Entry, ID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, ID> candidate = uuidIdxCursor.get();
             
             if ( approximateEvaluator.evaluate( candidate ) )
             {
@@ -244,7 +244,7 @@ public class ApproximateCursor<V, ID ext
         while ( uuidIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, Entry, ID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, ID> candidate = uuidIdxCursor.get();
             
             if ( approximateEvaluator.evaluate( candidate ) )
             {
@@ -257,7 +257,7 @@ public class ApproximateCursor<V, ID ext
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( userIdxCursor != null )
@@ -267,7 +267,7 @@ public class ApproximateCursor<V, ID ext
 
         if ( available() )
         {
-            return ( IndexEntry<V, Entry, ID> ) uuidIdxCursor.get();
+            return ( IndexEntry<V, ID> ) uuidIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Wed Aug 17 18:50:17 2011
@@ -26,8 +26,8 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.ApproximateNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -127,20 +127,20 @@ public class ApproximateEvaluator<T, ID 
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         if ( idx != null )
         {
             return idx.forward( node.getValue().getValue(), indexEntry.getId() );
         }
 
-        Entry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getEntry();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
         {
             entry = db.lookup( indexEntry.getId() );
-            indexEntry.setObject( entry );
+            indexEntry.setEntry( entry );
         }
 
         return evaluateEntry( entry );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Wed Aug 17 18:50:17 2011
@@ -157,7 +157,7 @@ public class DefaultSearchEngine<ID exte
                 effectiveBaseId = db.getEntryId( effectiveBase );
             }
 
-            IndexEntry<ID, Entry, ID> indexEntry = new ForwardIndexEntry<ID, Entry, ID>();
+            IndexEntry<ID, ID> indexEntry = new ForwardIndexEntry<ID, ID>();
             indexEntry.setId( effectiveBaseId );
             optimizer.annotate( filter );
             Evaluator<? extends ExprNode, Entry, ID> evaluator = evaluatorBuilder.build( filter );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Wed Aug 17 18:50:17 2011
@@ -121,7 +121,7 @@ public class EqualityCursor<V, ID extend
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         
@@ -158,7 +158,7 @@ public class EqualityCursor<V, ID extend
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         
@@ -249,7 +249,7 @@ public class EqualityCursor<V, ID extend
         while ( uuidIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, Entry, ID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, ID> candidate = uuidIdxCursor.get();
             
             if ( equalityEvaluator.evaluate( candidate ) )
             {
@@ -275,7 +275,7 @@ public class EqualityCursor<V, ID extend
         while ( uuidIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, Entry, ID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, ID> candidate = uuidIdxCursor.get();
             
             if ( equalityEvaluator.evaluate( candidate ) )
             {
@@ -291,7 +291,7 @@ public class EqualityCursor<V, ID extend
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         
@@ -302,7 +302,7 @@ public class EqualityCursor<V, ID extend
 
         if ( available() )
         {
-            return ( IndexEntry<V, Entry, ID> ) uuidIdxCursor.get();
+            return ( IndexEntry<V, ID> ) uuidIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Wed Aug 17 18:50:17 2011
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -92,20 +92,20 @@ public class EqualityEvaluator<T, ID ext
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         if ( idx != null )
         {
             return idx.forward( node.getValue().getValue(), indexEntry.getId() );
         }
 
-        Entry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getEntry();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
         {
             entry = db.lookup( indexEntry.getId() );
-            indexEntry.setObject( entry );
+            indexEntry.setEntry( entry );
         }
 
         return evaluateEntry( entry );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Wed Aug 17 18:50:17 2011
@@ -59,7 +59,7 @@ public class GreaterEqCursor<V, ID exten
      * call to evaluate() which changes the value so it's not referring to
      * the NDN but to the value of the attribute instead.
      */
-    IndexEntry<String, Entry, ID> ndnCandidate;
+    IndexEntry<String, ID> ndnCandidate;
 
 
     @SuppressWarnings("unchecked")
@@ -173,7 +173,7 @@ public class GreaterEqCursor<V, ID exten
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         
@@ -207,7 +207,7 @@ public class GreaterEqCursor<V, ID exten
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         
@@ -255,7 +255,7 @@ public class GreaterEqCursor<V, ID exten
         checkNotClosed( "beforeFirst()" );
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
+            IndexEntry<V, ID> advanceTo = new ForwardIndexEntry<V, ID>();
             advanceTo.setValue( ( V ) greaterEqEvaluator.getExpression().getValue().getValue() );
             userIdxCursor.before( advanceTo );
         }
@@ -313,7 +313,7 @@ public class GreaterEqCursor<V, ID exten
             while ( userIdxCursor.previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
+                IndexEntry<?, ID> candidate = userIdxCursor.get();
                 
                 if ( greaterEqEvaluator.getComparator().compare( candidate.getValue(),
                     greaterEqEvaluator.getExpression().getValue().getValue() ) >= 0 )
@@ -369,7 +369,7 @@ public class GreaterEqCursor<V, ID exten
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         
@@ -385,7 +385,7 @@ public class GreaterEqCursor<V, ID exten
 
         if ( available() )
         {
-            return ( IndexEntry<V, Entry, ID> ) ndnCandidate;
+            return ( IndexEntry<V, ID> ) ndnCandidate;
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Wed Aug 17 18:50:17 2011
@@ -26,8 +26,8 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -87,20 +87,20 @@ public class GreaterEqEvaluator<T, ID ex
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         if ( idx != null && idx.isDupsEnabled() )
         {
             return idx.reverseGreaterOrEq( indexEntry.getId(), node.getValue().getValue() );
         }
 
-        Entry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getEntry();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
         {
             entry = db.lookup( indexEntry.getId() );
-            indexEntry.setObject( entry );
+            indexEntry.setEntry( entry );
         }
 
         /*
@@ -116,7 +116,7 @@ public class GreaterEqEvaluator<T, ID ex
 
         // if the attribute exists and has a greater than or equal value return true
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, ID> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -138,7 +138,7 @@ public class GreaterEqEvaluator<T, ID ex
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, ID> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -202,7 +202,7 @@ public class GreaterEqEvaluator<T, ID ex
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value 
-    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, Attribute attribute )
+    private boolean evaluate( IndexEntry<Object, ID> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Wed Aug 17 18:50:17 2011
@@ -59,7 +59,7 @@ public class LessEqCursor<V, ID extends 
      * call to evaluate() which changes the value so it's not referring to
      * the NDN but to the value of the attribute instead.
      */
-    IndexEntry<V, Entry, ID> ndnCandidate;
+    IndexEntry<V, ID> ndnCandidate;
 
 
     @SuppressWarnings("unchecked")
@@ -145,7 +145,7 @@ public class LessEqCursor<V, ID extends 
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         
@@ -234,7 +234,7 @@ public class LessEqCursor<V, ID extends 
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
+    public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         
@@ -293,7 +293,7 @@ public class LessEqCursor<V, ID extends 
         checkNotClosed( "afterLast()" );
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
+            IndexEntry<V, ID> advanceTo = new ForwardIndexEntry<V, ID>();
             //noinspection unchecked
             advanceTo.setValue( ( V ) lessEqEvaluator.getExpression().getValue().getValue() );
             userIdxCursor.after( advanceTo );
@@ -369,7 +369,7 @@ public class LessEqCursor<V, ID extends 
             while ( userIdxCursor.next() )
             {
                 checkNotClosed( "next()" );
-                IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
+                IndexEntry<?, ID> candidate = userIdxCursor.get();
                 
                 if ( lessEqEvaluator.getComparator().compare( candidate.getValue(),
                     lessEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
@@ -400,7 +400,7 @@ public class LessEqCursor<V, ID extends 
     }
 
 
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Wed Aug 17 18:50:17 2011
@@ -98,20 +98,20 @@ public class LessEqEvaluator<T, ID exten
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         if ( ( idx != null ) && idx.isDupsEnabled() )
         {
             return idx.reverseLessOrEq( indexEntry.getId(), node.getValue().getValue() );
         }
 
-        Entry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getEntry();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
         {
             entry = db.lookup( indexEntry.getId() );
-            indexEntry.setObject( entry );
+            indexEntry.setEntry( entry );
         }
 
         if ( null == entry )
@@ -124,7 +124,7 @@ public class LessEqEvaluator<T, ID exten
 
         // if the attribute does not exist just return false
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, ID> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -146,7 +146,7 @@ public class LessEqEvaluator<T, ID exten
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, ID> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -199,7 +199,7 @@ public class LessEqEvaluator<T, ID exten
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, Attribute attribute )
+    private boolean evaluate( IndexEntry<Object, ID> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Wed Aug 17 18:50:17 2011
@@ -98,7 +98,7 @@ public class NotCursor<V, ID extends Com
         while ( uuidCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, Entry, ID> candidate = uuidCursor.get();
+            IndexEntry<?, ID> candidate = uuidCursor.get();
             
             if ( !childEvaluator.evaluate( candidate ) )
             {
@@ -115,7 +115,7 @@ public class NotCursor<V, ID extends Com
         while ( uuidCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, Entry, ID> candidate = uuidCursor.get();
+            IndexEntry<?, ID> candidate = uuidCursor.get();
             
             if ( !childEvaluator.evaluate( candidate ) )
             {
@@ -127,7 +127,7 @@ public class NotCursor<V, ID extends Com
     }
 
 
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java Wed Aug 17 18:50:17 2011
@@ -54,7 +54,7 @@ public class NotEvaluator<ID> implements
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         return !childEvaluator.evaluate( indexEntry );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Wed Aug 17 18:50:17 2011
@@ -52,10 +52,10 @@ public class OneLevelScopeCursor<ID exte
     private final IndexCursor<ID, Entry, ID> scopeCursor;
 
     /** A Cursor over entries brought into scope by alias dereferencing */
-    private final Cursor<IndexEntry<ID, Entry, ID>> dereferencedCursor;
+    private final Cursor<IndexEntry<ID, ID>> dereferencedCursor;
 
     /** Currently active Cursor: we switch between two cursors */
-    private Cursor<IndexEntry<ID, Entry, ID>> cursor;
+    private Cursor<IndexEntry<ID, ID>> cursor;
 
 
     /**
@@ -266,7 +266,7 @@ public class OneLevelScopeCursor<ID exte
     }
 
 
-    public IndexEntry<ID, Entry, ID> get() throws Exception
+    public IndexEntry<ID, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java Wed Aug 17 18:50:17 2011
@@ -20,12 +20,12 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.shared.ldap.model.filter.ScopeNode;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
+import org.apache.directory.shared.ldap.model.filter.ScopeNode;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 
 
 /**
@@ -150,7 +150,7 @@ public class OneLevelScopeEvaluator<E, I
      * @throws Exception if db lookups fail
      * @see org.apache.directory.server.xdbm.search.Evaluator#evaluate(IndexEntry)
      */
-    public boolean evaluate( IndexEntry<?, E, ID> candidate ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> candidate ) throws Exception
     {
         boolean isChild = db.getOneLevelIndex().forward( baseId, candidate.getId() );
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Wed Aug 17 18:50:17 2011
@@ -127,7 +127,7 @@ public class OrCursor<V, ID> extends Abs
      * @param indexEntry the index entry to blacklist
      * @throws Exception if there are problems accessing underlying db
      */
-    private void blackListIfDuplicate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    private void blackListIfDuplicate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         for ( int ii = 0; ii < evaluators.size(); ii++ )
         {
@@ -149,7 +149,8 @@ public class OrCursor<V, ID> extends Abs
         while ( cursors.get( cursorIndex ).previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
+            
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
@@ -167,7 +168,8 @@ public class OrCursor<V, ID> extends Abs
             while ( cursors.get( cursorIndex ).previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
+                
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
@@ -186,7 +188,7 @@ public class OrCursor<V, ID> extends Abs
         while ( cursors.get( cursorIndex ).next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
@@ -204,7 +206,7 @@ public class OrCursor<V, ID> extends Abs
             while ( cursors.get( cursorIndex ).next() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
@@ -218,7 +220,7 @@ public class OrCursor<V, ID> extends Abs
     }
 
 
-    public IndexEntry<V, Entry, ID> get() throws Exception
+    public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java?rev=1158865&r1=1158864&r2=1158865&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java Wed Aug 17 18:50:17 2011
@@ -102,7 +102,7 @@ public class OrEvaluator<ID> implements 
     }
 
 
-    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
     {
         for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {



Mime
View raw message