directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1378653 [4/5] - in /directory: apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/branches/apacheds-mvbt/core-api/src/main/java/org/apache/directory/server/core/api/partition/ ...
Date Wed, 29 Aug 2012 17:13:59 GMT
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java Wed Aug 29 17:13:56 2012
@@ -30,7 +30,6 @@ import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.util.Iterator;
-import java.util.UUID;
 
 import net.sf.ehcache.store.AbstractStore;
 
@@ -189,7 +188,7 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         // before modification: no "uidObject" tuple in objectClass index
@@ -219,11 +218,11 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         // before modification: expect "sales" tuple in ou index
-        Index<String, Entry, UUID> ouIndex = ( Index<String, Entry, UUID> ) partition.getUserIndex( OU_AT );
+        Index<String, Entry, String> ouIndex = ( Index<String, Entry, String> ) partition.getUserIndex( OU_AT );
         assertTrue( ouIndex.forward( "sales", entryId ) );
         assertTrue( lookedup.get( "ou" ).contains( "sales" ) );
 
@@ -248,11 +247,11 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         // before modification: expect "sales" tuple in ou index
-        Index<String, Entry, UUID> ouIndex = ( Index<String, Entry, UUID> ) partition.getUserIndex( OU_AT );
+        Index<String, Entry, String> ouIndex = ( Index<String, Entry, 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" ) );
@@ -283,7 +282,7 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         // before modification: expect "person" tuple in objectClass index
@@ -311,7 +310,7 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         // before modification: expect "person" tuple in objectClass index
@@ -340,7 +339,7 @@ public class PartitionTest
 
         Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
 
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
 
         assertNotSame( csn, lookedup.get( csnAt ).getString() );
@@ -397,9 +396,9 @@ public class PartitionTest
 
     private Entry verifyParentId( Dn dn ) throws Exception
     {
-        UUID entryId = partition.getEntryId( dn );
+        String entryId = partition.getEntryId( dn );
         Entry entry = partition.lookup( entryId );
-        UUID parentId = partition.getParentId( entryId );
+        String parentId = partition.getParentId( entryId );
 
         Attribute parentIdAt = entry.get( SchemaConstants.ENTRY_PARENT_ID_AT );
         assertNotNull( parentIdAt );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java Wed Aug 29 17:13:56 2012
@@ -24,8 +24,6 @@ import static junit.framework.Assert.ass
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 
-import java.util.UUID;
-
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
@@ -43,14 +41,14 @@ import org.junit.Test;
 public class SingletonIndexCursorTest
 {
 
-    private ForwardIndexEntry<String, UUID> indexEntry;
+    private ForwardIndexEntry<String, String> indexEntry;
     private SingletonIndexCursor<String> indexCursor;
 
 
     @Before
     public void setUp()
     {
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Partition.DEFAULT_ID );
         indexEntry.setEntry( new DefaultEntry() );
         indexEntry.setKey( "test" );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Wed Aug 29 17:13:56 2012
@@ -384,7 +384,7 @@ public class AvlPartitionTest
     {
         assertEquals( 3, partition.getChildCount( Strings.getUUID( 1L ) ) );
 
-        Cursor<IndexEntry<UUID, UUID>> cursor = partition.list( Strings.getUUID( 2L ) );
+        Cursor<IndexEntry<String, String>> cursor = partition.list( Strings.getUUID( 2L ) );
         assertNotNull( cursor );
         cursor.beforeFirst();
         assertTrue( cursor.next() );
@@ -500,7 +500,7 @@ public class AvlPartitionTest
         partition.rename( dn, rdn, true, null );
 
         Dn dn2 = new Dn( schemaManager, "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
-        UUID id = partition.getEntryId( dn2 );
+        String id = partition.getEntryId( dn2 );
         assertNotNull( id );
         Entry entry2 = partition.lookup( id );
         assertEquals( "Ja+es", entry2.get( "sn" ).getString() );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Wed Aug 29 17:13:56 2012
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.constants.ApacheSchemaConstants;
@@ -58,7 +57,7 @@ import org.junit.Test;
 public class AvlRdnIndexTest
 {
     private static File dbFileDir;
-    Index<ParentIdAndRdn, Entry, UUID> idx;
+    Index<ParentIdAndRdn, Entry, String> idx;
     private static SchemaManager schemaManager;
 
 
@@ -288,23 +287,23 @@ public class AvlRdnIndexTest
         assertEquals( 5, idx.count() );
 
         // use forward index's cursor
-        Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor = idx.forwardCursor();
+        Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = idx.forwardCursor();
         cursor.beforeFirst();
 
         cursor.next();
-        IndexEntry<ParentIdAndRdn, UUID> e1 = cursor.get();
+        IndexEntry<ParentIdAndRdn, String> e1 = cursor.get();
         assertEquals( Strings.getUUID( 0L ), e1.getId() );
         assertEquals( "cn=key", e1.getKey().getRdns()[0].getName() );
         assertEquals( Strings.getUUID( 0L ), e1.getKey().getParentId() );
 
         cursor.next();
-        IndexEntry<ParentIdAndRdn, UUID> e2 = cursor.get();
+        IndexEntry<ParentIdAndRdn, String> e2 = cursor.get();
         assertEquals( Strings.getUUID( 1L ), e2.getId() );
         assertEquals( "cn=key1", e2.getKey().getRdns()[0].getName() );
         assertEquals( Strings.getUUID( 1L ), e2.getKey().getParentId() );
 
         cursor.next();
-        IndexEntry<ParentIdAndRdn, UUID> e3 = cursor.get();
+        IndexEntry<ParentIdAndRdn, String> e3 = cursor.get();
         assertEquals( Strings.getUUID( 2L ), e3.getId() );
         assertEquals( "cn=key2", e3.getKey().getRdns()[0].getName() );
         assertEquals( Strings.getUUID( 2L ), e3.getKey().getParentId() );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Wed Aug 29 17:13:56 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -182,7 +181,7 @@ public class AndCursorTest
 
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
         cursor.beforeFirst();
 
@@ -219,7 +218,7 @@ public class AndCursorTest
 
         ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null );
         eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager );
-        Cursor<IndexEntry<String, UUID>> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
+        Cursor<IndexEntry<String, String>> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
 
         /* adding this results in NPE  adding Presence evaluator not 
          Substring evaluator but adding Substring cursor as wrapped cursor */

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Wed Aug 29 17:13:56 2012
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -314,7 +313,7 @@ public class GreaterEqTest
         // ---------- test before() ----------
 
         cursor = new GreaterEqCursor( store, evaluator );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "5" );
 
         assertFalse( cursor.available() );
@@ -337,7 +336,7 @@ public class GreaterEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
@@ -347,7 +346,7 @@ public class GreaterEqTest
         cursor.close();
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
@@ -359,7 +358,7 @@ public class GreaterEqTest
         // ---------- test after() ----------
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "4" );
 
         assertFalse( cursor.available() );
@@ -382,7 +381,7 @@ public class GreaterEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
@@ -392,7 +391,7 @@ public class GreaterEqTest
         cursor.close();
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
@@ -427,20 +426,20 @@ public class GreaterEqTest
 
         // ---------- test beforeFirst() ----------
 
-        Set<Tuple<String, UUID>> set = new HashSet<Tuple<String, UUID>>();
+        Set<Tuple<String, String>> set = new HashSet<Tuple<String, String>>();
         cursor.beforeFirst();
         assertFalse( cursor.available() );
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
         assertEquals( 4, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "4", Strings.getUUID( 6L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "5", Strings.getUUID( 7L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "6", Strings.getUUID( 8L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "4", Strings.getUUID( 6L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "5", Strings.getUUID( 7L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "6", Strings.getUUID( 8L ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -455,18 +454,18 @@ public class GreaterEqTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+        set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
         assertEquals( 4, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "4", Strings.getUUID( 6L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "5", Strings.getUUID( 7L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "6", Strings.getUUID( 8L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "4", Strings.getUUID( 6L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "5", Strings.getUUID( 7L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "6", Strings.getUUID( 8L ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -484,13 +483,13 @@ public class GreaterEqTest
         while ( cursor.previous() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
         assertEquals( 4, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "4", Strings.getUUID( 6L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "5", Strings.getUUID( 7L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "6", Strings.getUUID( 8L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "4", Strings.getUUID( 6L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "5", Strings.getUUID( 7L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "6", Strings.getUUID( 8L ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -504,18 +503,18 @@ public class GreaterEqTest
         cursor.last();
 
         assertTrue( cursor.available() );
-        set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+        set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
 
         while ( cursor.previous() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
         assertEquals( 4, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "4", Strings.getUUID( 6L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "5", Strings.getUUID( 7L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "6", Strings.getUUID( 8L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "4", Strings.getUUID( 6L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "5", Strings.getUUID( 7L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "6", Strings.getUUID( 8L ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -525,7 +524,7 @@ public class GreaterEqTest
         // ---------- test before() ----------
 
         cursor = new GreaterEqCursor( store, evaluator );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
         try
@@ -542,7 +541,7 @@ public class GreaterEqTest
         // ---------- test after() ----------
 
         cursor = new GreaterEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "2" );
         try
         {
@@ -567,7 +566,7 @@ public class GreaterEqTest
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
         GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -576,32 +575,32 @@ public class GreaterEqTest
         indexEntry.setId( Partition.DEFAULT_ID );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 4L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 4L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 5L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 6L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 6L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 7L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 7L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 8L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 8L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 9L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 9L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 10L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 10L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -612,7 +611,7 @@ public class GreaterEqTest
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
         GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -630,7 +629,7 @@ public class GreaterEqTest
         AddOperationContext addContext = new AddOperationContext( null, attrs );
         ( ( Partition ) store ).add( addContext );
 
-        indexEntry.setId( new UUID( 0L, 12L ) );
+        indexEntry.setId( Strings.getUUID( 12L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -642,7 +641,7 @@ public class GreaterEqTest
         GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
 
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -660,41 +659,41 @@ public class GreaterEqTest
         GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
 
         GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( new UUID( 0L, 1L ) );
+        indexEntry.setId( Strings.getUUID( 1L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 4L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 4L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 5L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 6L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 6L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 7L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 7L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 8L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 8L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 9L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 9L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
-        indexEntry.setId( new UUID( 0L, 10L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 10L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Wed Aug 29 17:13:56 2012
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -336,7 +335,7 @@ public class LessEqTest
         // ---------- test before() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
         assertFalse( cursor.available() );
@@ -359,7 +358,7 @@ public class LessEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
@@ -369,7 +368,7 @@ public class LessEqTest
         cursor.close();
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
@@ -381,7 +380,7 @@ public class LessEqTest
         // ---------- test after() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "1" );
 
         assertFalse( cursor.available() );
@@ -404,7 +403,7 @@ public class LessEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
@@ -414,7 +413,7 @@ public class LessEqTest
         cursor.close();
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
@@ -448,22 +447,22 @@ public class LessEqTest
 
         // ---------- test beforeFirst() ----------
 
-        Set<Tuple<String, UUID>> set = new HashSet<Tuple<String, UUID>>();
+        Set<Tuple<String, String>> set = new HashSet<Tuple<String, String>>();
         cursor.beforeFirst();
         assertFalse( cursor.available() );
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
 
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 1L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 2L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 3L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUID( 4L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 1L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 2L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 3L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "2", Strings.getUUID( 4L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -477,20 +476,20 @@ public class LessEqTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+        set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
 
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 1L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 2L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 3L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUID( 4L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 1L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 2L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 3L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "2", Strings.getUUID( 4L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -507,15 +506,15 @@ public class LessEqTest
         while ( cursor.previous() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
 
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 1L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 2L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 3L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUID( 4L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 1L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 2L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 3L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "2", Strings.getUUID( 4L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -529,20 +528,20 @@ public class LessEqTest
         cursor.last();
 
         assertTrue( cursor.available() );
-        set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+        set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
 
         while ( cursor.previous() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, UUID>( cursor.get().getKey(), cursor.get().getId() ) );
+            set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId() ) );
         }
 
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 1L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 2L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUID( 3L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUID( 4L ) ) ) );
-        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUID( 5L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 1L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 2L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "1", Strings.getUUID( 3L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "2", Strings.getUUID( 4L ) ) ) );
+        assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID( 5L ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -552,7 +551,7 @@ public class LessEqTest
         // ---------- test before() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
         try
@@ -569,7 +568,7 @@ public class LessEqTest
         // ---------- test after() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setKey( "2" );
         try
         {
@@ -595,7 +594,7 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -604,31 +603,31 @@ public class LessEqTest
         indexEntry.setId( Strings.getUUID( 1L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 4L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 7L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 8L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 9L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 10L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
@@ -641,7 +640,7 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -671,7 +670,7 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -689,7 +688,7 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -698,31 +697,31 @@ public class LessEqTest
         indexEntry.setId( Strings.getUUID( 1L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 4L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 7L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 8L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 9L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 10L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Wed Aug 29 17:13:56 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -178,7 +177,7 @@ public class NestedFilterTest
         exprNode.accept( visitor );
         optimizer.annotate( exprNode );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
@@ -208,7 +207,7 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
@@ -230,15 +229,15 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
-        Set<UUID> set = new HashSet<UUID>();
+        Set<String> set = new HashSet<String>();
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
 
-            IndexEntry<?, UUID> elem = cursor.get();
+            IndexEntry<?, String> elem = cursor.get();
 
             set.add( elem.getId() );
             assertTrue( uuidSynChecker.isValidSyntax( elem.getKey() ) );
@@ -261,7 +260,7 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
         cursor.close();
     }
 }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Wed Aug 29 17:13:56 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -178,13 +177,13 @@ public class NotCursorTest
 
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
         assertFalse( cursor.available() );
 
         cursor.beforeFirst();
 
-        Set<UUID> set = new HashSet<UUID>();
+        Set<String> set = new HashSet<String>();
 
         while ( cursor.next() )
         {
@@ -221,7 +220,7 @@ public class NotCursorTest
         NotCursor<String> cursor = new NotCursor( store, eval ); //cursorBuilder.build( andNode );
         cursor.beforeFirst();
 
-        Set<UUID> set = new HashSet<UUID>();
+        Set<String> set = new HashSet<String>();
 
         while ( cursor.next() )
         {
@@ -272,7 +271,7 @@ public class NotCursorTest
 
         try
         {
-            cursor.after( new ForwardIndexEntry<String, UUID>() );
+            cursor.after( new ForwardIndexEntry<String, String>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )
@@ -281,7 +280,7 @@ public class NotCursorTest
 
         try
         {
-            cursor.before( new ForwardIndexEntry<String, UUID>() );
+            cursor.before( new ForwardIndexEntry<String, String>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed Aug 29 17:13:56 2012
@@ -165,7 +165,7 @@ public class OneLevelScopeTest
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -179,7 +179,7 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 6L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 2L ), indexEntry.getKey() );
@@ -359,7 +359,7 @@ public class OneLevelScopeTest
             + "=engineering,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -372,7 +372,7 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 8L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 4L ), indexEntry.getKey() );
@@ -546,7 +546,7 @@ public class OneLevelScopeTest
     {
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -560,7 +560,7 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 7L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 3L ), indexEntry.getKey() );
@@ -685,7 +685,7 @@ public class OneLevelScopeTest
             + "=board of directors,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -699,7 +699,7 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 6L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 7L ), indexEntry.getKey() );
@@ -816,7 +816,7 @@ public class OneLevelScopeTest
             + "=board of directors,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -830,7 +830,7 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 7L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 3L ), indexEntry.getKey() );
@@ -1061,15 +1061,15 @@ public class OneLevelScopeTest
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId,
             SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
             node );
 
-        ForwardIndexEntry<UUID, UUID> indexEntry = new ForwardIndexEntry<UUID, UUID>();
-        indexEntry.setId( new UUID( 0L, 6L ) );
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 6L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -1081,7 +1081,7 @@ public class OneLevelScopeTest
             + "=engineering,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, dn, baseId, SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry> evaluator = new OneLevelScopeEvaluator<Entry>( store,
@@ -1093,20 +1093,20 @@ public class OneLevelScopeTest
          * will not accept an alias candidate because aliases are not returned
          * when alias dereferencing while searching is enabled.
          */
-        ForwardIndexEntry<UUID, UUID> indexEntry = new ForwardIndexEntry<UUID, UUID>();
-        indexEntry.setId( new UUID( 0L, 11L ) );
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 11L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<UUID, UUID>();
-        indexEntry.setId( new UUID( 0L, 8L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 8L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<UUID, UUID>();
-        indexEntry.setId( new UUID( 0L, 5L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<UUID, UUID>();
-        indexEntry.setId( new UUID( 0L, 6L ) );
+        indexEntry = new ForwardIndexEntry<String, String>();
+        indexEntry.setId( Strings.getUUID( 6L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -1119,7 +1119,7 @@ public class OneLevelScopeTest
             + "=sales,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -1145,7 +1145,7 @@ public class OneLevelScopeTest
             + "=sales,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -1156,7 +1156,7 @@ public class OneLevelScopeTest
             cursor = new OneLevelScopeCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<UUID, UUID> entry = new ForwardIndexEntry<UUID, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( Strings.getUUID( 3L ) );
             cursor.before( entry );
         }
@@ -1174,7 +1174,7 @@ public class OneLevelScopeTest
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -1185,7 +1185,7 @@ public class OneLevelScopeTest
             cursor = new OneLevelScopeCursor( store, evaluator );
 
             // test after()
-            ForwardIndexEntry<UUID, UUID> entry = new ForwardIndexEntry<UUID, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( Strings.getUUID( 3L ) );
             cursor.after( entry );
         }
@@ -1203,7 +1203,7 @@ public class OneLevelScopeTest
             + "=sales,"
             + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.SUBTREE );
         new OneLevelScopeEvaluator<Entry>( store, node );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Wed Aug 29 17:13:56 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -178,7 +177,7 @@ public class OrCursorTest
 
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
 
-        Cursor<IndexEntry<?, UUID>> cursor = cursorBuilder.build( exprNode );
+        Cursor<IndexEntry<?, String>> cursor = cursorBuilder.build( exprNode );
 
         cursor.afterLast();
 
@@ -260,7 +259,7 @@ public class OrCursorTest
     public void testOrCursor() throws Exception
     {
         List<Evaluator<? extends ExprNode>> evaluators = new ArrayList<Evaluator<? extends ExprNode>>();
-        List<Cursor<IndexEntry<?, UUID>>> cursors = new ArrayList<Cursor<IndexEntry<?, UUID>>>();
+        List<Cursor<IndexEntry<?, String>>> cursors = new ArrayList<Cursor<IndexEntry<?, String>>>();
         Evaluator<? extends ExprNode> eval;
         Cursor<IndexEntry<?, Long>> cursor;
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Wed Aug 29 17:13:56 2012
@@ -30,7 +30,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -212,7 +211,7 @@ public class PresenceTest
         assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
 
         // test before()
-        ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.CN_AT_OID );
         cursor.before( entry );
         assertTrue( cursor.next() );
@@ -220,7 +219,7 @@ public class PresenceTest
         assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
 
         // test after()
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         cursor.after( entry );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
@@ -287,7 +286,7 @@ public class PresenceTest
 
         cursor.beforeFirst();
 
-        List<UUID> ids = new ArrayList<UUID>();
+        List<String> ids = new ArrayList<String>();
 
         while ( cursor.next() && cursor.available() )
         {
@@ -313,7 +312,7 @@ public class PresenceTest
 
         cursor.beforeFirst();
 
-        Set<UUID> set = new HashSet<UUID>();
+        Set<String> set = new HashSet<String>();
 
         while ( cursor.next() )
         {
@@ -393,11 +392,11 @@ public class PresenceTest
     {
         PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "cn" ) );
         PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.CN_AT_OID );
         entry.setId( Strings.getUUID( 3L ) );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.CN_AT_OID );
         entry.setId( Strings.getUUID( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
@@ -418,12 +417,12 @@ public class PresenceTest
         PresenceNode node = new PresenceNode( schemaManager.getAttributeType( oid ) );
         PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager );
 
-        ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
         // no need to set a value or id, because the evaluator must always evaluate to true
         // as each entry contains an objectClass, entryUUID, and entryCSN attribute
         assertTrue( evaluator.evaluate( entry ) );
 
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( oid );
         entry.setId( Strings.getUUID( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
@@ -435,22 +434,22 @@ public class PresenceTest
     {
         PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "name" ) );
         PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.NAME_AT_OID );
         entry.setId( Strings.getUUID( 3 ) );
         assertTrue( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.NAME_AT_OID );
         entry.setId( Strings.getUUID( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
 
         node = new PresenceNode( schemaManager.getAttributeType( "searchGuide" ) );
         evaluator = new PresenceEvaluator( node, store, schemaManager );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.SEARCHGUIDE_AT_OID );
         entry.setId( Strings.getUUID( 3 ) );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.SEARCHGUIDE_AT_OID );
         entry.setId( Strings.getUUID( 5 ) );
         entry.setEntry( store.lookup( Strings.getUUID( 5 ) ) );
@@ -458,11 +457,11 @@ public class PresenceTest
 
         node = new PresenceNode( schemaManager.getAttributeType( "st" ) );
         evaluator = new PresenceEvaluator( node, store, schemaManager );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.ST_AT_OID );
         entry.setId( Strings.getUUID( 3 ) );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, UUID>();
+        entry = new ForwardIndexEntry<String, String>();
         entry.setKey( SchemaConstants.ST_AT_OID );
         entry.setId( Strings.getUUID( 5 ) );
         entry.setEntry( store.lookup( Strings.getUUID( 5 ) ) );
@@ -520,7 +519,7 @@ public class PresenceTest
             cursor = new PresenceCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( SchemaConstants.SN_AT_OID );
             cursor.before( entry );
         }
@@ -543,7 +542,7 @@ public class PresenceTest
             cursor = new PresenceCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( SchemaConstants.SN_AT_OID );
             cursor.after( entry );
         }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Wed Aug 29 17:13:56 2012
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -631,7 +630,7 @@ public class SubstringTest
     {
         SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "walk", null );
         SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 5L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
         indexEntry.setId( Strings.getUUID( 3L ) );
@@ -643,35 +642,35 @@ public class SubstringTest
 
         node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "wa", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 5L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 5L ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "searchGuide" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "st" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "name" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "name" ), "s", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
@@ -683,7 +682,7 @@ public class SubstringTest
     {
         SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "jim", null );
         SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
         indexEntry.setId( Strings.getUUID( 3L ) );
@@ -692,14 +691,14 @@ public class SubstringTest
 
         node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "s", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
@@ -762,7 +761,7 @@ public class SubstringTest
             cursor = new SubstringCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( SchemaConstants.SN_AT_OID );
             cursor.before( entry );
         }
@@ -785,7 +784,7 @@ public class SubstringTest
             cursor = new SubstringCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<String, UUID> entry = new ForwardIndexEntry<String, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( SchemaConstants.SN_AT_OID );
             cursor.after( entry );
         }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Wed Aug 29 17:13:56 2012
@@ -165,14 +165,14 @@ public class SubtreeScopeTest
     {
         Dn dn = new Dn( SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId,
             SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry> evaluator = new SubtreeScopeEvaluator<Entry>( store, node );
         SubtreeScopeCursor cursor = new SubtreeScopeCursor( store, evaluator );
 
-        UUID[] expected = new UUID[]
+        String[] expected = new String[]
             {
                 Strings.getUUID( 3L ),
                 Strings.getUUID( 3L ),
@@ -187,7 +187,7 @@ public class SubtreeScopeTest
         // --------- Test beforeFirst() ---------
         //( ( AbstractBTreePartition<Long> ) ((Partition)store) ).dumpRdnIdx( 0L, "" );
 
-        IndexEntry<UUID, UUID> indexEntry = null;
+        IndexEntry<String, String> indexEntry = null;
 
         cursor.beforeFirst();
         assertFalse( cursor.available() );
@@ -281,7 +281,7 @@ public class SubtreeScopeTest
     {
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry> evaluator = new SubtreeScopeEvaluator<Entry>( store, node );
@@ -294,7 +294,7 @@ public class SubtreeScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 3L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 3L ), indexEntry.getKey() );
@@ -479,7 +479,7 @@ public class SubtreeScopeTest
             + "=apache," + SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID
             + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry> evaluator = new SubtreeScopeEvaluator<Entry>( store, node );
@@ -492,7 +492,7 @@ public class SubtreeScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<UUID, UUID> indexEntry = cursor.get();
+        IndexEntry<String, String> indexEntry = cursor.get();
         assertNotNull( indexEntry );
         assertEquals( Strings.getUUID( 7L ), indexEntry.getId() );
         assertEquals( Strings.getUUID( 7L ), indexEntry.getKey() );
@@ -639,7 +639,7 @@ public class SubtreeScopeTest
         ( ( Partition ) store ).add( addContext );
 
         dn = new Dn( SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode(
             AliasDerefMode.DEREF_IN_SEARCHING,
@@ -652,7 +652,7 @@ public class SubtreeScopeTest
         // --------- Test beforeFirst() ---------
         //( ( AbstractBTreePartition<Long> ) ((Partition)store) ).dumpRdnIdx( 0L, "" );
 
-        UUID[] expected = new UUID[]
+        String[] expected = new String[]
             {
                 Strings.getUUID( 3L ),
                 Strings.getUUID( 3L ),
@@ -666,7 +666,7 @@ public class SubtreeScopeTest
                 Strings.getUUID( 3L )
         };
 
-        IndexEntry<UUID, UUID> indexEntry = null;
+        IndexEntry<String, String> indexEntry = null;
 
         int pos = 0;
 
@@ -690,7 +690,7 @@ public class SubtreeScopeTest
         assertFalse( cursor.available() );
         cursor.first();
 
-        expected = new UUID[]
+        expected = new String[]
             {
                 Strings.getUUID( 7L ),
                 Strings.getUUID( 3L ),
@@ -857,7 +857,7 @@ public class SubtreeScopeTest
         cursor = new SubtreeScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
 
-        expected = new UUID[]
+        expected = new String[]
             {
                 Strings.getUUID( 3L ),
                 Strings.getUUID( 3L ),
@@ -894,12 +894,12 @@ public class SubtreeScopeTest
     {
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry> evaluator = new SubtreeScopeEvaluator<Entry>( store, node );
 
-        ForwardIndexEntry<UUID, UUID> indexEntry = new ForwardIndexEntry<UUID, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
@@ -910,7 +910,7 @@ public class SubtreeScopeTest
     {
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, dn, baseId, SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry> evaluator = new SubtreeScopeEvaluator<Entry>( store, node );
@@ -920,15 +920,15 @@ public class SubtreeScopeTest
          * With dereferencing the evaluator does not accept candidates that
          * are aliases.  This is done to filter out aliases from the results.
          */
-        ForwardIndexEntry<UUID, UUID> indexEntry = new ForwardIndexEntry<UUID, UUID>();
+        ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 11L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<UUID, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 8L ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<UUID, UUID>();
+        indexEntry = new ForwardIndexEntry<String, String>();
         indexEntry.setId( Strings.getUUID( 6L ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
@@ -939,7 +939,7 @@ public class SubtreeScopeTest
     {
         SubtreeScopeCursor cursor = null;
         Dn dn = new Dn( SchemaConstants.OU_AT_OID + "=sales," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -962,7 +962,7 @@ public class SubtreeScopeTest
         SubtreeScopeCursor cursor = null;
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -972,7 +972,7 @@ public class SubtreeScopeTest
             cursor = new SubtreeScopeCursor( store, evaluator );
 
             // test before()
-            ForwardIndexEntry<UUID, UUID> entry = new ForwardIndexEntry<UUID, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( Strings.getUUID( 3L ) );
             cursor.before( entry );
         }
@@ -989,7 +989,7 @@ public class SubtreeScopeTest
         SubtreeScopeCursor cursor = null;
         Dn dn = new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." );
-        UUID baseId = store.getEntryId( dn );
+        String baseId = store.getEntryId( dn );
 
         try
         {
@@ -998,7 +998,7 @@ public class SubtreeScopeTest
             cursor = new SubtreeScopeCursor( store, evaluator );
 
             // test after()
-            ForwardIndexEntry<UUID, UUID> entry = new ForwardIndexEntry<UUID, UUID>();
+            ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
             entry.setKey( Strings.getUUID( 3L ) );
             cursor.after( entry );
         }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.core
 
 
 import java.util.ArrayList;
-import java.util.UUID;
 
 import javax.swing.table.AbstractTableModel;
 
@@ -53,7 +52,7 @@ public class AttributesTableModel extend
     private final ArrayList<Object> valList;
 
     /** the unique id of the entry  */
-    private final UUID id;
+    private final String id;
 
     /** the distinguished name of the entry */
     private final String dn;
@@ -70,7 +69,7 @@ public class AttributesTableModel extend
      * @param dn the distinguished name of the entry
      * @param isMutable whether or not the model can be changed
      */
-    public AttributesTableModel( Entry entry, UUID id, String dn, boolean isMutable )
+    public AttributesTableModel( Entry entry, String id, String dn, boolean isMutable )
     {
         this.dn = dn;
         this.id = id;
@@ -225,7 +224,7 @@ public class AttributesTableModel extend
      *
      * @return the unique id for the entry
      */
-    public UUID getEntryId()
+    public String getEntryId()
     {
         return id;
     }



Mime
View raw message