directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1486041 [1/2] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/ core-api/src/main/java/org/apache/directory/server/core/a...
Date Fri, 24 May 2013 12:55:07 GMT
Author: elecharny
Date: Fri May 24 12:55:06 2013
New Revision: 1486041

URL: http://svn.apache.org/r1486041
Log:
Fixed many sonar warnings

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/FilteringOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngine.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngineConfig.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
    directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
    directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializer.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/AbstractPasswordMessage.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/StringOption.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpService.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/StoreBasedDhcpService.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/AbstractDhcpStore.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/SimpleDhcpStore.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/Subnet.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecord.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/MechanismHandler.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java Fri May 24 12:55:06 2013
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractLayout
 {
     /** The logger*/
-    private final static Logger log = LoggerFactory.getLogger( AbstractLayout.class );
+    private static final Logger log = LoggerFactory.getLogger( AbstractLayout.class );
 
     /** The required directories */
     private File[] requiredDirectories = new File[0];

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java Fri May 24 12:55:06 2013
@@ -134,11 +134,11 @@ public interface OperationManager
     /**
      * Acquires a WriteLock
      */
-    public void lockWrite();
+    void lockWrite();
 
 
     /**
      * Releases a WriteLock
      */
-    public void unlockWrite();
+    void unlockWrite();
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/DefaultPasswordValidator.java Fri May 24 12:55:06 2013
@@ -30,7 +30,7 @@ public class DefaultPasswordValidator im
 {
 
     /** the default validator's instance */
-    public final static DefaultPasswordValidator INSTANCE = new DefaultPasswordValidator();
+    public static final DefaultPasswordValidator INSTANCE = new DefaultPasswordValidator();
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerEntryUtils.java Fri May 24 12:55:06 2013
@@ -261,7 +261,7 @@ public class ServerEntryUtils
     public static Entry getTargetEntry( Modification mod, Entry entry, SchemaManager schemaManager )
         throws LdapException
     {
-        Entry targetEntry = ( Entry ) entry.clone();
+        Entry targetEntry = entry.clone();
         ModificationOperation modOp = mod.getOperation();
         String id = mod.getAttribute().getUpId();
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
@@ -532,7 +532,7 @@ public class ServerEntryUtils
 
                 // TODO : handle options
                 AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
-                modificationsList.add( toServerModification( ( ModificationItem ) modification, attributeType ) );
+                modificationsList.add( toServerModification( modification, attributeType ) );
             }
 
             return modificationsList;
@@ -682,7 +682,7 @@ public class ServerEntryUtils
      */
     private static String stripOptions( String attributeId )
     {
-        int optionsPos = attributeId.indexOf( ";" );
+        int optionsPos = attributeId.indexOf( ';' );
 
         if ( optionsPos != -1 )
         {
@@ -705,7 +705,7 @@ public class ServerEntryUtils
      */
     private static Set<String> getOptions( String attributeId )
     {
-        int optionsPos = attributeId.indexOf( ";" );
+        int optionsPos = attributeId.indexOf( ';' );
 
         if ( optionsPos != -1 )
         {
@@ -728,8 +728,8 @@ public class ServerEntryUtils
             return null;
         }
     }
-    
-    
+
+
     /**
      * Filters an entry accordingly to the requested Attribute list.
      * 
@@ -737,18 +737,19 @@ public class ServerEntryUtils
      * @param operationContext The SearchingOperationContext
      * @throws LdapException If the filtering fails
      */
-    public static void filterContents( SchemaManager schemaManager, FilteringOperationContext operationContext, Entry entry ) throws LdapException
+    public static void filterContents( SchemaManager schemaManager, FilteringOperationContext operationContext,
+        Entry entry ) throws LdapException
     {
         boolean typesOnly = operationContext.isTypesOnly();
 
         boolean returnAll = ( operationContext.isAllOperationalAttributes() && operationContext.isAllUserAttributes() )
             && ( !typesOnly );
-        
+
         if ( returnAll )
         {
             return;
         }
-        
+
         Entry originalEntry = ( ( ClonedServerEntry ) entry ).getOriginalEntry();
 
         // First, remove all the attributes if we have the NoAtribute flag set to true
@@ -762,7 +763,7 @@ public class ServerEntryUtils
 
             return;
         }
-                
+
         // If the user has requested all the User attributes ('*') only, we filter the entry's attribute to keep only
         // the USER attributes, plus the Operational attributes in the returning list 
         if ( operationContext.isAllUserAttributes() )
@@ -799,7 +800,6 @@ public class ServerEntryUtils
             {
                 AttributeType attributeType = attribute.getAttributeType();
 
-
                 if ( attributeType.isUser() )
                 {
                     if ( !operationContext.contains( schemaManager, attributeType ) )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/FilteringOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/FilteringOperationContext.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/FilteringOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/FilteringOperationContext.java Fri May 24 12:55:06 2013
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 public abstract class FilteringOperationContext extends AbstractOperationContext
 {
     /** The LoggerFactory used by this Interceptor */
-    protected static Logger LOG = LoggerFactory.getLogger( FilteringOperationContext.class );
+    protected static final Logger LOG = LoggerFactory.getLogger( FilteringOperationContext.class );
 
     /** A set containing the returning attributeTypesOptions */
     protected Set<AttributeTypeOptions> returningAttributes;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java Fri May 24 12:55:06 2013
@@ -40,14 +40,13 @@ import org.apache.directory.server.core.
  */
 public interface PartitionNexus extends Partition
 {
-
     /** the admin super user uid */
-    public static final String ADMIN_UID = "admin";
+    static final String ADMIN_UID = "admin";
 
     /** the initial admin passwd set on startup */
-    public static final String ADMIN_PASSWORD_STRING = "secret";
+    static final String ADMIN_PASSWORD_STRING = "secret";
 
-    public static final byte[] ADMIN_PASSWORD_BYTES = Strings.getBytesUtf8( ADMIN_PASSWORD_STRING );
+    static final byte[] ADMIN_PASSWORD_BYTES = Strings.getBytesUtf8( ADMIN_PASSWORD_STRING );
 
 
     /**
@@ -55,7 +54,7 @@ public interface PartitionNexus extends 
      *
      * @return the attributes of the RootDSE
      */
-    public Entry getRootDse( GetRootDseOperationContext getRootDseContext );
+    Entry getRootDse( GetRootDseOperationContext getRootDseContext );
 
 
     /**
@@ -64,7 +63,7 @@ public interface PartitionNexus extends 
      * @param Partition The Partition to add
      * @throws Exception If the addition can't be done
      */
-    public void addContextPartition( Partition partition ) throws LdapException;
+    void addContextPartition( Partition partition ) throws LdapException;
 
 
     /**
@@ -73,8 +72,7 @@ public interface PartitionNexus extends 
      * @param partitionDn the partition Dn
      * @throws Exception If the removal can't be done
      */
-    public void removeContextPartition( Dn partitionDn )
-        throws LdapException;
+    void removeContextPartition( Dn partitionDn ) throws LdapException;
 
 
     /**
@@ -87,7 +85,7 @@ public interface PartitionNexus extends 
      * @return the partition containing the entry represented by the dn
      * @throws Exception if there is no partition for the dn
      */
-    public Partition getPartition( Dn dn ) throws LdapException;
+    Partition getPartition( Dn dn ) throws LdapException;
 
 
     /**
@@ -99,7 +97,7 @@ public interface PartitionNexus extends 
      * @return the suffix portion of dn, or the valid empty string Dn if no
      * naming context was found for dn.
      */
-    public Dn getSuffixDn( Dn dn ) throws LdapException;
+    Dn getSuffixDn( Dn dn ) throws LdapException;
 
 
     /**
@@ -109,7 +107,7 @@ public interface PartitionNexus extends 
      * @return Iteration over ContextPartition suffix names as Names.
      * @throws Exception if there are any problems
      */
-    public Set<String> listSuffixes() throws LdapException;
+    Set<String> listSuffixes() throws LdapException;
 
 
     /**
@@ -118,7 +116,7 @@ public interface PartitionNexus extends 
      * @param extensionOids a set of OID strings to add to the supportedExtension
      * attribute in the RootDSE
      */
-    public void registerSupportedExtensions( Set<String> extensionOids ) throws LdapException;
+    void registerSupportedExtensions( Set<String> extensionOids ) throws LdapException;
 
 
     /**
@@ -127,8 +125,8 @@ public interface PartitionNexus extends 
      * @param extensionOids a set of OID strings to add to the supportedSaslMechanisms
      * attribute in the RootDSE
      */
-    public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws LdapException;
+    void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws LdapException;
 
 
-    public boolean compare( CompareOperationContext compareContext ) throws LdapException;
+    boolean compare( CompareOperationContext compareContext ) throws LdapException;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Fri May 24 12:55:06 2013
@@ -71,7 +71,7 @@ public abstract class AbstractRegistrySy
     protected final SchemaEntityFactory factory;
 
     /** A map associating a SchemaObject type with its path on the partition*/
-    private final static Map<String, String> OBJECT_TYPE_TO_PATH = new HashMap<String, String>();
+    private static final Map<String, String> OBJECT_TYPE_TO_PATH = new HashMap<String, String>();
 
     static
     {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java Fri May 24 12:55:06 2013
@@ -36,10 +36,10 @@ import org.apache.directory.server.core.
 public interface RegistrySynchronizer
 {
     /** A constant to tell the caller that the schema has been modified */
-    static final boolean SCHEMA_MODIFIED = true;
+    boolean SCHEMA_MODIFIED = true;
 
     /** A constant to tell the caller that the schema has not been modified */
-    static final boolean SCHEMA_UNCHANGED = false;
+    boolean SCHEMA_UNCHANGED = false;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngine.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngine.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngine.java Fri May 24 12:55:06 2013
@@ -37,7 +37,7 @@ public interface StoredProcEngine
      * Returns the unique identifier of the supported stored procedure language.
      * 
      */
-    public String getSPLangId();
+    String getSPLangId();
 
 
     /**
@@ -46,7 +46,7 @@ public interface StoredProcEngine
      * <p>
      * This method should be called before an attempt to invoke a stored procedure via this Engine.
      */
-    public void setSPUnitEntry( final Entry spUnit );
+    void setSPUnitEntry( final Entry spUnit );
 
 
     /**
@@ -57,6 +57,5 @@ public interface StoredProcEngine
      * @return The value obtained from invoked procedure. The client should know what will return exactly so that it can downcast to the appropriate type.
      * @throws org.apache.directory.api.ldap.model.exception.LdapException If an error occurs during invocation.
      */
-    public Object invokeProcedure( CoreSession session, String fullSPName, Object[] spArgs ) throws LdapException;
-
+    Object invokeProcedure( CoreSession session, String fullSPName, Object[] spArgs ) throws LdapException;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngineConfig.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngineConfig.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngineConfig.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcEngineConfig.java Fri May 24 12:55:06 2013
@@ -32,13 +32,12 @@ public interface StoredProcEngineConfig
      * Returns the type of the associated {@link StoredProcEngine}.
      * 
      */
-    public Class<? extends StoredProcEngine> getStoredProcEngineType();
+    Class<? extends StoredProcEngine> getStoredProcEngineType();
 
 
     /**
      * Returns the unique language identifier of the {@link StoredProcEngine}.
      * 
      */
-    public String getStoredProcLangId();
-
+    String getStoredProcLangId();
 }

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java Fri May 24 12:55:06 2013
@@ -35,7 +35,7 @@ public interface AvlTree<K>
     /**
      * @return the comparator associated with this tree 
      */
-    public abstract Comparator<K> getComparator();
+    abstract Comparator<K> getComparator();
 
 
     /**
@@ -45,7 +45,7 @@ public interface AvlTree<K>
      * @return the replaced key if it already exists
      * Note: Ignores if a node with the given key already exists.
      */
-    public abstract K insert( K key );
+    abstract K insert( K key );
 
 
     /**
@@ -54,7 +54,7 @@ public interface AvlTree<K>
      * @param key the value of the node to be removed
      * @return the removed key, if any, or null if the key does not exist
      */
-    public abstract K remove( K key );
+    abstract K remove( K key );
 
 
     /**
@@ -62,7 +62,7 @@ public interface AvlTree<K>
      * 
      * @return true if the tree is empty, false otherwise
      */
-    public abstract boolean isEmpty();
+    abstract boolean isEmpty();
 
 
     /**
@@ -71,38 +71,38 @@ public interface AvlTree<K>
      * @return the number of nodes present in this tree
      */
     //NOTE: This method is internally used by AVLTreeMarshaller
-    public abstract int getSize();
+    abstract int getSize();
 
 
     /**
      * @return the root element of this tree (ie, not the first, but the
      * topmost element)
      */
-    public abstract LinkedAvlNode<K> getRoot();
+    abstract LinkedAvlNode<K> getRoot();
 
 
     /**
      * @return a list of the stored keys in this tree
      */
-    public abstract List<K> getKeys();
+    abstract List<K> getKeys();
 
 
     /**
      * Prints the contents of AVL tree in pretty format
      */
-    public abstract void printTree();
+    abstract void printTree();
 
 
     /**
      * @return The first element of this tree
      */
-    public abstract LinkedAvlNode<K> getFirst();
+    abstract LinkedAvlNode<K> getFirst();
 
 
     /**
      * @return The last element in this tree
      */
-    public abstract LinkedAvlNode<K> getLast();
+    abstract LinkedAvlNode<K> getLast();
 
 
     /**
@@ -112,7 +112,7 @@ public interface AvlTree<K>
      * @return the LinkedAvlNode<K> whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
-    public abstract LinkedAvlNode<K> findGreater( K key );
+    abstract LinkedAvlNode<K> findGreater( K key );
 
 
     /**
@@ -122,7 +122,7 @@ public interface AvlTree<K>
      * @return the LinkedAvlNode<K> whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
-    public abstract LinkedAvlNode<K> findGreaterOrEqual( K key );
+    abstract LinkedAvlNode<K> findGreaterOrEqual( K key );
 
 
     /**
@@ -132,7 +132,7 @@ public interface AvlTree<K>
      * @return the LinkedAvlNode<K> whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
-    public abstract LinkedAvlNode<K> findLess( K key );
+    abstract LinkedAvlNode<K> findLess( K key );
 
 
     /**
@@ -142,7 +142,7 @@ public interface AvlTree<K>
      * @return the LinkedAvlNode<K> whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
-    public abstract LinkedAvlNode<K> findLessOrEqual( K key );
+    abstract LinkedAvlNode<K> findLessOrEqual( K key );
 
 
     /**
@@ -152,6 +152,5 @@ public interface AvlTree<K>
      * @param key the key to find
      * @return the list of traversed LinkedAvlNode.
      */
-    public abstract LinkedAvlNode<K> find( K key );
-
+    abstract LinkedAvlNode<K> find( K key );
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeIterator.java Fri May 24 12:55:06 2013
@@ -64,19 +64,28 @@ final class AvlTreeIterator<T extends Co
         if ( next == null )
         {
             if ( root == null || !initial )
+            {
                 return;
+            }
+
             initial = false;
             next = root;
+
             while ( next.left != null )
+            {
                 next = next.left;
+            }
         }
         else
         {
             if ( next.right != null )
             {
                 next = next.right;
+
                 while ( next.left != null )
+                {
                     next = next.left;
+                }
             }
             else
             {

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/AvlTreeSet.java Fri May 24 12:55:06 2013
@@ -32,11 +32,12 @@ import java.util.Stack;
  */
 public class AvlTreeSet<T extends Comparable<T>> implements Iterable<T>
 {
-
     private AvlNode<T> tree;
     private int size = 0;
 
-    final boolean useFreeList;
+    private final boolean useFreeList;
+
+    private Stack<AvlNode<T>> freeList = new Stack<AvlNode<T>>();
 
 
     public AvlTreeSet()
@@ -74,8 +75,9 @@ public class AvlTreeSet<T extends Compar
         // empty tree case
         if ( tree == null )
         {
-            tree = new_node( null, value );
+            tree = newNode( null, value );
             ++size;
+
             return true;
         }
 
@@ -83,90 +85,116 @@ public class AvlTreeSet<T extends Compar
 
         // find the place and insert the value
         int cmp = value.compareTo( node.value );
+
         for ( ; cmp != 0; cmp = value.compareTo( node.value ) )
         {
             if ( cmp < 0 )
             {
                 if ( node.left == null )
                 {
-                    node.left = new_node( node, value );
+                    node.left = newNode( node, value );
                     break;
                 }
                 else
+                {
                     node = node.left;
+                }
             }
             else if ( cmp > 0 )
             {
                 if ( node.right == null )
                 {
-                    node.right = new_node( node, value );
+                    node.right = newNode( node, value );
                     break;
                 }
                 else
+                {
                     node = node.right;
+                }
             }
             else
+            {
                 assert false : "should never happen";
+            }
         }
 
         // node with _value_ already exists
         if ( cmp == 0 )
+        {
             return false;
-        rebalance_up( node );
+        }
+
+        rebalanceUp( node );
         ++size;
 
         return true;
     }
 
-    Stack<AvlNode<T>> free_list = new Stack<AvlNode<T>>();
-
 
-    private final AvlNode<T> new_node( AvlNode<T> parent, T value )
+    private final AvlNode<T> newNode( AvlNode<T> parent, T value )
     {
-        if ( !useFreeList || free_list.isEmpty() )
+        if ( !useFreeList || freeList.isEmpty() )
+        {
             return new AvlNode<T>( parent, value );
+        }
         else
         {
-            AvlNode<T> node = free_list.pop();
+            AvlNode<T> node = freeList.pop();
+
             return node.reset( parent, value );
         }
     }
 
 
-    private final void recycle_node( AvlNode<T> node )
+    private final void recycleNode( AvlNode<T> node )
     {
         if ( !useFreeList )
+        {
             return;
+        }
 
         // keep free list size not bigger than tree size
-        while ( free_list.size() > size )
-            free_list.pop();
-        if ( free_list.size() == size )
+        while ( freeList.size() > size )
+        {
+            freeList.pop();
+        }
+
+        if ( freeList.size() == size )
+        {
             return;
+        }
 
-        free_list.push( node );
+        freeList.push( node );
     }
 
 
-    private void rebalance_up( AvlNode<T> node )
+    private void rebalanceUp( AvlNode<T> node )
     {
         while ( node != null )
         {
-            int height_before = node.height;
-            update_height( node );
+            int heightBefore = node.height;
+            updateHeight( node );
 
             // rebalance
             if ( node.balance == -2 )
-                node = big_right_rotation( node );
+            {
+                node = bigRightRotation( node );
+            }
             else if ( node.balance == 2 )
-                node = big_left_rotation( node );
+            {
+                node = bigLeftRotation( node );
+            }
 
             if ( node.parent == null )
+            {
                 tree = node;
+            }
 
             // if parent node is not affected
-            if ( height_before == node.height )
+            if ( heightBefore == node.height )
+            {
                 break;
+            }
 
             node = node.parent;
         }
@@ -176,15 +204,21 @@ public class AvlTreeSet<T extends Compar
     public final boolean remove( T value )
     {
         AvlNode<T> node = tree;
+
         if ( node == null )
+        {
             return false;
+        }
 
         // find the node to be removed
         for ( int cmp = value.compareTo( node.value ); cmp != 0; cmp = value.compareTo( node.value ) )
         {
             node = ( cmp < 0 ) ? node.left : node.right;
+
             if ( node == null )
+            {
                 return false;
+            }
         }
 
         // find a replacement node (if needed)
@@ -192,6 +226,7 @@ public class AvlTreeSet<T extends Compar
         final int RIGHT = 1;
         final int NONE = 0;
         int replaceFrom = NONE;
+
         if ( node.left != null && node.right == null )
         {
             replaceFrom = LEFT;
@@ -221,20 +256,26 @@ public class AvlTreeSet<T extends Compar
             { // the tree root, single node in the tree
                 tree = null;
                 --size;
-                recycle_node( node );
+                recycleNode( node );
+
                 return true;
             }
             else
             { // non-root leaf node
-                // detach from parent
+              // detach from parent
                 if ( node.parent.left == node )
+                {
                     node.parent.left = null;
+                }
                 else
+                {
                     node.parent.right = null;
+                }
 
                 AvlNode<T> dead = node;
-                node = node.parent; // update heights/rebalance from node's parents up (the bottom of this method)
-                recycle_node( dead );
+                // update heights/rebalance from node's parents up (the bottom of this method)
+                node = node.parent;
+                recycleNode( dead );
                 replaceFrom = NONE;
             }
         }
@@ -242,49 +283,70 @@ public class AvlTreeSet<T extends Compar
         if ( replaceFrom != NONE )
         {
             AvlNode<T> leaf = null;
+
             if ( replaceFrom == LEFT )
             {
                 leaf = node.left;
+
                 while ( leaf.left != null || leaf.right != null )
                 {
                     if ( leaf.right != null )
+                    {
                         leaf = leaf.right;
+                    }
                     else
-                        leaf = small_right_rotation( leaf ); // the rotation should ensure (leaf.right != null) on the next iteration
+                    {
+                        // the rotation should ensure (leaf.right != null) on the next iteration
+                        leaf = smallRightRotation( leaf );
+                    }
                 }
             }
             else if ( replaceFrom == RIGHT )
             {
                 leaf = node.right;
+
                 while ( leaf.right != null || leaf.left != null )
                 {
                     if ( leaf.left != null )
+                    {
                         leaf = leaf.left;
+                    }
                     else
-                        leaf = small_left_rotation( leaf ); // the rotation should ensure (leaf.left != null) on the next iteration
+                    {
+                        // the rotation should ensure (leaf.left != null) on the next iteration
+                        leaf = smallLeftRotation( leaf );
+                    }
                 }
             }
             else
+            {
                 assert false : "should never happen";
+            }
 
             assert leaf != null : "replacement leaf should always exist at this point";
 
             // detach leaf from its parent
             if ( leaf.parent.left == leaf )
+            {
                 leaf.parent.left = null;
+            }
             else if ( leaf.parent.right == leaf )
+            {
                 leaf.parent.right = null;
+            }
             else
+            {
                 assert false : "broken parent/child reference in the tree";
+            }
 
             node.value = leaf.value; // replace node value with leaf's value
             node = leaf.parent; // change recursion point down so that below down-up update picks up
             // everything from leaf's parent up
 
-            recycle_node( leaf );
+            recycleNode( leaf );
         }
 
-        rebalance_up( node );
+        rebalanceUp( node );
 
         --size;
 
@@ -295,33 +357,42 @@ public class AvlTreeSet<T extends Compar
     public final boolean contains( T value )
     {
         AvlNode<T> node = tree;
+
         while ( node != null )
         {
             int cmp = value.compareTo( node.value );
+
             if ( cmp < 0 )
+            {
                 node = node.left;
+            }
             else if ( cmp > 0 )
+            {
                 node = node.right;
+            }
             else
+            {
                 return true;
+            }
         }
+
         return false;
 
     }
 
 
-    private static final <T extends Comparable<T>> void update_height( AvlNode<T> node )
+    private static final <T extends Comparable<T>> void updateHeight( AvlNode<T> node )
     {
-        int left_height = ( node.left == null ) ? -1 : node.left.height;
-        int right_height = ( node.right == null ) ? -1 : node.right.height;
-        node.height = 1 + ( right_height > left_height ? right_height : left_height );
-        node.balance = right_height - left_height;
+        int leftHeight = ( node.left == null ) ? -1 : node.left.height;
+        int rightHeight = ( node.right == null ) ? -1 : node.right.height;
+        node.height = 1 + ( rightHeight > leftHeight ? rightHeight : leftHeight );
+        node.balance = rightHeight - leftHeight;
     }
 
 
-    private static final <T extends Comparable<T>> AvlNode<T> small_left_rotation( AvlNode<T> node )
+    private static final <T extends Comparable<T>> AvlNode<T> smallLeftRotation( AvlNode<T> node )
     {
-        assert node.balance > 0 : "null right child in small_left";
+        assert node.balance > 0 : "null right child in smallLeft";
 
         // update child references
         AvlNode<T> right = node.right;
@@ -330,29 +401,36 @@ public class AvlTreeSet<T extends Compar
 
         // update parent references
         if ( node.right != null )
+        {
             node.right.parent = node;
+        }
+
         right.parent = node.parent;
 
         if ( right.parent != null )
         {
             if ( right.parent.left == node )
+            {
                 node.parent.left = right;
+            }
             else
+            {
                 node.parent.right = right;
+            }
         }
 
         node.parent = right;
 
-        update_height( node );
-        update_height( right );
+        updateHeight( node );
+        updateHeight( right );
 
         return right;
     }
 
 
-    private static final <T extends Comparable<T>> AvlNode<T> small_right_rotation( AvlNode<T> node )
+    private static final <T extends Comparable<T>> AvlNode<T> smallRightRotation( AvlNode<T> node )
     {
-        assert node.balance < 0 : "null left child in small_right";
+        assert node.balance < 0 : "null left child in smallRight";
 
         // update child references
         AvlNode<T> left = node.left;
@@ -361,48 +439,59 @@ public class AvlTreeSet<T extends Compar
 
         // update parent references
         if ( node.left != null )
+        {
             node.left.parent = node;
+        }
+
         left.parent = node.parent;
 
         if ( left.parent != null )
         {
             if ( left.parent.left == node )
+            {
                 node.parent.left = left;
+            }
             else
+            {
                 node.parent.right = left;
+            }
         }
 
         node.parent = left;
 
-        update_height( node );
-        update_height( left );
+        updateHeight( node );
+        updateHeight( left );
 
         return left;
     }
 
 
-    private static final <T extends Comparable<T>> AvlNode<T> big_left_rotation( AvlNode<T> node )
+    private static final <T extends Comparable<T>> AvlNode<T> bigLeftRotation( AvlNode<T> node )
     {
-        assert node.right != null : "null right child in big_left";
+        assert node.right != null : "null right child in bigLeft";
 
         if ( node.right.balance < 0 )
-            node.right = small_right_rotation( node.right );
+        {
+            node.right = smallRightRotation( node.right );
+        }
 
-        update_height( node );
+        updateHeight( node );
 
-        return small_left_rotation( node );
+        return smallLeftRotation( node );
     }
 
 
-    private static final <T extends Comparable<T>> AvlNode<T> big_right_rotation( AvlNode<T> node )
+    private static final <T extends Comparable<T>> AvlNode<T> bigRightRotation( AvlNode<T> node )
     {
-        assert node.left != null : "null right child in big_right";
+        assert node.left != null : "null right child in bigRight";
 
         if ( node.left.balance > 0 )
-            node.left = small_left_rotation( node.left );
+        {
+            node.left = smallLeftRotation( node.left );
+        }
 
-        update_height( node );
+        updateHeight( node );
 
-        return small_right_rotation( node );
+        return smallRightRotation( node );
     }
 }

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java Fri May 24 12:55:06 2013
@@ -38,114 +38,114 @@ public final class ApacheSchemaConstants
     {
     }
 
-    public final static String SCHEMA_NAME = "apache";
+    public static final String SCHEMA_NAME = "apache";
 
     // ---- ObjectClasses -----------------------------------------------------
     // ApacheCatalogEntry
-    public final static String APACHE_CATALOG_ENTRY_OC = "apacheCatalogEntry";
-    public final static String APACHE_CATALOG_ENTRY_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.5";
+    public static final String APACHE_CATALOG_ENTRY_OC = "apacheCatalogEntry";
+    public static final String APACHE_CATALOG_ENTRY_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.5";
 
     // apacheFactoryConfiguration
-    public final static String APACHE_FACTORY_CONFIGURATION_OC = "apacheFactoryConfiguration";
-    public final static String APACHE_FACTORY_CONFIGURATION_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.4";
+    public static final String APACHE_FACTORY_CONFIGURATION_OC = "apacheFactoryConfiguration";
+    public static final String APACHE_FACTORY_CONFIGURATION_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.4";
 
     // ApacheServiceConfiguration
-    public final static String APACHE_SERVICE_CONFIGURATION_OC = "apacheServiceConfiguration";
-    public final static String APACHE_SERVICE_CONFIGURATION_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.3";
+    public static final String APACHE_SERVICE_CONFIGURATION_OC = "apacheServiceConfiguration";
+    public static final String APACHE_SERVICE_CONFIGURATION_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.3";
 
     // ApacheSubschema
-    public final static String APACHE_SUBSCHEMA_OC = "apacheSubschema";
-    public final static String APACHE_SUBSCHEMA_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.9";
+    public static final String APACHE_SUBSCHEMA_OC = "apacheSubschema";
+    public static final String APACHE_SUBSCHEMA_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.9";
 
     // JavaClass
-    public final static String JAVA_CLASS_OC = "javaClass";
-    public final static String JAVA_CLASS_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.8";
+    public static final String JAVA_CLASS_OC = "javaClass";
+    public static final String JAVA_CLASS_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.8";
 
     // JavaStoredProcUnit
-    public final static String JAVA_STORED_PROC_UNIT_OC = "javaStoredProcUnit";
-    public final static String JAVA_STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.5";
+    public static final String JAVA_STORED_PROC_UNIT_OC = "javaStoredProcUnit";
+    public static final String JAVA_STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.5";
 
     // JavaxScriptStoredProcUnit
-    public final static String JAVAX_SCRIPT_STORED_PROC_UNIT_OC = "javaxScriptStoredProcUnit";
-    public final static String JAVAX_SCRIPT_STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.8";
+    public static final String JAVAX_SCRIPT_STORED_PROC_UNIT_OC = "javaxScriptStoredProcUnit";
+    public static final String JAVAX_SCRIPT_STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.8";
 
     // PrefNode
-    public final static String PREF_NODE_OC = "prefNode";
-    public final static String PREF_NODE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.1";
+    public static final String PREF_NODE_OC = "prefNode";
+    public static final String PREF_NODE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.1";
 
     // SchemaModificationAttributes
-    public final static String SCHEMA_MODIFICATION_ATTRIBUTES_OC = "schemaModificationAttributes";
-    public final static String SCHEMA_MODIFICATION_ATTRIBUTES_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.10";
+    public static final String SCHEMA_MODIFICATION_ATTRIBUTES_OC = "schemaModificationAttributes";
+    public static final String SCHEMA_MODIFICATION_ATTRIBUTES_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.10";
 
     // StoredProcUnit
-    public final static String STORED_PROC_UNIT_OC = "storedProcUnit";
-    public final static String STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.3";
+    public static final String STORED_PROC_UNIT_OC = "storedProcUnit";
+    public static final String STORED_PROC_UNIT_OC_OID = "1.3.6.1.4.1.18060.0.4.1.5.3";
 
     // TriggerExecutionSubentry
-    public final static String TRIGGER_EXECUTION_SUBENTRY_OC = "triggerExecutionSubentry";
-    public final static String TRIGGER_EXECUTION_SUBENTRY_OC_OID = "1.3.6.1.4.1.18060.0.4.1.2.28";
+    public static final String TRIGGER_EXECUTION_SUBENTRY_OC = "triggerExecutionSubentry";
+    public static final String TRIGGER_EXECUTION_SUBENTRY_OC_OID = "1.3.6.1.4.1.18060.0.4.1.2.28";
 
     // UnixFile
-    public final static String UNIX_FILE_OC = "unixFile";
-    public final static String UNIX_FILE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.7";
+    public static final String UNIX_FILE_OC = "unixFile";
+    public static final String UNIX_FILE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.7";
 
     // WindowsFile
-    public final static String WINDOWS_FILE_OC = "windowsFile";
-    public final static String WINDOWS_FILE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.6";
+    public static final String WINDOWS_FILE_OC = "windowsFile";
+    public static final String WINDOWS_FILE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.6";
 
     // ---- AttributeType ----------------------------------------------------------
     // ApachePresence
-    public final static String APACHE_PRESENCE_AT = "ApachePresence";
-    public final static String APACHE_PRESENCE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
+    public static final String APACHE_PRESENCE_AT = "ApachePresence";
+    public static final String APACHE_PRESENCE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
 
     // ApacheOneAlias
-    public final static String APACHE_ONE_ALIAS_AT = "apacheOneAlias";
-    public final static String APACHE_ONE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.5";
+    public static final String APACHE_ONE_ALIAS_AT = "apacheOneAlias";
+    public static final String APACHE_ONE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.5";
 
     // ApacheSubAlias
-    public final static String APACHE_SUB_ALIAS_AT = "apacheSubAlias";
-    public final static String APACHE_SUB_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.6";
+    public static final String APACHE_SUB_ALIAS_AT = "apacheSubAlias";
+    public static final String APACHE_SUB_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.6";
 
     // ApacheAlias
-    public final static String APACHE_ALIAS_AT = "apacheAlias";
-    public final static String APACHE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.7";
+    public static final String APACHE_ALIAS_AT = "apacheAlias";
+    public static final String APACHE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.7";
 
     // PrefNodeName
-    public final static String PREF_NODE_NAME_AT = "prefNodeName";
-    public final static String PREF_NODE_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.8";
+    public static final String PREF_NODE_NAME_AT = "prefNodeName";
+    public static final String PREF_NODE_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.8";
 
     // CatalogEntryName
-    public final static String APACHE_CATALOGUE_ENTRY_NAME_AT = "apacheCatalogEntryName";
-    public final static String APACHE_CATALOGUE_ENTRY_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.17";
+    public static final String APACHE_CATALOGUE_ENTRY_NAME_AT = "apacheCatalogEntryName";
+    public static final String APACHE_CATALOGUE_ENTRY_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.17";
 
-    public final static String APACHE_CATALOGUE_ENTRY_BASE_DN_AT = "apacheCatalogEntryBaseDn";
-    public final static String APACHE_CATALOGUE_ENTRY_BASE_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.18";
+    public static final String APACHE_CATALOGUE_ENTRY_BASE_DN_AT = "apacheCatalogEntryBaseDn";
+    public static final String APACHE_CATALOGUE_ENTRY_BASE_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.18";
 
     // WindowsFilePath
-    public final static String WINDOWS_FILE_AT = "windowsFilePath";
-    public final static String WINDOWS_FILE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.19";
+    public static final String WINDOWS_FILE_AT = "windowsFilePath";
+    public static final String WINDOWS_FILE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.19";
 
     // WindowsFilePath
-    public final static String UNIX_FILE_AT = "unixFilePath";
-    public final static String UNIX_FILE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.20";
+    public static final String UNIX_FILE_AT = "unixFilePath";
+    public static final String UNIX_FILE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.20";
 
     // entryDeleted
-    public final static String ENTRY_DELETED_AT = "entryDeleted";
-    public final static String ENTRY_DELETED_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.31";
+    public static final String ENTRY_DELETED_AT = "entryDeleted";
+    public static final String ENTRY_DELETED_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.31";
 
     // SchemaModifyTimestamp
-    public final static String SCHEMA_MODIFY_TIMESTAMP_AT = "schemaModifyTimestamp";
-    public final static String SCHEMA_MODIFY_TIMESTAMP_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.35";
+    public static final String SCHEMA_MODIFY_TIMESTAMP_AT = "schemaModifyTimestamp";
+    public static final String SCHEMA_MODIFY_TIMESTAMP_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.35";
 
     // SchemaModifiersName
-    public final static String SCHEMA_MODIFIERS_NAME_AT = "schemaModifiersName";
-    public final static String SCHEMA_MODIFIERS_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.36";
+    public static final String SCHEMA_MODIFIERS_NAME_AT = "schemaModifiersName";
+    public static final String SCHEMA_MODIFIERS_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.36";
 
     // SubschemaSubentryName
-    public final static String SUBSCHEMA_SUBENTRY_NAME_AT = "subschemaSubentryName";
-    public final static String SUBSCHEMA_SUBENTRY_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.37";
+    public static final String SUBSCHEMA_SUBENTRY_NAME_AT = "subschemaSubentryName";
+    public static final String SUBSCHEMA_SUBENTRY_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.37";
 
     // apacheRdn
-    public final static String APACHE_RDN_AT = "apacheRdn";
-    public final static String APACHE_RDN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.50";
+    public static final String APACHE_RDN_AT = "apacheRdn";
+    public static final String APACHE_RDN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.50";
 }

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java Fri May 24 12:55:06 2013
@@ -38,5 +38,5 @@ public final class CoreSchemaConstants
     {
     }
 
-    public final static String SCHEMA_NAME = "core";
+    public static final String SCHEMA_NAME = "core";
 }

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java Fri May 24 12:55:06 2013
@@ -37,5 +37,5 @@ public class SystemSchemaConstants
     {
     }
 
-    public final static String SCHEMA_NAME = "system";
+    public static final String SCHEMA_NAME = "system";
 }

Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java (original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java Fri May 24 12:55:06 2013
@@ -788,7 +788,7 @@ public enum I18n
     private static ResourceBundle errBundle = ResourceBundle
         .getBundle( "org.apache.directory.server.i18n.errors" );
 
-    private final static ResourceBundle msgBundle = ResourceBundle
+    private static final ResourceBundle msgBundle = ResourceBundle
         .getBundle( "org/apache/directory/server/i18n/messages" );
 
     /** The error code */

Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Fri May 24 12:55:06 2013
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 public interface ACITupleFilter
 {
     /** the dedicated logger for ACI */
-    static final Logger ACI_LOG = LoggerFactory.getLogger( Loggers.ACI_LOG.getName() );
+    Logger ACI_LOG = LoggerFactory.getLogger( Loggers.ACI_LOG.getName() );
 
 
     /**

Modified: directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Fri May 24 12:55:06 2013
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
 public class EventInterceptor extends BaseInterceptor
 {
     /** A logger for this class */
-    private final static Logger LOG = LoggerFactory.getLogger( EventInterceptor.class );
+    private static final Logger LOG = LoggerFactory.getLogger( EventInterceptor.class );
 
     private Evaluator evaluator;
     private ExecutorService executor;
@@ -118,9 +118,9 @@ public class EventInterceptor extends Ba
                         }
                     } );
                 }
-                
+
                 break;
-                
+
             case DELETE:
                 if ( listener.isSynchronous() )
                 {
@@ -136,9 +136,9 @@ public class EventInterceptor extends Ba
                         }
                     } );
                 }
-                
+
                 break;
-                
+
             case MODIFY:
                 if ( listener.isSynchronous() )
                 {
@@ -154,9 +154,9 @@ public class EventInterceptor extends Ba
                         }
                     } );
                 }
-                
+
                 break;
-                
+
             case MOVE:
                 if ( listener.isSynchronous() )
                 {
@@ -172,7 +172,7 @@ public class EventInterceptor extends Ba
                         }
                     } );
                 }
