directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235334 [5/6] - in /directory/apacheds/trunk: ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ ldap-client-test/src/test/java/org/apach...
Date Tue, 24 Jan 2012 16:27:22 GMT
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Tue Jan 24 16:27:18 2012
@@ -74,7 +74,7 @@ public class GreaterEqCursor<V, ID exten
         this.greaterEqEvaluator = greaterEqEvaluator;
 
         AttributeType attributeType = greaterEqEvaluator.getExpression().getAttributeType();
-        
+
         if ( db.hasIndexOn( attributeType ) )
         {
             userIdxCursor = ( ( Index<V, Entry, ID> ) db.getIndex( attributeType ) ).forwardCursor();
@@ -96,14 +96,14 @@ public class GreaterEqCursor<V, ID exten
         return UNSUPPORTED_MSG;
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public void beforeValue( ID id, V value ) throws Exception
     {
         checkNotClosed( "beforeValue()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -137,7 +137,7 @@ public class GreaterEqCursor<V, ID exten
     public void afterValue( ID id, V value ) throws Exception
     {
         checkNotClosed( "afterValue()" );
-        
+
         if ( userIdxCursor != null )
         {
             int comparedValue = greaterEqEvaluator.getComparator().compare( value,
@@ -155,13 +155,13 @@ public class GreaterEqCursor<V, ID exten
             {
                 userIdxCursor.afterValue( id, value );
                 setAvailable( false );
-                
+
                 return;
             }
             else if ( comparedValue < 0 )
             {
                 beforeFirst();
-                
+
                 return;
             }
 
@@ -182,7 +182,7 @@ public class GreaterEqCursor<V, ID exten
     public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -216,7 +216,7 @@ public class GreaterEqCursor<V, ID exten
     public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
-        
+
         if ( userIdxCursor != null )
         {
             int comparedValue = greaterEqEvaluator.getComparator().compare( element.getValue(),
@@ -234,14 +234,14 @@ public class GreaterEqCursor<V, ID exten
             {
                 userIdxCursor.after( element );
                 setAvailable( false );
-                
+
                 return;
             }
-            
+
             if ( comparedValue < 0 )
             {
                 beforeFirst();
-                
+
                 return;
             }
 
@@ -263,7 +263,7 @@ public class GreaterEqCursor<V, ID exten
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
-        
+
         if ( userIdxCursor != null )
         {
             IndexEntry<V, ID> advanceTo = new ForwardIndexEntry<V, ID>();
@@ -286,7 +286,7 @@ public class GreaterEqCursor<V, ID exten
     public void afterLast() throws Exception
     {
         checkNotClosed( "afterLast()" );
-        
+
         if ( userIdxCursor != null )
         {
             userIdxCursor.afterLast();
@@ -307,7 +307,7 @@ public class GreaterEqCursor<V, ID exten
     public boolean first() throws Exception
     {
         beforeFirst();
-        
+
         return next();
     }
 
@@ -318,7 +318,7 @@ public class GreaterEqCursor<V, ID exten
     public boolean last() throws Exception
     {
         afterLast();
-        
+
         return previous();
     }
 
@@ -329,7 +329,7 @@ public class GreaterEqCursor<V, ID exten
     public boolean previous() throws Exception
     {
         checkNotClosed( "previous()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -340,7 +340,7 @@ public class GreaterEqCursor<V, ID exten
             {
                 checkNotClosed( "previous()" );
                 IndexEntry<?, ID> candidate = userIdxCursor.get();
-                
+
                 if ( greaterEqEvaluator.getComparator().compare( candidate.getValue(),
                     greaterEqEvaluator.getExpression().getValue().getValue() ) >= 0 )
                 {
@@ -355,7 +355,7 @@ public class GreaterEqCursor<V, ID exten
         {
             checkNotClosed( "previous()" );
             ndnCandidate = ndnIdxCursor.get();
-            
+
             if ( greaterEqEvaluator.evaluate( ndnCandidate ) )
             {
                 return setAvailable( true );
@@ -372,7 +372,7 @@ public class GreaterEqCursor<V, ID exten
     public boolean next() throws Exception
     {
         checkNotClosed( "next()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -386,7 +386,7 @@ public class GreaterEqCursor<V, ID exten
         {
             checkNotClosed( "next()" );
             ndnCandidate = ndnIdxCursor.get();
-            
+
             if ( greaterEqEvaluator.evaluate( ndnCandidate ) )
             {
                 return setAvailable( true );
@@ -404,7 +404,7 @@ public class GreaterEqCursor<V, ID exten
     public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( userIdxCursor != null )
         {
             if ( available() )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Tue Jan 24 16:27:18 2012
@@ -83,7 +83,7 @@ public class GreaterEqEvaluator<T, ID ex
 
     public GreaterEqNode getExpression()
     {
-        return (GreaterEqNode)node;
+        return ( GreaterEqNode ) node;
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java Tue Jan 24 16:27:18 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.xdbm.search.impl;
 
+
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -29,6 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
+
 /**
  * An abstract evaluator to store the common fileds for the Simple node evaluators
  * (ApproximateEvaluator, EqualityEvaluator, GreaterEqEvluator and LessEqEvluator)
@@ -43,25 +45,26 @@ public abstract class LeafEvaluator<T, I
 
     /** The backend */
     protected final Store<Entry, ID> db;
-    
+
     /** The SchemaManager instance */
     protected final SchemaManager schemaManager;
-    
+
     /** The AttributeType we will use for the evaluation */
     protected final AttributeType attributeType;
-    
+
     /** The associated normalizer */
     protected Normalizer normalizer;
-    
+
     /** The associated comparator */
     protected LdapComparator<? super Object> ldapComparator;
-    
+
     /** The index to use if any */
     protected Index<T, Entry, ID> idx;
 
+
     @SuppressWarnings("unchecked")
     public LeafEvaluator( SimpleNode<T> node, Store<Entry, ID> db, SchemaManager schemaManager )
-    throws Exception
+        throws Exception
     {
         this.db = db;
         this.node = node;
@@ -69,7 +72,7 @@ public abstract class LeafEvaluator<T, I
         this.attributeType = node.getAttributeType();
     }
 
-    
+
     /**
      * @return The AttributeType
      */

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Tue Jan 24 16:27:18 2012
@@ -68,7 +68,7 @@ public class LessEqCursor<V, ID extends 
         this.lessEqEvaluator = lessEqEvaluator;
 
         AttributeType attributeType = lessEqEvaluator.getExpression().getAttributeType();
-        
+
         if ( db.hasIndexOn( attributeType ) )
         {
             userIdxCursor = ( ( Index<V, Entry, ID> ) db.getIndex( attributeType ) ).forwardCursor();
@@ -90,14 +90,14 @@ public class LessEqCursor<V, ID extends 
         return UNSUPPORTED_MSG;
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public void beforeValue( ID id, V value ) throws Exception
     {
         checkNotClosed( "beforeValue()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -120,7 +120,7 @@ public class LessEqCursor<V, ID extends 
             if ( compareValue > 0 )
             {
                 afterLast();
-                
+
                 return;
             }
             else if ( compareValue == 0 )
@@ -128,7 +128,7 @@ public class LessEqCursor<V, ID extends 
                 last();
                 previous();
                 setAvailable( false );
-                
+
                 return;
             }
 
@@ -148,7 +148,7 @@ public class LessEqCursor<V, ID extends 
     public void before( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -196,7 +196,7 @@ public class LessEqCursor<V, ID extends 
     public void afterValue( ID id, V value ) throws Exception
     {
         checkNotClosed( "afterValue()" );
-        
+
         if ( userIdxCursor != null )
         {
             int comparedValue = lessEqEvaluator.getComparator().compare( value,
@@ -216,7 +216,7 @@ public class LessEqCursor<V, ID extends 
             if ( comparedValue >= 0 )
             {
                 afterLast();
-                
+
                 return;
             }
 
@@ -237,7 +237,7 @@ public class LessEqCursor<V, ID extends 
     public void after( IndexEntry<V, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
-        
+
         if ( userIdxCursor != null )
         {
             int comparedValue = lessEqEvaluator.getComparator().compare( element.getValue(),
@@ -357,7 +357,7 @@ public class LessEqCursor<V, ID extends 
     public boolean next() throws Exception
     {
         checkNotClosed( "next()" );
-        
+
         if ( userIdxCursor != null )
         {
             /*
@@ -370,7 +370,7 @@ public class LessEqCursor<V, ID extends 
             {
                 checkNotClosed( "next()" );
                 IndexEntry<?, ID> candidate = userIdxCursor.get();
-                
+
                 if ( lessEqEvaluator.getComparator().compare( candidate.getValue(),
                     lessEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
                 {
@@ -385,7 +385,7 @@ public class LessEqCursor<V, ID extends 
         {
             checkNotClosed( "next()" );
             ndnCandidate = uuidIdxCursor.get();
-            
+
             if ( lessEqEvaluator.evaluate( ndnCandidate ) )
             {
                 return setAvailable( true );
@@ -403,7 +403,7 @@ public class LessEqCursor<V, ID extends 
     public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( userIdxCursor != null )
         {
             if ( available() )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Tue Jan 24 16:27:18 2012
@@ -83,7 +83,7 @@ public class LessEqEvaluator<T, ID exten
 
     public LessEqNode<T> getExpression()
     {
-        return (LessEqNode<T>)node;
+        return ( LessEqNode<T> ) node;
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Tue Jan 24 16:27:18 2012
@@ -60,7 +60,7 @@ public class NotCursor<V, ID extends Com
         return UNSUPPORTED_MSG;
     }
 
-    
+
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -80,7 +80,7 @@ public class NotCursor<V, ID extends Com
     public boolean first() throws Exception
     {
         beforeFirst();
-        
+
         return next();
     }
 
@@ -88,7 +88,7 @@ public class NotCursor<V, ID extends Com
     public boolean last() throws Exception
     {
         afterLast();
-        
+
         return previous();
     }
 
@@ -99,7 +99,7 @@ public class NotCursor<V, ID extends Com
         {
             checkNotClosed( "previous()" );
             IndexEntry<?, ID> candidate = uuidCursor.get();
-            
+
             if ( !childEvaluator.evaluate( candidate ) )
             {
                 return setAvailable( true );
@@ -116,7 +116,7 @@ public class NotCursor<V, ID extends Com
         {
             checkNotClosed( "next()" );
             IndexEntry<?, ID> candidate = uuidCursor.get();
-            
+
             if ( !childEvaluator.evaluate( candidate ) )
             {
                 return setAvailable( true );
@@ -130,7 +130,7 @@ public class NotCursor<V, ID extends Com
     public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( available() )
         {
             return uuidCursor.get();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Tue Jan 24 16:27:18 2012
@@ -92,7 +92,7 @@ public class OneLevelScopeCursor<ID exte
         return UNSUPPORTED_MSG;
     }
 
-    
+
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -179,7 +179,7 @@ public class OneLevelScopeCursor<ID exte
          * last element.
          */
         setAvailable( cursor.previous() );
-        
+
         if ( !available() )
         {
             cursor = scopeCursor;
@@ -269,7 +269,7 @@ public class OneLevelScopeCursor<ID exte
     public IndexEntry<ID, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( available() )
         {
             return cursor.get();
@@ -283,12 +283,12 @@ public class OneLevelScopeCursor<ID exte
     public void close() throws Exception
     {
         scopeCursor.close();
-        
+
         if ( dereferencedCursor != null )
         {
             dereferencedCursor.close();
         }
-        
+
         super.close();
     }
 
@@ -297,14 +297,13 @@ public class OneLevelScopeCursor<ID exte
     public void close( Exception cause ) throws Exception
     {
         scopeCursor.close( cause );
-        
+
         if ( dereferencedCursor != null )
         {
             dereferencedCursor.close( cause );
         }
-        
+
         super.close( cause );
     }
-    
-    
+
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Tue Jan 24 16:27:18 2012
@@ -79,7 +79,7 @@ public class OrCursor<V, ID> extends Abs
         return UNSUPPORTED_MSG;
     }
 
-    
+
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -101,7 +101,7 @@ public class OrCursor<V, ID> extends Abs
     public boolean first() throws Exception
     {
         beforeFirst();
-        
+
         return setAvailable( next() );
     }
 
@@ -109,7 +109,7 @@ public class OrCursor<V, ID> extends Abs
     public boolean last() throws Exception
     {
         afterLast();
-        
+
         return setAvailable( previous() );
     }
 
@@ -150,11 +150,11 @@ public class OrCursor<V, ID> extends Abs
         {
             checkNotClosed( "previous()" );
             IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
-            
+
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
-                
+
                 return setAvailable( true );
             }
         }
@@ -169,11 +169,11 @@ public class OrCursor<V, ID> extends Abs
             {
                 checkNotClosed( "previous()" );
                 IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
-                
+
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
-                    
+
                     return setAvailable( true );
                 }
             }
@@ -192,7 +192,7 @@ public class OrCursor<V, ID> extends Abs
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
-                
+
                 return setAvailable( true );
             }
         }
@@ -210,7 +210,7 @@ public class OrCursor<V, ID> extends Abs
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
-                    
+
                     return setAvailable( true );
                 }
             }
@@ -223,7 +223,7 @@ public class OrCursor<V, ID> extends Abs
     public IndexEntry<V, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( available() )
         {
             return cursors.get( cursorIndex ).get();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Tue Jan 24 16:27:18 2012
@@ -72,7 +72,7 @@ public class PresenceCursor<ID extends C
         return UNSUPPORTED_MSG;
     }
 
-    
+
     public boolean available()
     {
         if ( presenceCursor != null )
@@ -90,11 +90,11 @@ public class PresenceCursor<ID extends C
     public void beforeValue( ID id, String value ) throws Exception
     {
         checkNotClosed( "beforeValue()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.beforeValue( id, value );
-            
+
             return;
         }
 
@@ -108,11 +108,11 @@ public class PresenceCursor<ID extends C
     public void before( IndexEntry<String, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.before( element );
-            
+
             return;
         }
 
@@ -126,11 +126,11 @@ public class PresenceCursor<ID extends C
     public void afterValue( ID id, String value ) throws Exception
     {
         checkNotClosed( "afterValue()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.afterValue( id, value );
-            
+
             return;
         }
 
@@ -144,11 +144,11 @@ public class PresenceCursor<ID extends C
     public void after( IndexEntry<String, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.after( element );
-            
+
             return;
         }
 
@@ -159,11 +159,11 @@ public class PresenceCursor<ID extends C
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.beforeFirst();
-            
+
             return;
         }
 
@@ -175,7 +175,7 @@ public class PresenceCursor<ID extends C
     public void afterLast() throws Exception
     {
         checkNotClosed( "afterLast()" );
-        
+
         if ( presenceCursor != null )
         {
             presenceCursor.afterLast();
@@ -203,14 +203,14 @@ public class PresenceCursor<ID extends C
     public boolean last() throws Exception
     {
         checkNotClosed( "last()" );
-        
+
         if ( presenceCursor != null )
         {
             return presenceCursor.last();
         }
 
         afterLast();
-        
+
         return previous();
     }
 
@@ -218,7 +218,7 @@ public class PresenceCursor<ID extends C
     public boolean previous() throws Exception
     {
         checkNotClosed( "previous()" );
-        
+
         if ( presenceCursor != null )
         {
             return presenceCursor.previous();
@@ -228,7 +228,7 @@ public class PresenceCursor<ID extends C
         {
             checkNotClosed( "previous()" );
             IndexEntry<?, ID> candidate = uuidCursor.get();
-            
+
             if ( presenceEvaluator.evaluate( candidate ) )
             {
                 return setAvailable( true );
@@ -251,7 +251,7 @@ public class PresenceCursor<ID extends C
         {
             checkNotClosed( "next()" );
             IndexEntry<?, ID> candidate = uuidCursor.get();
-            
+
             if ( presenceEvaluator.evaluate( candidate ) )
             {
                 return setAvailable( true );
@@ -265,7 +265,7 @@ public class PresenceCursor<ID extends C
     public IndexEntry<String, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( presenceCursor != null )
         {
             if ( presenceCursor.available() )
@@ -285,7 +285,7 @@ public class PresenceCursor<ID extends C
              */
             IndexEntry<String, ID> indexEntry = uuidCursor.get();
             indexEntry.setValue( presenceEvaluator.getAttributeType().getOid() );
-            
+
             return indexEntry;
         }
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java Tue Jan 24 16:27:18 2012
@@ -19,11 +19,13 @@
  */
 package org.apache.directory.server.xdbm.search.impl;
 
+
 import java.util.Comparator;
 
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 
+
 /**
  * A helper class used to compare scan counts.
  * 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Tue Jan 24 16:27:18 2012
@@ -83,7 +83,7 @@ public class SubstringCursor<ID extends 
         return UNSUPPORTED_MSG;
     }
 
-    
+
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -156,7 +156,7 @@ public class SubstringCursor<ID extends 
         {
             checkNotClosed( "previous()" );
             IndexEntry<String, ID> entry = wrapped.get();
-            
+
             if ( evaluateCandidate( entry ) )
             {
                 setAvailable( true );
@@ -178,7 +178,7 @@ public class SubstringCursor<ID extends 
         {
             checkNotClosed( "next()" );
             IndexEntry<String, ID> entry = wrapped.get();
-            
+
             if ( evaluateCandidate( entry ) )
             {
                 setAvailable( true );
@@ -197,7 +197,7 @@ public class SubstringCursor<ID extends 
     public IndexEntry<String, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( available() )
         {
             return indexEntry;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Tue Jan 24 16:27:18 2012
@@ -163,7 +163,7 @@ public class SubstringEvaluator<ID exten
         }
         else
         {
-            return evaluateWithIndex( );
+            return evaluateWithIndex();
         }
     }
 
@@ -204,13 +204,13 @@ public class SubstringEvaluator<ID exten
         }
 
         entries.close();
-        
+
         // we fell through so a match was not found - assertion was false.
         return false;
     }
 
 
-    private boolean evaluateWithIndex( ) throws Exception
+    private boolean evaluateWithIndex() throws Exception
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
     }
@@ -240,7 +240,7 @@ public class SubstringEvaluator<ID exten
         }
 
         entries.close();
-        
+
         // we fell through so a match was not found - assertion was false.
         return false;
     }
@@ -364,7 +364,7 @@ public class SubstringEvaluator<ID exten
                 for ( Value<?> value : attr )
                 {
                     String strValue = ( String ) value.getNormValue();
-    
+
                     // Once match is found cleanup and return true
                     if ( regex.matcher( strValue ).matches() )
                     {
@@ -380,8 +380,8 @@ public class SubstringEvaluator<ID exten
                 // the value.
                 for ( Value<?> value : attr )
                 {
-                    byte[] byteValue = (byte[])value.getNormValue();
-    
+                    byte[] byteValue = ( byte[] ) value.getNormValue();
+
                     // Once match is found cleanup and return true
                     // @TODO : implement this check.
                     /*

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Tue Jan 24 16:27:18 2012
@@ -99,7 +99,7 @@ public class SubtreeScopeCursor<ID exten
         return UNSUPPORTED_MSG;
     }
 
-    
+
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     private ID getContextEntryId() throws Exception
     {
@@ -107,7 +107,7 @@ public class SubtreeScopeCursor<ID exten
         {
             try
             {
-                this.contextEntryId = db.getEntryId( ((Partition)db).getSuffixDn() );
+                this.contextEntryId = db.getEntryId( ( ( Partition ) db ).getSuffixDn() );
             }
             catch ( Exception e )
             {
@@ -188,7 +188,7 @@ public class SubtreeScopeCursor<ID exten
                 {
                     checkNotClosed( "previous()" );
                     setAvailable( cursor.previous() );
-                    
+
                     if ( available() && db.getAliasIndex().reverseLookup( cursor.get().getId() ) == null )
                     {
                         break;
@@ -211,7 +211,7 @@ public class SubtreeScopeCursor<ID exten
          * last element.
          */
         setAvailable( cursor.previous() );
-        
+
         if ( !available() )
         {
             cursor = scopeCursor;
@@ -288,7 +288,7 @@ public class SubtreeScopeCursor<ID exten
             {
                 cursor = dereferencedCursor;
                 cursor.beforeFirst();
-                
+
                 return setAvailable( cursor.next() );
             }
 
@@ -302,7 +302,7 @@ public class SubtreeScopeCursor<ID exten
     public IndexEntry<ID, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        
+
         if ( available() )
         {
             return cursor.get();
@@ -314,18 +314,18 @@ public class SubtreeScopeCursor<ID exten
 
     private void closeCursors() throws Exception
     {
-        if( dereferencedCursor != null )
+        if ( dereferencedCursor != null )
         {
             dereferencedCursor.close();
         }
-        
-        if( scopeCursor != null )
+
+        if ( scopeCursor != null )
         {
             scopeCursor.close();
         }
     }
-    
-    
+
+
     @Override
     public void close() throws Exception
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java Tue Jan 24 16:27:18 2012
@@ -95,7 +95,7 @@ public class SubtreeScopeEvaluator<E, ID
         {
             try
             {
-                this.contextEntryId = db.getEntryId( ((Partition)db).getSuffixDn() );
+                this.contextEntryId = db.getEntryId( ( ( Partition ) db ).getSuffixDn() );
             }
             catch ( Exception e )
             {
@@ -126,7 +126,7 @@ public class SubtreeScopeEvaluator<E, ID
     public boolean evaluate( IndexEntry<?, ID> candidate ) throws Exception
     {
         ID id = candidate.getId();
-        
+
         /*
          * This condition catches situations where the candidate is equal to 
          * the base entry and when the base entry is the context entry.  Note

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java Tue Jan 24 16:27:18 2012
@@ -73,7 +73,7 @@ public class GenericIndexTest
     @Test
     public void testConstructor3()
     {
-        File tmpDir = new File(System.getProperty( "java.io.tmpdir" ));
+        File tmpDir = new File( System.getProperty( "java.io.tmpdir" ) );
 
         index = new GenericIndex<String, Long, Long>( "cn", 42, tmpDir.toURI() );
         assertEquals( "cn", index.getAttributeId() );
@@ -108,8 +108,8 @@ public class GenericIndexTest
     @Test
     public void testSetGetWkDirPath()
     {
-        File tmpDir = new File( System.getProperty( "java.io.tmpdir" ));
-        File zzzDir = new File( tmpDir, "zzz"  );
+        File tmpDir = new File( System.getProperty( "java.io.tmpdir" ) );
+        File zzzDir = new File( tmpDir, "zzz" );
 
         index.setWkDirPath( zzzDir.toURI() );
         assertNotNull( index.getWkDirPath() );

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=1235334&r1=1235333&r2=1235334&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 Tue Jan 24 16:27:18 2012
@@ -73,16 +73,17 @@ public class PartitionTest
 
     private static AvlPartition partition;
     private static SchemaManager schemaManager = null;
-    
+
     /** The OU AttributType instance */
     private static AttributeType OU_AT;
-    
+
     /** The UID AttributType instance */
     private static AttributeType UID_AT;
-    
+
     /** The CN AttributType instance */
     private static AttributeType CN_AT;
 
+
     @BeforeClass
     public static void setup() throws Exception
     {
@@ -106,9 +107,9 @@ public class PartitionTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
-        
+
         OU_AT = schemaManager.getAttributeType( SchemaConstants.OU_AT );
         UID_AT = schemaManager.getAttributeType( SchemaConstants.UID_AT );
         CN_AT = schemaManager.getAttributeType( SchemaConstants.CN_AT );
@@ -118,7 +119,7 @@ public class PartitionTest
     @Before
     public void createStore() throws Exception
     {
-        
+
         // initialize the partition
         partition = new AvlPartition( schemaManager );
         partition.setId( "example" );
@@ -130,7 +131,7 @@ public class PartitionTest
         partition.setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
 
         partition.initialize();
-        
+
         StoreUtils.loadExampleData( partition, schemaManager );
         LOG.debug( "Created new partition" );
     }
@@ -156,10 +157,10 @@ public class PartitionTest
         assertEquals( 27, partition.getObjectClassIndex().count() );
         assertEquals( 11, partition.getEntryCsnIndex().count() );
         assertEquals( 11, partition.getEntryUuidIndex().count() );
-        
+
         Iterator<String> userIndices = partition.getUserIndices();
         int count = 0;
-        
+
         while ( userIndices.hasNext() )
         {
             userIndices.next();
@@ -327,7 +328,7 @@ public class PartitionTest
         assertNull( lookedup.get( "objectClass" ) );
     }
 
-    
+
     @Test
     public void testCheckCsnIndexUpdate() throws Exception
     {
@@ -335,7 +336,7 @@ public class PartitionTest
 
         AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
         Attribute attrib = new DefaultAttribute( csnAt );
-        
+
         CsnFactory csnF = new CsnFactory( 0 );
         String csn = csnF.newInstance().toString();
         attrib.add( csn );
@@ -344,71 +345,72 @@ public class PartitionTest
 
         Long entryId = partition.getEntryId( dn );
         Entry lookedup = partition.lookup( entryId );
-        
+
         assertNotSame( csn, lookedup.get( csnAt ).getString() );
         assertNotSame( csn, partition.getEntryCsnIndex().reverseLookup( entryId ) );
 
         lookedup = partition.modify( dn, add );
-        
+
         String updateCsn = lookedup.get( csnAt ).getString();
         assertEquals( csn, updateCsn );
         assertEquals( csn, partition.getEntryCsnIndex().reverseLookup( entryId ) );
-        
+
         csn = csnF.newInstance().toString();
-        
+
         Entry modEntry = new DefaultEntry( schemaManager );
         modEntry.add( csnAt, csn );
-        
+
         assertNotSame( csn, updateCsn );
         assertNotSame( csn, partition.getEntryCsnIndex().reverseLookup( entryId ) );
-        
-        lookedup = partition.modify( dn, new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, csnAt, csn ) );
-        
+
+        lookedup = partition
+            .modify( dn, new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, csnAt, csn ) );
+
         assertEquals( csn, lookedup.get( csnAt ).getString() );
         assertEquals( csn, partition.getEntryCsnIndex().reverseLookup( entryId ) );
     }
-    
-    
+
+
     @Test
     public void testEntryParentIdPresence() throws Exception
     {
         Dn dn = new Dn( schemaManager, "cn=user,ou=Sales,o=Good Times Co." );
-        
+
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person" );
         entry.add( "cn", "user" );
         entry.add( "sn", "user sn" );
-        
+
         // add
         StoreUtils.injectEntryInStore( partition, entry );
         verifyParentId( dn );
-        
+
         // move
         Dn newSuperior = new Dn( schemaManager, "o=Good Times Co." );
         Dn newDn = new Dn( schemaManager, "cn=user,o=Good Times Co." );
         partition.move( dn, newSuperior, newDn, null );
         entry = verifyParentId( newDn );
-        
+
         // move and rename
         Dn newParentDn = new Dn( schemaManager, "ou=Sales,o=Good Times Co." );
         Dn oldDn = newDn;
         Rdn newRdn = new Rdn( schemaManager, "cn=userMovedAndRenamed" );
-        
+
         partition.moveAndRename( oldDn, newParentDn, newRdn, entry, false );
         verifyParentId( newParentDn.add( newRdn ) );
     }
-    
-    
+
+
     private Entry verifyParentId( Dn dn ) throws Exception
     {
         Long entryId = partition.getEntryId( dn );
         Entry entry = partition.lookup( entryId );
         Long parentId = partition.getParentId( entryId );
-        
+
         Attribute parentIdAt = entry.get( SchemaConstants.ENTRY_PARENT_ID_AT );
         assertNotNull( parentIdAt );
         assertEquals( parentId.toString(), parentIdAt.getString() );
-        
+
         return entry;
     }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Tue Jan 24 16:27:18 2012
@@ -166,8 +166,8 @@ public class StoreUtils
         entry.add( "aliasedObjectName", "cn=Johnny Walker,ou=Sales,o=Good Times Co." );
         injectEntryInStore( store, entry );
     }
-    
-    
+
+
     /**
      * 
      * adds a given <i>ServerEntry</i> to the store after injecting entryCSN and entryUUID operational
@@ -184,6 +184,6 @@ public class StoreUtils
         entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
 
         AddOperationContext addContext = new AddOperationContext( null, entry );
-        ((Partition)store).add( addContext );
+        ( ( Partition ) store ).add( addContext );
     }
 }

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=1235334&r1=1235333&r2=1235334&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 Tue Jan 24 16:27:18 2012
@@ -92,10 +92,11 @@ public class AvlPartitionTest
 
     /** The DC AttributeType instance */
     private static AttributeType DC_AT;
-    
+
     /** The ApacheAlias AttributeType instance */
     private static AttributeType APACHE_ALIAS_AT;
 
+
     @BeforeClass
     public static void setup() throws Exception
     {
@@ -119,7 +120,7 @@ public class AvlPartitionTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         EXAMPLE_COM = new Dn( schemaManager, "dc=example,dc=com" );
@@ -225,7 +226,7 @@ public class AvlPartitionTest
     public void testSimplePropertiesLocked() throws Exception
     {
         assertNotNull( partition.getAliasIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) );
@@ -237,7 +238,7 @@ public class AvlPartitionTest
 
         assertEquals( 0, partition.getCacheSize() );
         assertNotNull( partition.getPresenceIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) );
@@ -248,7 +249,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getOneLevelIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) );
@@ -259,7 +260,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getSubLevelIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
@@ -270,7 +271,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getId() );
-        
+
         try
         {
             partition.setId( "foo" );
@@ -282,7 +283,7 @@ public class AvlPartitionTest
 
         assertNotNull( partition.getEntryUuidIndex() );
         assertNotNull( partition.getRdnIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlRdnIndex( ApacheSchemaConstants.APACHE_RDN_AT_OID ) );
@@ -293,7 +294,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getOneAliasIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) );
@@ -304,7 +305,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getSubAliasIndex() );
-        
+
         try
         {
             partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) );
@@ -315,7 +316,7 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getSuffixDn() );
-        
+
         Iterator<String> systemIndices = partition.getSystemIndices();
 
         for ( int i = 0; i < 10; i++ )
@@ -326,7 +327,7 @@ public class AvlPartitionTest
 
         assertFalse( systemIndices.hasNext() );
         assertNotNull( partition.getSystemIndex( APACHE_ALIAS_AT ) );
-        
+
         try
         {
             partition.getSystemIndex( SN_AT );
@@ -335,7 +336,7 @@ public class AvlPartitionTest
         catch ( IndexNotFoundException e )
         {
         }
-        
+
         try
         {
             partition.getSystemIndex( DC_AT );
@@ -346,10 +347,10 @@ public class AvlPartitionTest
         }
 
         assertNotNull( partition.getSuffixDn() );
-        
+
         Iterator<String> userIndices = partition.getUserIndices();
         int count = 0;
-        
+
         while ( userIndices.hasNext() )
         {
             userIndices.next();
@@ -367,7 +368,7 @@ public class AvlPartitionTest
         assertNotNull( userIndices.next() );
         assertFalse( userIndices.hasNext() );
         assertNotNull( partition.getUserIndex( OU_AT ) );
-        
+
         try
         {
             partition.getUserIndex( SN_AT );
@@ -376,7 +377,7 @@ public class AvlPartitionTest
         catch ( IndexNotFoundException e )
         {
         }
-        
+
         try
         {
             partition.getUserIndex( DC_AT );
@@ -711,7 +712,7 @@ public class AvlPartitionTest
         partition.modify( dn, add );
         assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
 
-        partition.modify( dn, new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, 
+        partition.modify( dn, new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
             schemaManager.getAttributeType( "telephoneNumber" ), "+1974045779" ) );
         lookedup = partition.lookup( partition.getEntryId( dn ) );
         assertTrue( lookedup.get( "telephoneNumber" ).contains( "+1974045779" ) );
@@ -738,7 +739,8 @@ public class AvlPartitionTest
         lookedup = partition.modify( dn, add );
         assertEquals( attribVal, lookedup.get( "sn" ).get().getString() );
 
-        lookedup = partition.modify( dn, new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SN_AT, "JWalker" ) );
+        lookedup = partition.modify( dn, new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SN_AT,
+            "JWalker" ) );
         assertEquals( "JWalker", lookedup.get( "sn" ).get().getString() );
     }
 
@@ -761,7 +763,8 @@ public class AvlPartitionTest
         assertNull( lookedup.get( "sn" ) );
 
         // add an entry for the sake of testing the remove operation
-        lookedup = partition.modify( dn, new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SN_AT, "JWalker" ) );
+        lookedup = partition.modify( dn,
+            new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SN_AT, "JWalker" ) );
         assertNotNull( lookedup.get( "sn" ) );
 
         lookedup = partition.modify( dn, new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, SN_AT ) );

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=1235334&r1=1235333&r2=1235334&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 Tue Jan 24 16:27:18 2012
@@ -81,7 +81,7 @@ public class AvlRdnIndexTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java Tue Jan 24 16:27:18 2012
@@ -47,199 +47,196 @@ import org.junit.runner.RunWith;
 @Concurrency()
 public class AvlTableTest
 {
-    private AvlTable<Integer,Integer> dups;
-    private AvlTable<Integer,Integer> nodups;
+    private AvlTable<Integer, Integer> dups;
+    private AvlTable<Integer, Integer> nodups;
     private final Comparator<Integer> comparator = new IntComparator();
-    
-    
+
+
     @Before
     public void setUp()
     {
-        dups = new AvlTable<Integer,Integer>( "dups", comparator, comparator, true );
-        nodups = new AvlTable<Integer,Integer>( "nodups", comparator, comparator, false );
+        dups = new AvlTable<Integer, Integer>( "dups", comparator, comparator, true );
+        nodups = new AvlTable<Integer, Integer>( "nodups", comparator, comparator, false );
     }
-    
-    
+
+
     @Test
     public void testGetName()
     {
         assertEquals( "dups", dups.getName() );
         assertEquals( "nodups", nodups.getName() );
     }
-    
-    
+
+
     @Test
     public void testCursorWithKey() throws Exception
     {
         injectNoDupsData( nodups );
         Cursor<Tuple<Integer, Integer>> cursor = nodups.cursor( 2 );
-        
+
         cursor.beforeFirst();
         assertFalse( cursor.available() );
-        
+
         assertTrue( cursor.next() );
         Tuple<Integer, Integer> tuple = cursor.get();
         assertEquals( 2, tuple.getKey().intValue() );
         assertEquals( 1, tuple.getValue().intValue() );
-        
+
         assertFalse( cursor.next() );
-        
-        
+
         // ---- on duplicates ----
-        
-        
+
         injectDupsData( dups );
         cursor = dups.cursor( 3 );
         assertFalse( cursor.available() );
-        
+
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 0, tuple.getValue().intValue() );
-        
+
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 8, tuple.getValue().intValue() );
-        
+
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 9, tuple.getValue().intValue() );
-        
+
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 10, tuple.getValue().intValue() );
-        
+
         assertFalse( cursor.next() );
     }
-    
-    
+
+
     @Test
     public void testCursor() throws Exception
     {
         injectNoDupsData( nodups );
         Cursor<Tuple<Integer, Integer>> cursor = nodups.cursor();
-        
+
         // position at first element (0,3)
         assertTrue( cursor.first() );
         Tuple<Integer, Integer> tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 0, tuple.getKey().intValue() );
         assertEquals( 3, tuple.getValue().intValue() );
-        
+
         // move to next element (1,2)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 1, tuple.getKey().intValue() );
         assertEquals( 2, tuple.getValue().intValue() );
-        
+
         // move to next element (2,1)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 2, tuple.getKey().intValue() );
         assertEquals( 1, tuple.getValue().intValue() );
-        
+
         // move to next element (3,0)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 0, tuple.getValue().intValue() );
-        
+
         // move to next element (23,8934)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 23, tuple.getKey().intValue() );
         assertEquals( 8934, tuple.getValue().intValue() );
-        
+
         assertFalse( cursor.next() );
         cursor.close();
-        
+
         // work with duplicates now
-        
+
         injectDupsData( dups );
         cursor = dups.cursor();
-        
+
         // position at first element (0,3)
         assertTrue( cursor.first() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 0, tuple.getKey().intValue() );
         assertEquals( 3, tuple.getValue().intValue() );
-        
+
         // move to next element (1,2)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 1, tuple.getKey().intValue() );
         assertEquals( 2, tuple.getValue().intValue() );
-        
+
         // move to next element (1,4)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 1, tuple.getKey().intValue() );
         assertEquals( 4, tuple.getValue().intValue() );
-        
+
         // move to next element (1,6)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 1, tuple.getKey().intValue() );
         assertEquals( 6, tuple.getValue().intValue() );
-        
+
         // move to next element (2,1)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 2, tuple.getKey().intValue() );
         assertEquals( 1, tuple.getValue().intValue() );
-        
+
         // move to next element (3,0)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 0, tuple.getValue().intValue() );
-        
+
         // move to next element (3,8)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 8, tuple.getValue().intValue() );
-        
+
         // move to next element (3,9)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 9, tuple.getValue().intValue() );
-        
+
         // move to next element (3,10)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 10, tuple.getValue().intValue() );
-        
+
         // move to next element (23,8934)
         assertTrue( cursor.next() );
         tuple = cursor.get();
         assertNotNull( tuple );
         assertEquals( 23, tuple.getKey().intValue() );
         assertEquals( 8934, tuple.getValue().intValue() );
-        
+
         assertFalse( cursor.next() );
 
-    
         // test beforeFirst
-        
+
         cursor.beforeFirst();
         assertFalse( cursor.available() );
         assertTrue( cursor.next() );
@@ -247,9 +244,9 @@ public class AvlTableTest
         assertNotNull( tuple );
         assertEquals( 0, tuple.getKey().intValue() );
         assertEquals( 3, tuple.getValue().intValue() );
-        
+
         // test afterLast
-        
+
         cursor.afterLast();
         assertFalse( cursor.available() );
         assertFalse( cursor.next() );
@@ -259,8 +256,8 @@ public class AvlTableTest
         assertEquals( 23, tuple.getKey().intValue() );
         assertEquals( 8934, tuple.getValue().intValue() );
     }
-    
-    
+
+
     /**
      * Checks that cursor.after() behavior with duplicates enabled obeys 
      * the required semantics.
@@ -271,7 +268,7 @@ public class AvlTableTest
         injectDupsData( dups );
         Cursor<Tuple<Integer, Integer>> cursor;
         Tuple<Integer, Integer> tuple = new Tuple<Integer, Integer>();
-        
+
         cursor = dups.cursor();
         cursor.after( tuple.setKey( 1 ) );
         assertFalse( cursor.available() );
@@ -280,7 +277,7 @@ public class AvlTableTest
         assertNotNull( tuple );
         assertEquals( 2, tuple.getKey().intValue() );
         assertEquals( 1, tuple.getValue().intValue() );
-        
+
         tuple = new Tuple<Integer, Integer>();
         cursor.after( tuple.setKey( 2 ) );
         assertFalse( cursor.available() );
@@ -289,7 +286,7 @@ public class AvlTableTest
         assertNotNull( tuple );
         assertEquals( 3, tuple.getKey().intValue() );
         assertEquals( 0, tuple.getValue().intValue() );
-        
+
         tuple = new Tuple<Integer, Integer>();
         cursor.after( tuple.setKey( 3 ) );
         assertFalse( cursor.available() );
@@ -299,8 +296,8 @@ public class AvlTableTest
         assertEquals( 23, tuple.getKey().intValue() );
         assertEquals( 8934, tuple.getValue().intValue() );
     }
-    
-    
+
+
     /**
      * Tests the put() and get() methods on an AvlTable.
      */
@@ -312,9 +309,9 @@ public class AvlTableTest
         // ---------------------------------------------------------
 
         injectNoDupsData( nodups );
-        
+
         assertEquals( 5, nodups.count() );
-        
+
         assertEquals( 3, nodups.get( 0 ).intValue() );
         assertEquals( 2, nodups.get( 1 ).intValue() );
         assertEquals( 1, nodups.get( 2 ).intValue() );
@@ -324,7 +321,7 @@ public class AvlTableTest
         // ---------------------------------------------------------
         // try adding duplicates when not supported
         // ---------------------------------------------------------
-        
+
         nodups.put( 23, 34 );
         assertEquals( 34, nodups.get( 23 ).intValue() );
         assertEquals( 5, nodups.count() );
@@ -332,21 +329,20 @@ public class AvlTableTest
         // ---------------------------------------------------------
         // now with duplicates
         // ---------------------------------------------------------
-        
+
         assertEquals( 0, dups.count() );
-        
+
         injectDupsData( dups );
-        
+
         // [3,0] was put twice so only 10 of 11 should have been put in
         assertEquals( 10, dups.count() );
-        
+
         assertEquals( 3, dups.get( 0 ).intValue() );
         assertEquals( 2, dups.get( 1 ).intValue() );
         assertEquals( 1, dups.get( 2 ).intValue() );
         assertEquals( 0, dups.get( 3 ).intValue() );
     }
-        
-    
+
     class IntComparator implements Comparator<Integer>
     {
         public int compare( Integer i1, Integer i2 )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java Tue Jan 24 16:27:18 2012
@@ -35,40 +35,40 @@ public class TableData
      *
      * @return
      */
-    public static void injectNoDupsData( Table<Integer,Integer> table ) throws Exception
+    public static void injectNoDupsData( Table<Integer, Integer> table ) throws Exception
     {
         if ( table.isDupsEnabled() )
         {
             throw new IllegalArgumentException( "table must NOT support duplicates" );
         }
-        
-        table.put( 0 , 3 );
-        table.put( 1 , 2 );
-        table.put( 2 , 0 ); // overwritten
-        table.put( 2 , 1 );
-        table.put( 2 , 1 ); // has no effect
-        table.put( 3 , 0 );
+
+        table.put( 0, 3 );
+        table.put( 1, 2 );
+        table.put( 2, 0 ); // overwritten
+        table.put( 2, 1 );
+        table.put( 2, 1 ); // has no effect
+        table.put( 3, 0 );
         table.put( 23, 8934 );
     }
 
 
-    public static void injectDupsData( Table<Integer,Integer> table ) throws Exception
+    public static void injectDupsData( Table<Integer, Integer> table ) throws Exception
     {
-        if ( ! table.isDupsEnabled() )
+        if ( !table.isDupsEnabled() )
         {
             throw new IllegalArgumentException( "table MUST support duplicates" );
         }
-        
-        table.put( 0 , 3 ); // 1 
-        table.put( 1 , 2 ); // 2 - 3 duplicates
-        table.put( 1 , 4 ); // 3
-        table.put( 1 , 6 ); // 4
-        table.put( 2 , 1 ); // 5
-        table.put( 3 , 0 ); // 6
-        table.put( 3 , 0 ); // has no effect
-        table.put( 3 , 8 ); // 7
-        table.put( 3 , 9 ); // 8
-        table.put( 3 , 10 ); // 9
+
+        table.put( 0, 3 ); // 1 
+        table.put( 1, 2 ); // 2 - 3 duplicates
+        table.put( 1, 4 ); // 3
+        table.put( 1, 6 ); // 4
+        table.put( 2, 1 ); // 5
+        table.put( 3, 0 ); // 6
+        table.put( 3, 0 ); // has no effect
+        table.put( 3, 8 ); // 7
+        table.put( 3, 9 ); // 8
+        table.put( 3, 10 ); // 9
         table.put( 23, 8934 ); // 10
     }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Tue Jan 24 16:27:18 2012
@@ -101,14 +101,14 @@ public class AndCursorTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         loaded = schemaManager.loadWithDeps( "collective" );
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
     }
 
@@ -129,18 +129,18 @@ public class AndCursorTest
 
         // initialize the store
         store = new AvlPartition( schemaManager );
-        ((Partition)store).setId( "example" );
+        ( ( Partition ) store ).setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
-        ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
+        ( ( Partition ) store ).initialize();
+
+        ( ( Partition ) store ).initialize();
 
-        ((Partition)store).initialize();
-        
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
@@ -155,7 +155,7 @@ public class AndCursorTest
     {
         if ( store != null )
         {
-            ((Partition)store).destroy();
+            ( ( Partition ) store ).destroy();
         }
 
         store = null;
@@ -173,7 +173,7 @@ public class AndCursorTest
     {
         String filter = "(&(cn=J*)(sn=*))";
 
-        ExprNode exprNode = FilterParser.parse(schemaManager, filter);
+        ExprNode exprNode = FilterParser.parse( schemaManager, filter );
 
         IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
 
@@ -211,7 +211,7 @@ public class AndCursorTest
         Evaluator<? extends ExprNode, Entry, Long> eval;
 
         ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null );
-        eval = new SubstringEvaluator( (SubstringNode) exprNode, store, schemaManager );
+        eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager );
         IndexCursor<?, Entry, Long> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
 
         /* adding this results in NPE  adding Presence evaluator not 
@@ -221,7 +221,7 @@ public class AndCursorTest
         andNode.addNode( exprNode );
 
         exprNode = new PresenceNode( schemaManager.getAttributeType( "sn" ) );
-        eval = new PresenceEvaluator( (PresenceNode) exprNode, store, schemaManager );
+        eval = new PresenceEvaluator( ( PresenceNode ) exprNode, store, schemaManager );
         evaluators.add( eval );
 
         andNode.addNode( exprNode );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java Tue Jan 24 16:27:18 2012
@@ -68,22 +68,127 @@ public class FilterNormalizingVisitor im
      */
     private static final boolean[] FILTER_CHAR =
         { true, false, false, false, false, false, false, false, // 00 -> 07 NULL
-            false, false, false, false, false, false, false, false, // 08 -> 0F
-            false, false, false, false, false, false, false, false, // 10 -> 17
-            false, false, false, false, false, false, false, false, // 18 -> 1F
-            false, false, false, false, false, false, false, false, // 20 -> 27
-            true, true, true, false, false, false, false, false, // 28 -> 2F '(', ')', '*'
-            false, false, false, false, false, false, false, false, // 30 -> 37
-            false, false, false, false, false, false, false, false, // 38 -> 3F 
-            false, false, false, false, false, false, false, false, // 40 -> 47
-            false, false, false, false, false, false, false, false, // 48 -> 4F
-            false, false, false, false, false, false, false, false, // 50 -> 57
-            false, false, false, false, true, false, false, false, // 58 -> 5F '\'
-            false, false, false, false, false, false, false, false, // 60 -> 67
-            false, false, false, false, false, false, false, false, // 68 -> 6F
-            false, false, false, false, false, false, false, false, // 70 -> 77
-            false, false, false, false, false, false, false, false // 78 -> 7F
-        };
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 08 -> 0F
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 10 -> 17
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 18 -> 1F
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 20 -> 27
+            true,
+            true,
+            true,
+            false,
+            false,
+            false,
+            false,
+            false, // 28 -> 2F '(', ')', '*'
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 30 -> 37
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 38 -> 3F 
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 40 -> 47
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 48 -> 4F
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 50 -> 57
+            false,
+            false,
+            false,
+            false,
+            true,
+            false,
+            false,
+            false, // 58 -> 5F '\'
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 60 -> 67
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 68 -> 6F
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false, // 70 -> 77
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false // 78 -> 7F
+    };
 
 
     /**
@@ -336,7 +441,7 @@ public class FilterNormalizingVisitor im
                 node.setChildren( newChildren );
                 return node;
             }
-            else if ( result instanceof LeafNode)
+            else if ( result instanceof LeafNode )
             {
                 List<ExprNode> newChildren = new ArrayList<ExprNode>( 1 );
                 newChildren.add( result );
@@ -370,7 +475,7 @@ public class FilterNormalizingVisitor im
                 }
             }
 
-            if ( ( branchNode instanceof AndNode) && ( newChildren.size() != children.size() ) )
+            if ( ( branchNode instanceof AndNode ) && ( newChildren.size() != children.size() ) )
             {
                 return null;
             }
@@ -443,7 +548,7 @@ public class FilterNormalizingVisitor im
         {
             return visitSimpleNode( ( SimpleNode ) node );
         }
-        else if ( node instanceof ExtensibleNode)
+        else if ( node instanceof ExtensibleNode )
         {
             return visitExtensibleNode( ( ExtensibleNode ) node );
         }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Tue Jan 24 16:27:18 2012
@@ -106,14 +106,14 @@ public class GreaterEqTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
     }
 
@@ -129,7 +129,7 @@ public class GreaterEqTest
 
         // initialize the store
         store = new AvlPartition( schemaManager );
-        ((Partition)store).setId( "example" );
+        ( ( Partition ) store ).setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
@@ -137,8 +137,8 @@ public class GreaterEqTest
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
-        ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
+        ( ( Partition ) store ).initialize();
 
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
@@ -150,7 +150,7 @@ public class GreaterEqTest
     {
         if ( store != null )
         {
-            ((Partition)store).destroy();
+            ( ( Partition ) store ).destroy();
         }
 
         store = null;
@@ -613,9 +613,9 @@ public class GreaterEqTest
         attrs.add( "sn", "doe" );
         attrs.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
-        
+
         AddOperationContext addContext = new AddOperationContext( null, attrs );
-        ((Partition)store).add( addContext );
+        ( ( Partition ) store ).add( addContext );
 
         indexEntry.setId( 12L );
         assertTrue( evaluator.evaluate( indexEntry ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Tue Jan 24 16:27:18 2012
@@ -106,14 +106,14 @@ public class LessEqTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
     }
 
@@ -129,7 +129,7 @@ public class LessEqTest
 
         // initialize the store
         store = new AvlPartition( schemaManager );
-        ((Partition)store).setId( "example" );
+        ( ( Partition ) store ).setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
@@ -137,10 +137,10 @@ public class LessEqTest
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
-        ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
+        ( ( Partition ) store ).initialize();
 
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).initialize();
 
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
@@ -152,7 +152,7 @@ public class LessEqTest
     {
         if ( store != null )
         {
-            ((Partition)store).destroy();
+            ( ( Partition ) store ).destroy();
         }
 
         store = null;
@@ -641,9 +641,9 @@ public class LessEqTest
         attrs.add( "sn", "doe" );
         attrs.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
-        
+
         AddOperationContext addContext = new AddOperationContext( null, attrs );
-        ((Partition)store).add( addContext );
+        ( ( Partition ) store ).add( addContext );
 
         indexEntry.setId( 12L );
         assertTrue( evaluator.evaluate( indexEntry ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Tue Jan 24 16:27:18 2012
@@ -101,14 +101,14 @@ public class NestedFilterTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager );
@@ -127,15 +127,15 @@ public class NestedFilterTest
 
         // initialize the store
         store = new AvlPartition( schemaManager );
-        ((Partition)store).setId( "example" );
+        ( ( Partition ) store ).setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
-        ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
+        ( ( Partition ) store ).initialize();
 
         StoreUtils.loadExampleData( store, schemaManager );
 
@@ -152,7 +152,7 @@ public class NestedFilterTest
     {
         if ( store != null )
         {
-            ((Partition)store).destroy();
+            ( ( Partition ) store ).destroy();
         }
 
         store = null;
@@ -200,7 +200,7 @@ public class NestedFilterTest
     {
         String filter = "(&(&(cn=Jo*)(sn=w*))(!(ou=apache)))";
 
-        ExprNode exprNode = FilterParser.parse(schemaManager, filter);
+        ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
         IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Tue Jan 24 16:27:18 2012
@@ -103,14 +103,14 @@ public class NotCursorTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) );
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
     }
 
@@ -126,18 +126,18 @@ public class NotCursorTest
 
         // initialize the store
         store = new AvlPartition( schemaManager );
-        ((Partition)store).setId( "example" );
+        ( ( Partition ) store ).setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
         store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
         store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
-        ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
-        ((Partition)store).initialize();
+        ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
+        ( ( Partition ) store ).initialize();
+
+        ( ( Partition ) store ).initialize();
 
-        ((Partition)store).initialize();
-        
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
@@ -152,11 +152,11 @@ public class NotCursorTest
     {
         if ( store != null )
         {
-            ((Partition)store).destroy();
+            ( ( Partition ) store ).destroy();
         }
 
         store = null;
-        
+
         if ( wkdir != null )
         {
             FileUtils.deleteDirectory( wkdir );
@@ -207,7 +207,7 @@ public class NotCursorTest
         NotNode notNode = new NotNode();
 
         ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null );
-        Evaluator<? extends ExprNode, Entry, Long> eval = new SubstringEvaluator( (SubstringNode) exprNode, store,
+        Evaluator<? extends ExprNode, Entry, Long> eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store,
             schemaManager );
         notNode.addNode( exprNode );
 



Mime
View raw message