directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1062912 - in /directory: apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-integ/src/test...
Date Mon, 24 Jan 2011 18:29:09 GMT
Author: elecharny
Date: Mon Jan 24 18:29:08 2011
New Revision: 1062912

URL: http://svn.apache.org/viewvc?rev=1062912&view=rev
Log:
Fixed some warnings in the code

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
Mon Jan 24 18:29:08 2011
@@ -64,7 +64,7 @@ public class AvlPartitionFactory impleme
         }
 
         AvlPartition avlPartition = ( AvlPartition ) partition;
-        Set<Index<? extends Object, Entry, Long>> indexedAttributes = avlPartition.getIndexedAttributes();
+        Set<Index<?, Entry, Long>> indexedAttributes = avlPartition.getIndexedAttributes();
 
         AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId
);
         //index.setCacheSize( cacheSize );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
Mon Jan 24 18:29:08 2011
@@ -64,7 +64,7 @@ public class JdbmPartitionFactory implem
         }
 
         JdbmPartition jdbmPartition = ( JdbmPartition ) partition;
-        Set<Index<? extends Object, Entry, Long>> indexedAttributes = jdbmPartition.getIndexedAttributes();
+        Set<Index<?, Entry, Long>> indexedAttributes = jdbmPartition.getIndexedAttributes();
 
         JdbmIndex<Object, Entry> index = new JdbmIndex<Object, Entry>( attributeId
);
         index.setCacheSize( cacheSize );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
Mon Jan 24 18:29:08 2011
@@ -64,7 +64,7 @@ public class LdifPartitionFactory implem
         }
 
         LdifPartition ldifPartition = ( LdifPartition ) partition;
-        Set<Index<? extends Object, Entry, Long>> indexedAttributes = ldifPartition.getIndexedAttributes();
+        Set<Index<?, Entry, Long>> indexedAttributes = ldifPartition.getIndexedAttributes();
 
         AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId
);
         //index.setCacheSize( cacheSize );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
Mon Jan 24 18:29:08 2011
@@ -28,12 +28,12 @@ import java.util.Set;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
@@ -92,14 +92,7 @@ public class SearchOperationContext exte
         
         setReturningAttributes( ats );
         
-        if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
-        {
-            throwReferral = false;
-        }
-        else
-        {
-            throwReferral = true;
-        }
+        throwReferral = !requestControls.containsKey( ManageDsaITControl.CONTROL_OID );
     }
 
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
Mon Jan 24 18:29:08 2011
@@ -33,11 +33,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
+import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Strings;
@@ -90,7 +90,7 @@ public class SimpleAuthenticationIT exte
         String userDn = "uid=admin,ou=system";
         LdapConnection connection = getConnectionAs( service, userDn, "secret" );
 
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         performAdminAccountChecks( entry );
         assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), Strings
             .getBytesUtf8("secret") ) );
@@ -100,7 +100,7 @@ public class SimpleAuthenticationIT exte
         service.startup();
 
         connection = getConnectionAs( service, userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         performAdminAccountChecks( entry );
         assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), Strings
             .getBytesUtf8("secret") ) );
@@ -115,7 +115,7 @@ public class SimpleAuthenticationIT exte
         String userDn = "uid=akarasulu,ou=users,ou=system";
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         EntryAttribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
@@ -216,7 +216,7 @@ public class SimpleAuthenticationIT exte
         // close and try again now with new password (should succeed)
         connection.bind( userDn, "newpwd" );
 
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
@@ -248,7 +248,7 @@ public class SimpleAuthenticationIT exte
 
         // Check that we can get the attributes
 
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -267,7 +267,7 @@ public class SimpleAuthenticationIT exte
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
         assertTrue( connection.isAuthenticated() );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -276,7 +276,7 @@ public class SimpleAuthenticationIT exte
         connection.close();
         connection.bind( userDn, "secret" );
         assertTrue( connection.isAuthenticated() );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -290,7 +290,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -308,7 +308,7 @@ public class SimpleAuthenticationIT exte
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -316,7 +316,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -330,7 +330,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -348,7 +348,7 @@ public class SimpleAuthenticationIT exte
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "test123" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -356,7 +356,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "test123" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -370,7 +370,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -388,7 +388,7 @@ public class SimpleAuthenticationIT exte
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -397,7 +397,7 @@ public class SimpleAuthenticationIT exte
 
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -411,7 +411,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -429,7 +429,7 @@ public class SimpleAuthenticationIT exte
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -437,7 +437,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -451,7 +451,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = connection.lookup( userDn );;
+        Entry entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -469,14 +469,14 @@ public class SimpleAuthenticationIT exte
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
         // try again now with new password, to check that the
         // cache is updated (should be successfull)
         connection.bind( userDn, "secret" );
