directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1538477 [2/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
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
Sun Nov  3 23:25:46 2013
@@ -44,7 +44,7 @@ import org.apache.directory.server.xdbm.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AvlIndex<K, O> extends AbstractIndex<K, O, String>
+public class AvlIndex<K> extends AbstractIndex<K, String>
 {
     protected Normalizer normalizer;
     protected AvlTable<K, String> forward;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
Sun Nov  3 23:25:46 2013
@@ -36,7 +36,7 @@ import org.apache.directory.server.xdbm.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AvlRdnIndex extends AvlIndex<ParentIdAndRdn, Entry>
+public class AvlRdnIndex extends AvlIndex<ParentIdAndRdn>
 {
     public AvlRdnIndex()
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
Sun Nov  3 23:25:46 2013
@@ -91,7 +91,7 @@ public class ApproximateCursor<V> extend
 
         if ( store.hasIndexOn( attributeType ) )
         {
-            Index<V, Entry, String> index = ( Index<V, Entry, String> ) store.getIndex(
attributeType );
+            Index<V, String> index = ( Index<V, String> ) store.getIndex( attributeType
);
             userIdxCursor = index.forwardCursor( value.getValue() );
             uuidIdxCursor = null;
         }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
Sun Nov  3 23:25:46 2013
@@ -89,7 +89,7 @@ public class EqualityCursor<V> extends A
 
         if ( store.hasIndexOn( attributeType ) )
         {
-            Index<V, Entry, String> userIndex = ( Index<V, Entry, String> ) store.getIndex(
attributeType );
+            Index<V, String> userIndex = ( Index<V, String> ) store.getIndex(
attributeType );
             userIdxCursor = userIndex.forwardCursor( value.getValue() );
             uuidIdxCursor = null;
         }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
Sun Nov  3 23:25:46 2013
@@ -93,7 +93,7 @@ public class GreaterEqCursor<V> extends 
 
         if ( store.hasIndexOn( attributeType ) )
         {
-            userIdxCursor = ( ( Index<V, Entry, String> ) store.getIndex( attributeType
) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, String> ) store.getIndex( attributeType )
).forwardCursor();
             uuidIdxCursor = null;
         }
         else

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
Sun Nov  3 23:25:46 2013
@@ -87,7 +87,7 @@ public class LessEqCursor<V> extends Abs
 
         if ( store.hasIndexOn( attributeType ) )
         {
-            userIdxCursor = ( ( Index<V, Entry, String> ) store.getIndex( attributeType
) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, String> ) store.getIndex( attributeType )
).forwardCursor();
             uuidIdxCursor = null;
         }
         else

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
Sun Nov  3 23:25:46 2013
@@ -70,7 +70,7 @@ public class SubstringCursor extends Abs
 
         if ( hasIndex )
         {
-            wrapped = ( ( Index<String, Entry, String> ) store.getIndex( evaluator.getExpression().getAttributeType()
) )
+            wrapped = ( ( Index<String, String> ) store.getIndex( evaluator.getExpression().getAttributeType()
) )
                 .forwardCursor();
         }
         else

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -58,7 +58,7 @@ public class ApproximateEvaluator<T> ext
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
+            idx = ( Index<T, String> ) db.getIndex( attributeType );
             normalizer = null;
             ldapComparator = null;
         }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -63,7 +63,7 @@ public class EqualityEvaluator<T> extend
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
+            idx = ( Index<T, String> ) db.getIndex( attributeType );
         }
 
         MatchingRule mr = attributeType.getEquality();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -52,7 +52,7 @@ public class GreaterEqEvaluator<T> exten
 
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
+            idx = ( Index<T, String> ) db.getIndex( attributeType );
         }
         else
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -59,7 +59,7 @@ public abstract class LeafEvaluator<T> i
     protected LdapComparator<? super Object> ldapComparator;
 
     /** The index to use if any */
-    protected Index<T, Entry, String> idx;
+    protected Index<T, String> idx;
 
 
     @SuppressWarnings("unchecked")

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -52,7 +52,7 @@ public class LessEqEvaluator<T> extends 
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
+            idx = ( Index<T, String> ) db.getIndex( attributeType );
         }
         else
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -56,7 +56,7 @@ public class PresenceEvaluator implement
     private final SchemaManager schemaManager;
 
     /** The index to use if any */
-    private final Index<String, Entry, String> idx;
+    private final Index<String, String> idx;
 
 
     public PresenceEvaluator( PresenceNode node, Store db, SchemaManager schemaManager )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java
Sun Nov  3 23:25:46 2013
@@ -65,7 +65,7 @@ public class SubstringEvaluator implemen
     private final Normalizer normalizer;
 
     /** The index to use if any */