-                
+
                 break;
 
             case RENAME:
@@ -190,15 +190,16 @@ public class EventInterceptor extends Ba
                         }
                     } );
                 }
-                
+
                 break;
-                
+
             case MOVE_AND_RENAME:
                 if ( listener.isSynchronous() )
                 {
                     listener.entryMovedAndRenamed( ( MoveAndRenameOperationContext ) opContext );
                 }
                 else
+                {
                     executor.execute( new Runnable()
                     {
                         public void run()
@@ -206,7 +207,8 @@ public class EventInterceptor extends Ba
                             listener.entryMovedAndRenamed( ( MoveAndRenameOperationContext ) opContext );
                         }
                     } );
-                
+                }
+
                 break;
         }
     }
@@ -268,7 +270,7 @@ public class EventInterceptor extends Ba
         Entry oriEntry = modifyContext.getEntry();
 
         // modification was already done when this flag is turned on, move to sending the events
-        if( !modifyContext.isPushToEvtInterceptor() )
+        if ( !modifyContext.isPushToEvtInterceptor() )
         {
             next( modifyContext );
         }
@@ -282,7 +284,8 @@ public class EventInterceptor extends Ba
 
         // Get the modified entry
         CoreSession session = modifyContext.getSession();
-        LookupOperationContext lookupContext = new LookupOperationContext( session, modifyContext.getDn(), SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, modifyContext.getDn(),
+            SchemaConstants.ALL_ATTRIBUTES_ARRAY );
 
         Entry alteredEntry = directoryService.getPartitionNexus().lookup( lookupContext );
         modifyContext.setAlteredEntry( alteredEntry );