-        entry = connection.lookup( userDn );;
+        entry = connection.lookup( userDn );
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
Mon Jan 24 18:29:08 2011
@@ -336,7 +336,7 @@ public class SubtreeEvaluatorTest
         Dn apDn = dnFactory.create( "ou=system" );
         Dn entryDn = dnFactory.create( "ou=users,ou=system" );
 
-        Entry entry = new DefaultEntry( schemaManager, entryDn );;
+        Entry entry = new DefaultEntry( schemaManager, entryDn );
         entry.put( "objectClass", "person" );
         entry.put( "cn", "Ersin" );
 
@@ -346,7 +346,7 @@ public class SubtreeEvaluatorTest
         assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) );
 
         // now change the filter so the entry is rejected
-        entry = new DefaultEntry( schemaManager, entryDn );;
+        entry = new DefaultEntry( schemaManager, entryDn );
         entry.put( "objectClass", "person" );
         entry.put( "cn", "Alex" );
 

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
Mon Jan 24 18:29:08 2011
@@ -35,14 +35,14 @@ import org.apache.directory.server.const
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractStore;
 import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
-import org.apache.directory.shared.util.exception.MultiException;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.util.exception.MultiException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,7 +89,7 @@ public class JdbmStore<E> extends Abstra
     public Long getDefaultId()
     {
         return 1L;
-    };
+    }
 
 
     @Override

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
Mon Jan 24 18:29:08 2011
@@ -226,11 +226,6 @@ public abstract class AbstractKerberosFl
         
         AbstractKerberosFlags other = ( AbstractKerberosFlags ) obj;
         
-        if ( value != other.value )
-        {
-            return false;
-        }
-        
-        return true;
+        return value == other.value;
     }
 }

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
(original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
Mon Jan 24 18:29:08 2011
@@ -96,7 +96,7 @@ public abstract class AbstractLdifPartit
      * {@inheritDoc}
      */
     @Override
-    public void addIndexOn( Index<? extends Object, Entry, Long> index ) throws Exception
+    public void addIndexOn( Index<?, Entry, Long> index ) throws Exception
     {
         wrappedPartition.addIndexOn( index );
     }
@@ -246,7 +246,7 @@ public abstract class AbstractLdifPartit
      * {@inheritDoc}
      */
     @Override
-    public Index<? extends Object, Entry, Long> getUserIndex( AttributeType attributeType
) throws Exception
+    public Index<?, Entry, Long> getUserIndex( AttributeType attributeType ) throws
Exception
     {
         return wrappedPartition.getUserIndex( attributeType );
     }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
Mon Jan 24 18:29:08 2011
@@ -45,7 +45,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.*;
+import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -326,13 +326,13 @@ public class ConfigPartitionReader
         }
         catch ( IllegalArgumentException iae )
         {
-            String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();;
+            String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();
             LOG.error( message );
             throw new ConfigurationException( message );
         }
         catch ( IllegalAccessException e )
         {
-            String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();;
+            String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();
             LOG.error( message );
             throw new ConfigurationException( message );
         }
@@ -442,13 +442,13 @@ public class ConfigPartitionReader
             }
             catch ( IllegalArgumentException iae )
             {
-                String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();;
+                String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();
                 LOG.error( message );
                 throw new ConfigurationException( message );
             }
             catch ( IllegalAccessException e )
             {
-                String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();;
+                String message = "Cannot store '" + valueStr + "' into attribute " + fieldAttr.getId();
                 LOG.error( message );
                 throw new ConfigurationException( message );
             }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