-    private final Index<String, Entry, String> idx;
+    private final Index<String, String> idx;
 
 
     /**
@@ -114,7 +114,7 @@ public class SubstringEvaluator implemen
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<String, Entry, String> ) db.getIndex( attributeType );
+            idx = ( Index<String, String> ) db.getIndex( attributeType );
         }
         else
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
Sun Nov  3 23:25:46 2013
@@ -215,7 +215,7 @@ public class CursorBuilder
         if ( db.hasIndexOn( attributeType ) )
         {
             // Get the cursor using the index
-            Index<T, Entry, String> userIndex = ( Index<T, Entry, String> ) db.getIndex(
attributeType );
+            Index<T, String> userIndex = ( Index<T, String> ) db.getIndex( attributeType
);
             Cursor<IndexEntry<T, String>> userIdxCursor = userIndex.forwardCursor(
value.getValue() );
             Set<String> uuidSet = searchResult.getCandidateSet();
 
@@ -261,7 +261,7 @@ public class CursorBuilder
         if ( db.hasIndexOn( attributeType ) )
         {
             // Get the cursor using the index
-            Index<T, Entry, String> userIndex = ( Index<T, Entry, String> ) db.getIndex(
attributeType );
+            Index<T, String> userIndex = ( Index<T, String> ) db.getIndex( attributeType
);
             Cursor<IndexEntry<T, String>> userIdxCursor = userIndex.forwardCursor();
 
             // Position the index on the element we should start from
@@ -313,7 +313,7 @@ public class CursorBuilder
         if ( db.hasIndexOn( attributeType ) )
         {
             // Get the cursor using the index
-            Index<T, Entry, String> userIndex = ( Index<T, Entry, String> ) db.getIndex(
attributeType );
+            Index<T, String> userIndex = ( Index<T, String> ) db.getIndex( attributeType
);
             Cursor<IndexEntry<T, String>> userIdxCursor = userIndex.forwardCursor();
 
             // Position the index on the element we should start from
@@ -581,7 +581,7 @@ public class CursorBuilder
         // Fetch all the UUIDs if we have an index
         if ( db.hasIndexOn( attributeType ) )
         {
-            Index<String, Entry, String> userIndex = ( ( Index<String, Entry, String>
) db.getIndex( attributeType ) );
+            Index<String, String> userIndex = ( ( Index<String, String> ) db.getIndex(
attributeType ) );
             Cursor<IndexEntry<String, String>> cursor = userIndex.forwardCursor();
 
             // Position the index on the element we should start from

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
Sun Nov  3 23:25:46 2013
@@ -304,7 +304,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<V, E, String> idx = ( Index<V, E, String> ) db.getIndex( node.getAttributeType()
);
+            Index<V, String> idx = ( Index<V, String> ) db.getIndex( node.getAttributeType()
);
 
             Cursor<String> result = idx.forwardValueCursor( node.getValue().getValue()
);
             Set<String> values = new HashSet<String>();
@@ -359,7 +359,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<V, E, String> idx = ( Index<V, E, String> ) db.getIndex( node.getAttributeType()
);
+            Index<V, String> idx = ( Index<V, String> ) db.getIndex( node.getAttributeType()
);
 
             if ( isGreaterThan )
             {
@@ -390,7 +390,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<String, E, String> idx = ( Index<String, E, String> ) db.getIndex(
node.getAttributeType() );
+            Index<String, String> idx = ( Index<String, String> ) db.getIndex(
node.getAttributeType() );
 
             String initial = node.getInitial();
 
@@ -425,7 +425,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<?, ?, ?> idx = db.getIndex( node.getAttributeType() );
+            Index<?, ?> idx = db.getIndex( node.getAttributeType() );
             return idx.count();
         }
 
@@ -445,13 +445,13 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasUserIndexOn( node.getAttributeType() ) )
         {
-            Index<String, Entry, String> presenceIndex = db.getPresenceIndex();
+            Index<String, String> presenceIndex = db.getPresenceIndex();
 
             return presenceIndex.count( node.getAttributeType().getOid() );
         }
         else if ( node.getAttributeType().getOid().equals( SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID
) )
         {
-            Index<String, Entry, String> presenceIndex = db.getPresenceIndex();
+            Index<String, String> presenceIndex = db.getPresenceIndex();
 
             return presenceIndex.count( node.getAttributeType().getOid() );
         }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
Sun Nov  3 23:25:46 2013
@@ -127,9 +127,9 @@ public class PartitionTest
         partition.setId( "example" );
         partition.setSyncOnWrite( false );
 
-        partition.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID
) );
-        partition.addIndex( new AvlIndex<String, Entry>( SchemaConstants.UID_AT_OID
) );
-        partition.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID
) );
+        partition.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        partition.addIndex( new AvlIndex<String>( SchemaConstants.UID_AT_OID ) );
+        partition.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         partition.setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
 
         partition.initialize();
@@ -223,7 +223,7 @@ public class PartitionTest
         Entry lookedup = partition.fetch( entryId );
 
         // before modification: expect "sales" tuple in ou index
-        Index<String, Entry, String> ouIndex = ( Index<String, Entry, String>
) partition.getUserIndex( OU_AT );
+        Index<String, String> ouIndex = ( Index<String, String> ) partition.getUserIndex(
OU_AT );
         assertTrue( ouIndex.forward( "sales", entryId ) );
         assertTrue( lookedup.get( "ou" ).contains( "sales" ) );
 
@@ -252,7 +252,7 @@ public class PartitionTest
         Entry lookedup = partition.fetch( entryId );
 
         // before modification: expect "sales" tuple in ou index
-        Index<String, Entry, String> ouIndex = ( Index<String, Entry, String>
) partition.getUserIndex( OU_AT );
+        Index<String, String> ouIndex = ( Index<String, String> ) partition.getUserIndex(
OU_AT );
         assertTrue( partition.getPresenceIndex().forward( SchemaConstants.OU_AT_OID, entryId
) );
         assertTrue( ouIndex.forward( "sales", entryId ) );
         assertTrue( lookedup.get( "ou" ).contains( "sales" ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
Sun Nov  3 23:25:46 2013
@@ -168,13 +168,13 @@ public class AvlPartitionTest
         avlPartition.setSyncOnWrite( true ); // for code coverage
 
         assertNull( avlPartition.getAliasIndex() );
-        avlPartition.addIndex( new AvlIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID
) );
+        avlPartition.addIndex( new AvlIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID
) );
         assertNotNull( avlPartition.getAliasIndex() );
 
         assertEquals( 0, avlPartition.getCacheSize() );
 
         assertNull( avlPartition.getPresenceIndex() );
-        avlPartition.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
+        avlPartition.addIndex( new AvlIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
         assertNotNull( avlPartition.getPresenceIndex() );
 
         assertNull( avlPartition.getId() );
@@ -186,11 +186,11 @@ public class AvlPartitionTest
         assertNotNull( avlPartition.getRdnIndex() );
 
         assertNull( avlPartition.getOneAliasIndex() );
-        avlPartition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID
) );
+        avlPartition.addIndex( new AvlIndex<Long>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID
) );
         assertNotNull( avlPartition.getOneAliasIndex() );
 
         assertNull( avlPartition.getSubAliasIndex() );
-        avlPartition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID
) );
+        avlPartition.addIndex( new AvlIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID
) );
         assertNotNull( avlPartition.getSubAliasIndex() );
 
         assertNull( avlPartition.getSuffixDn() );
@@ -200,7 +200,7 @@ public class AvlPartitionTest
         assertNotNull( avlPartition.getSuffixDn() );
 
         assertFalse( avlPartition.getUserIndices().hasNext() );
-        avlPartition.addIndex( new AvlIndex<Object, Entry>( "2.5.4.3" ) );
+        avlPartition.addIndex( new AvlIndex<Object>( "2.5.4.3" ) );
         assertTrue( avlPartition.getUserIndices().hasNext() );
 
         assertNull( avlPartition.getPartitionPath() );
@@ -224,7 +224,7 @@ public class AvlPartitionTest
 
         try
         {
-            partition.addIndex( new AvlIndex<Dn, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID
) );
+            partition.addIndex( new AvlIndex<Dn>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID
) );
             //fail();
         }
         catch ( IllegalStateException e )
@@ -236,7 +236,7 @@ public class AvlPartitionTest
 
         try
         {
-            partition.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
+            partition.addIndex( new AvlIndex<String>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
             //fail();
         }
         catch ( IllegalStateException e )
@@ -269,7 +269,7 @@ public class AvlPartitionTest
 
         try
         {
-            partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID
) );
+            partition.addIndex( new AvlIndex<Long>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID
) );
             //fail();
         }
         catch ( IllegalStateException e )
@@ -280,7 +280,7 @@ public class AvlPartitionTest
 
         try
         {
-            partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID
) );
+            partition.addIndex( new AvlIndex<Long>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID
) );
             //fail();
         }
         catch ( IllegalStateException e )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1538477&r1=1538476&r2=1538477&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
Sun Nov  3 23:25:46 2013
@@ -29,7 +29,6 @@ import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
-import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
@@ -57,7 +56,7 @@ import org.junit.Test;
 public class AvlRdnIndexTest
 {
     private static File dbFileDir;
-    Index<ParentIdAndRdn, Entry, String> idx;
+    Index<ParentIdAndRdn, String> idx;
     private static SchemaManager schemaManager;
 
 



Mime
View raw message