@@ -366,7 +369,8 @@ public class EventInterceptor extends Ba
 
         // Get the modified entry
         CoreSession session = renameContext.getSession();
-        LookupOperationContext lookupContext = new LookupOperationContext( session, renameContext.getNewDn(), SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, renameContext.getNewDn(),
+            SchemaConstants.ALL_ATTRIBUTES_ARRAY );
 
         Entry alteredEntry = directoryService.getPartitionNexus().lookup( lookupContext );
         renameContext.setModifiedEntry( alteredEntry );
@@ -388,7 +392,7 @@ public class EventInterceptor extends Ba
     private List<RegistrationEntry> getSelectingRegistrations( Dn name, Entry entry ) throws LdapException
     {
         List<RegistrationEntry> registrations = directoryService.getEventService().getRegistrationEntries();
-        
+
         if ( registrations.isEmpty() )
         {
             return Collections.emptyList();

Modified: directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Fri May 24 12:55:06 2013
@@ -72,7 +72,7 @@ public class ReferralInterceptor extends
     private Dn subschemaSubentryDn;
 
 
-    static private void checkRefAttributeValue( Value<?> value ) throws LdapException, LdapURLEncodingException
+    private static void checkRefAttributeValue( Value<?> value ) throws LdapException, LdapURLEncodingException
     {
         StringValue ref = ( StringValue ) value;
 
@@ -138,7 +138,7 @@ public class ReferralInterceptor extends
 
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     @SuppressWarnings("PMD.EmptyCatchBlock")
-    static private boolean isReferral( Entry entry ) throws LdapException
+    private static boolean isReferral( Entry entry ) throws LdapException
     {
         // Check that the entry is not null, otherwise return FALSE.
         // This is typically to cover the case where the entry has not
@@ -331,7 +331,7 @@ public class ReferralInterceptor extends
         // TODO: this can be spare, as we already have the altered entry
         // into the opContext, but for an unknow reason, this will fail
         // on eferral tests...
-        LookupOperationContext lookupContext = 
+        LookupOperationContext lookupContext =
             new LookupOperationContext( modifyContext.getSession(), dn, SchemaConstants.ALL_ATTRIBUTES_ARRAY );
 
         Entry newEntry = nexus.lookup( lookupContext );

Modified: directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java Fri May 24 12:55:06 2013
@@ -37,7 +37,7 @@ public interface StoredProcedureParamete
     List<Object> getArgumentsToInject( OperationContext opContext,
         List<StoredProcedureParameter> parameterList ) throws LdapException;
 
-    public interface MicroInjector
+    interface MicroInjector
     {
         Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapException;
     }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmDnIndex.java Fri May 24 12:55:06 2013
@@ -77,7 +77,6 @@ public class JdbmDnIndex extends JdbmInd
         {
             NullPointerException e = new NullPointerException( "The index working directory has not be set" );
 
-            e.printStackTrace();
             throw e;
         }
 

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Fri May 24 12:55:06 2013
@@ -154,7 +154,6 @@ public class JdbmIndex<K, V> extends Abs
         {
             NullPointerException e = new NullPointerException( "The index working directory has not be set" );
 
-            e.printStackTrace();
             throw e;
         }
 

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Fri May 24 12:55:06 2013
@@ -79,7 +79,6 @@ public class JdbmRdnIndex extends JdbmIn
         {
             NullPointerException e = new NullPointerException( "The index working directory has not be set" );
 
-            e.printStackTrace();
             throw e;
         }
 

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializer.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializer.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializer.java Fri May 24 12:55:06 2013
@@ -37,7 +37,7 @@ public class StringSerializer implements
     private static final long serialVersionUID = -173163945773783649L;
 
     /** A static instance of a StringSerializer */
-    public static StringSerializer INSTANCE = new StringSerializer();
+    public static final StringSerializer INSTANCE = new StringSerializer();
 
 
     /**

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/AbstractPasswordMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/AbstractPasswordMessage.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/AbstractPasswordMessage.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/AbstractPasswordMessage.java Fri May 24 12:55:06 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.kerberos.changepwd.messages;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.api.asn1.EncoderException;
@@ -27,17 +28,17 @@ import org.apache.directory.api.asn1.Enc
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-abstract public class AbstractPasswordMessage
+public abstract class AbstractPasswordMessage
 {
     /**
      * ChangePassword protocol version number.
      */
-    public static final short PVNO = (short) 0xFF80;
+    public static final short PVNO = ( short ) 0xFF80;
 
     public static final short OLD_PVNO = 1;
-    
+
     static final int HEADER_LENGTH = 6;
-    
+
     private short versionNumber;
 
 
@@ -56,8 +57,10 @@ abstract public class AbstractPasswordMe
     {
         return versionNumber;
     }
-    
+
+
     public abstract short computeLength();
-    
+
+
     public abstract ByteBuffer encode( ByteBuffer buf ) throws EncoderException;
 }

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java Fri May 24 12:55:06 2013
@@ -34,7 +34,7 @@ public interface ChecksumEngine
      *
      * @return The checksum type.
      */
-    public ChecksumType checksumType();
+    ChecksumType checksumType();
 
 
     /**
@@ -45,5 +45,5 @@ public interface ChecksumEngine
      * @param usage 
      * @return The checksum value.
      */
-    public byte[] calculateChecksum( byte[] data, byte[] key, KeyUsage usage );
+    byte[] calculateChecksum( byte[] data, byte[] key, KeyUsage usage );
 }

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java Fri May 24 12:55:06 2013
@@ -122,7 +122,7 @@ class KeytabDecoder
             }
         }
 