Mon Jan 24 18:29:08 2011
@@ -67,7 +67,7 @@ public class LookupPerfIT extends Abstra
     {
         LdapConnection connection = getClientApiConnection( ldapServer );
 
-        Entry entry = connection.lookup( "uid=admin,ou=system" );;
+        Entry entry = connection.lookup( "uid=admin,ou=system" );
         assertNotNull( entry );
         assertTrue( entry instanceof SearchResultEntry);
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Mon Jan 24 18:29:08 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapContextNotEmptyException;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.exception.*;
+import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
@@ -85,7 +85,7 @@ public abstract class BTreePartition<ID>
     protected URI partitionPath;
 
     /** The set of indexed attributes */
-    private Set<Index<? extends Object, Entry, ID>> indexedAttributes;
+    private Set<Index<?, Entry, ID>> indexedAttributes;
 
 
     // ------------------------------------------------------------------------
@@ -97,7 +97,7 @@ public abstract class BTreePartition<ID>
      */
     protected BTreePartition()
     {
-        indexedAttributes = new HashSet<Index<? extends Object, Entry, ID>>();
+        indexedAttributes = new HashSet<Index<?, Entry, ID>>();
     }
 
 
@@ -127,22 +127,22 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public void setIndexedAttributes( Set<Index<? extends Object, Entry, ID>>
indexedAttributes )
+    public void setIndexedAttributes( Set<Index<?, Entry, ID>> indexedAttributes
)
     {
         this.indexedAttributes = indexedAttributes;
     }
 
 
-    public void addIndexedAttributes( Index<? extends Object, Entry, ID>... indexes
)
+    public void addIndexedAttributes( Index<?, Entry, ID>... indexes )
     {
-        for ( Index<? extends Object, Entry, ID> index : indexes )
+        for ( Index<?, Entry, ID> index : indexes )
         {
             indexedAttributes.add( index );
         }
     }
 
 
-    public Set<Index<? extends Object, Entry, ID>> getIndexedAttributes()
+    public Set<Index<?, Entry, ID>> getIndexedAttributes()
     {
         return indexedAttributes;
     }
@@ -344,7 +344,7 @@ public abstract class BTreePartition<ID>
     // Index Operations
     // ------------------------------------------------------------------------
 
-    public abstract void addIndexOn( Index<? extends Object, Entry, ID> index ) throws
Exception;
+    public abstract void addIndexOn( Index<?, Entry, ID> index ) throws Exception;
 
 
     public abstract boolean hasUserIndexOn( AttributeType attributeType ) throws Exception;
@@ -426,10 +426,10 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public abstract Index<? extends Object, Entry, ID> getUserIndex( AttributeType
attributeType ) throws Exception;
+    public abstract Index<?, Entry, ID> getUserIndex( AttributeType attributeType )
throws Exception;
 
 
-    public abstract Index<? extends Object, Entry, ID> getSystemIndex( AttributeType
attributeType ) throws Exception;
+    public abstract Index<?, Entry, ID> getSystemIndex( AttributeType attributeType
) throws Exception;
 
 
     public abstract ID getEntryId( Dn dn ) throws LdapException;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
Mon Jan 24 18:29:08 2011
@@ -40,9 +40,9 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapAuthenticationNotSupportedException;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -130,7 +130,7 @@ public abstract class AbstractXdbmPartit
     /**
      * {@inheritDoc}
      */
-    public final void addIndexOn( Index<? extends Object, Entry, ID> index ) throws
Exception
+    public final void addIndexOn( Index<?, Entry, ID> index ) throws Exception
     {
         store.addIndex( index );
     }
@@ -211,7 +211,7 @@ public abstract class AbstractXdbmPartit
     /**
      * {@inheritDoc}
      */
-    public final Index<? extends Object, Entry, ID> getUserIndex( AttributeType attributeType
) throws IndexNotFoundException
+    public final Index<?, Entry, ID> getUserIndex( AttributeType attributeType ) throws
IndexNotFoundException
     {
         return store.getUserIndex( attributeType );
     }
@@ -220,7 +220,7 @@ public abstract class AbstractXdbmPartit
     /**
      * {@inheritDoc}
      */
-    public final Index<? extends Object, Entry, ID> getSystemIndex( AttributeType attributeType
) throws IndexNotFoundException
+    public final Index<?, Entry, ID> getSystemIndex( AttributeType attributeType )
throws IndexNotFoundException
     {
         return store.getSystemIndex( attributeType );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
Mon Jan 24 18:29:08 2011
@@ -28,11 +28,13 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.filter.*;
-import org.apache.directory.shared.util.exception.NotImplementedException;
 import org.apache.directory.shared.ldap.model.filter.AndNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.NotNode;
+import org.apache.directory.shared.ldap.model.filter.OrNode;
+import org.apache.directory.shared.ldap.model.filter.ScopeNode;
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
+import org.apache.directory.shared.util.exception.NotImplementedException;
 
 
 /**
@@ -131,7 +133,7 @@ public class CursorBuilder<ID extends Co
     private IndexCursor<?, Entry, ID> buildOrCursor( OrNode node ) throws Exception
     {
         List<ExprNode> children = node.getChildren();
-        List<IndexCursor<? extends Object, Entry, ID>> childCursors = new ArrayList<IndexCursor<?,
Entry, ID>>(
+        List<IndexCursor<?, Entry, ID>> childCursors = new ArrayList<IndexCursor<?,
Entry, ID>>(
             children.size() );
         List<Evaluator<? extends ExprNode, Entry, ID>> childEvaluators = new
ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             children.size() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java?rev=1062912&r1=1062911&r2=1062912&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java
Mon Jan 24 18:29:08 2011
@@ -34,8 +34,8 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.filter.LdapURL.Extension;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -108,7 +108,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -128,7 +128,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -148,7 +148,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -168,7 +168,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -198,7 +198,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -218,7 +218,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -238,7 +238,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -258,7 +258,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -278,7 +278,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -298,7 +298,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -338,7 +338,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -358,7 +358,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -378,7 +378,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 
@@ -398,7 +398,7 @@ public class LdapUrlTest
             return;
         }
 
-        fail();;
+        fail();
     }
 
 



Mime
View raw message