-        principalNameBuffer.append( "@" + realm );
+        principalNameBuffer.append( "@" ).append( realm );
 
         return principalNameBuffer.toString();
     }

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java Fri May 24 12:55:06 2013
@@ -20,7 +20,6 @@
 package org.apache.directory.server.kerberos.shared.store;
 
 
-
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.changepwd.exceptions.ChangePasswordException;
@@ -42,7 +41,8 @@ public interface PrincipalStore
      * @param isInitialTicket tells if the ticket is a freshly obtained ticket
      * @throws Exception
      */
-    public void changePassword( KerberosPrincipal byPrincipal, KerberosPrincipal forPrincipal, String newPassword, boolean isInitialTicket ) throws ChangePasswordException;
+    void changePassword( KerberosPrincipal byPrincipal, KerberosPrincipal forPrincipal, String newPassword,
+        boolean isInitialTicket ) throws ChangePasswordException;
 
 
     /**
@@ -52,5 +52,5 @@ public interface PrincipalStore
      * @return The {@link PrincipalStoreEntry} for the given Kerberos principal.
      * @throws Exception
      */
-    public PrincipalStoreEntry getPrincipal( KerberosPrincipal principal ) throws Exception;
+    PrincipalStoreEntry getPrincipal( KerberosPrincipal principal ) throws Exception;
 }

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageDecoder.java Fri May 24 12:55:06 2013
@@ -105,8 +105,11 @@ public class DhcpMessageDecoder
 
         // find zero-terminator
         int slen = 0;
+
         while ( bytes[slen] != 0 )
+        {
             slen++;
+        }
 
         try
         {
@@ -130,6 +133,7 @@ public class DhcpMessageDecoder
     {
         byte[] addr = new byte[4];
         buffer.get( addr );
+
         try
         {
             return InetAddress.getByAddress( addr );
@@ -164,11 +168,16 @@ public class DhcpMessageDecoder
         while ( true )
         {
             code = message.get();
+
             if ( code == 0 ) // pad option
+            {
                 continue;
+            }
 
             if ( code == -1 ) // end option
+            {
                 break;
+            }
 
             length = message.get();
             value = new byte[length];

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/io/DhcpMessageEncoder.java Fri May 24 12:55:06 2013
@@ -73,7 +73,9 @@ public class DhcpMessageEncoder
 
         // update message type option (if set)
         if ( null != message.getMessageType() )
+        {
             options.add( new DhcpMessageType( message.getMessageType() ) );
+        }
 
         encodeOptions( options, byteBuffer );
     }
@@ -89,7 +91,9 @@ public class DhcpMessageEncoder
     private void writeString( ByteBuffer byteBuffer, String string, int len )
     {
         if ( null == string )
+        {
             string = "";
+        }
 
         try
         {
@@ -140,15 +144,20 @@ public class DhcpMessageEncoder
     private void writeBytes( ByteBuffer byteBuffer, byte bytes[], int len )
     {
         if ( null == bytes )
+        {
             bytes = new byte[]
                 {};
+        }
 
         byteBuffer.put( bytes, 0, Math.min( len, bytes.length ) );
 
         // pad as necessary
         int remain = len - bytes.length;
+
         while ( remain-- > 0 )
+        {
             byteBuffer.put( ( byte ) 0 );
+        }
     }
 
     private static final byte[] VENDOR_MAGIC_COOKIE =

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java Fri May 24 12:55:06 2013
@@ -20,6 +20,7 @@
 package org.apache.directory.server.dhcp.messages;
 
 
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -89,8 +90,11 @@ public final class HardwareAddress
     public int hashCode()
     {
         int hashCode = 98643532 ^ type ^ length;
+
         for ( int i = 0; i < length; i++ )
+        {
             hashCode ^= address[i];
+        }
 
         return hashCode;
     }
@@ -102,7 +106,9 @@ public final class HardwareAddress
     public boolean equals( Object obj )
     {
         if ( null == obj || !( obj.getClass().equals( HardwareAddress.class ) ) )
+        {
             return false;
+        }
 
         HardwareAddress hw = ( HardwareAddress ) obj;
 
@@ -122,19 +128,29 @@ public final class HardwareAddress
     public String getNativeRepresentation()
     {
         StringBuffer sb = new StringBuffer();
+
         switch ( type )
         {
             case 1:
                 for ( int i = 0; i < length; i++ )
                 {
                     if ( i > 0 )
+                    {
                         sb.append( ":" );
+                    }
+
                     String hex = Integer.toHexString( address[i] & 0xff );
+
                     if ( hex.length() < 2 )
+                    {
                         sb.append( '0' );
+                    }
+
                     sb.append( hex );
                 }
+
                 break;
+
             default:
                 sb.append( toString() );
         }
@@ -157,13 +173,21 @@ public final class HardwareAddress
         StringBuffer sb = new StringBuffer();
         sb.append( type );
         sb.append( "/" );
+
         for ( int i = 0; i < length; i++ )
         {
             if ( i > 0 )
+            {
                 sb.append( ":" );
+            }
+
             String hex = Integer.toHexString( address[i] & 0xff );
+
             if ( hex.length() < 2 )
+            {
                 sb.append( '0' );
+            }
+
             sb.append( hex );
         }
 
@@ -185,18 +209,26 @@ public final class HardwareAddress
     public static HardwareAddress valueOf( String s )
     {
         if ( null == s || s.length() == 0 )
+        {
             return null;
+        }
 
         Matcher m = PARSE_PATTERN.matcher( s );
+
         if ( !m.matches() )
+        {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_637, s ) );
+        }
 
         int type = Integer.parseInt( m.group( 1 ) );
         int len = m.groupCount() - 1;
 
         byte addr[] = new byte[len];
+
         for ( int i = 0; i < addr.length; i++ )
+        {
             addr[i] = ( byte ) Integer.parseInt( m.group( i + 2 ), 16 );
+        }
 
         return new HardwareAddress( ( short ) type, ( short ) len, addr );
     }

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java Fri May 24 12:55:06 2013
@@ -156,7 +156,9 @@ public abstract class DhcpOption
                 Class c = OPTION_CLASSES[i];
 
                 if ( !DhcpOption.class.isAssignableFrom( c ) )
+                {
                     throw new RuntimeException( I18n.err( I18n.ERR_639, c ) );
+                }
 
                 DhcpOption o = ( DhcpOption ) c.newInstance();
 
@@ -232,8 +234,11 @@ public abstract class DhcpOption
 
         // FIXME: handle continuation, i.e. options longer than 128 bytes?
         byte data[] = getData();
+
         if ( data.length > 255 )
+        {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_641 ) );
+        }
 
         out.put( ( byte ) data.length );
         out.put( data );

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java Fri May 24 12:55:06 2013
@@ -97,7 +97,9 @@ public class OptionsField
     public void merge( OptionsField options )
     {
         if ( null == options )
+        {
             return;
+        }
 
         for ( Iterator i = options.iterator(); i.hasNext(); )
         {

Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/StringOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/StringOption.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/StringOption.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/StringOption.java Fri May 24 12:55:06 2013
@@ -66,8 +66,10 @@ public abstract class StringOption exten
     public byte[] getData()
     {
         if ( null == string )
+        {
             return new byte[]
                 {};
+        }
 
         try
         {



Mime
View raw message