directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1484624 [2/2] - in /directory/shared/trunk: dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/ dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ dsm...
Date Mon, 20 May 2013 23:43:36 GMT
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java Mon May 20 23:43:35 2013
@@ -156,7 +156,7 @@ public class Ava implements Externalizab
         if ( schemaManager != null )
         {
             this.schemaManager = schemaManager;
-            
+
             try
             {
                 attributeType = schemaManager.lookupAttributeTypeRegistry( upType );
@@ -606,203 +606,6 @@ public class Ava implements Externalizab
         }
     }
 
-    private static final boolean[] DN_ESCAPED_CHARS = new boolean[]
-        {
-            true, true, true, true, true, true, true, true, // 0x00 -> 0x07
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true, // 0x08 -> 0x0F
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true, // 0x10 -> 0x17
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true,
-            true, // 0x18 -> 0x1F
-            true,
-            false,
-            true,
-            true,
-            false,
-            false,
-            false,
-            false, // 0x20 -> 0x27 ' ', '"', '#'
-            false,
-            false,
-            false,
-            true,
-            true,
-            false,
-            false,
-            false, // 0x28 -> 0x2F '+', ','
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x30 -> 0x37
-            false,
-            false,
-            false,
-            true,
-            true,
-            false,
-            true,
-            false, // 0x38 -> 0x3F ';', '<', '>'
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x40 -> 0x47
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x48 -> 0x4F
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x50 -> 0x57
-            false,
-            false,
-            false,
-            false,
-            true,
-            false,
-            false,
-            false, // 0x58 -> 0x5F
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x60 -> 0x67
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x68 -> 0x6F
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x70 -> 0x77
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false, // 0x78 -> 0x7F
-        };
-
-
-    /**
-     * Normalize the value in order to be able to use it in a DN as a String. Some
-     * characters will be escaped (prefixed with '\'),
-     * 
-     * @return The normalized Ava
-     */
-    private String normalizeValue()
-    {
-        // The result will be gathered in a stringBuilder
-        StringBuilder sb = new StringBuilder();
-
-        String normalizedValue = normValue.getString();
-        int valueLength = normalizedValue.length();
-
-        if ( normalizedValue.length() > 0 )
-        {
-            char[] chars = normalizedValue.toCharArray();
-
-            // Here, we have a char to escape. Start again the loop...
-            for ( int i = 0; i < valueLength; i++ )
-            {
-                char c = chars[i];
-
-                if ( ( c >= 0 ) && ( c < DN_ESCAPED_CHARS.length ) && DN_ESCAPED_CHARS[c] )
-                {
-                    // Some chars need to be escaped even if they are US ASCII
-                    // Just prefix them with a '\'
-                    // Special cases are ' ' (space), '#') which need a special
-                    // treatment.
-                    switch ( c )
-                    {
-                        case ' ':
-                            if ( ( i == 0 ) || ( i == valueLength - 1 ) )
-                            {
-                                sb.append( "\\ " );
-                            }
-                            else
-                            {
-                                sb.append( ' ' );
-                            }
-
-                            break;
-
-                        case '#':
-                            if ( i == 0 )
-                            {
-                                sb.append( "\\#" );
-                                continue;
-                            }
-                            else
-                            {
-                                sb.append( '#' );
-                            }
-
-                            break;
-
-                        default:
-                            sb.append( '\\' ).append( c );
-                    }
-                }
-                else
-                {
-                    // Standard ASCII chars are just appended
-                    sb.append( c );
-                }
-            }
-        }
-
-        return sb.toString();
-    }
-
 
     /**
      * A Normalized String representation of a Ava :
@@ -1150,28 +953,28 @@ public class Ava implements Externalizab
     {
         return attributeType;
     }
-    
-    
+
+
     private int compareValues( Ava that )
     {
         int comp = 0;
-        
+
         if ( normValue.getNormValue() instanceof String )
         {
-            comp = ((String)normValue.getNormValue()).compareTo( ((String)that.normValue.getNormValue()) );
-            
+            comp = ( ( String ) normValue.getNormValue() ).compareTo( ( ( String ) that.normValue.getNormValue() ) );
+
             return comp;
         }
         else
         {
-            byte[] bytes1 = (byte[])normValue.getNormValue();
-            byte[] bytes2 = (byte[])that.normValue.getNormValue();
-            
+            byte[] bytes1 = ( byte[] ) normValue.getNormValue();
+            byte[] bytes2 = ( byte[] ) that.normValue.getNormValue();
+
             for ( int pos = 0; pos < bytes1.length; pos++ )
             {
                 int v1 = ( bytes1[pos] & 0x00FF );
                 int v2 = ( bytes2[pos] & 0x00FF );
-                
+
                 if ( v1 > v2 )
                 {
                     return 1;
@@ -1181,35 +984,36 @@ public class Ava implements Externalizab
                     return -1;
                 }
             }
-            
+
             return 0;
         }
-        
+
     }
 
 
     /**
      * @see Comparable#compareTo(Object)
      */
+    @SuppressWarnings("unchecked")
     public int compareTo( Ava that )
     {
         if ( that == null )
         {
             return 1;
         }
-        
+
         int comp = 0;
-        
+
         if ( schemaManager == null )
         {
             // Compare the ATs
             comp = normType.compareTo( that.normType );
-            
+
             if ( comp != 0 )
             {
                 return comp;
             }
-            
+
             // and compare the values
             if ( normValue == null )
             {
@@ -1232,14 +1036,14 @@ public class Ava implements Externalizab
                 {
                     if ( normValue instanceof StringValue )
                     {
-                        comp = ((StringValue)normValue).compareTo( (StringValue)that.normValue );
-                        
+                        comp = ( ( StringValue ) normValue ).compareTo( ( StringValue ) that.normValue );
+
                         return comp;
                     }
                     else
                     {
-                        comp = ((BinaryValue)normValue).compareTo( (BinaryValue)that.normValue );
-                        
+                        comp = ( ( BinaryValue ) normValue ).compareTo( ( BinaryValue ) that.normValue );
+
                         return comp;
                     }
                 }
@@ -1259,39 +1063,39 @@ public class Ava implements Externalizab
                     return 1;
                 }
             }
-            
+
             // First compare the AT OID
             comp = attributeType.getOid().compareTo( that.attributeType.getOid() );
-            
+
             if ( comp != 0 )
             {
                 return comp;
             }
-            
+
             // Now, compare the two values using the ordering matchingRule comparator, if any
             MatchingRule orderingMR = attributeType.getOrdering();
-            
+
             if ( orderingMR != null )
             {
-                LdapComparator<Object> comparator = (LdapComparator<Object>)orderingMR.getLdapComparator();
-                
+                LdapComparator<Object> comparator = ( LdapComparator<Object> ) orderingMR.getLdapComparator();
+
                 if ( comparator != null )
                 {
                     comp = comparator.compare( normValue.getNormValue(), that.normValue.getNormValue() );
-                    
+
                     return comp;
                 }
                 else
                 {
                     comp = compareValues( that );
-                    
+
                     return comp;
                 }
             }
             else
             {
                 comp = compareValues( that );
-                
+
                 return comp;
             }
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AttributeType.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AttributeType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AttributeType.java Mon May 20 23:43:35 2013
@@ -20,8 +20,6 @@
 package org.apache.directory.api.ldap.model.schema;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -131,8 +129,8 @@ import org.slf4j.LoggerFactory;
  */
 public class AttributeType extends AbstractSchemaObject implements Cloneable
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( AttributeType.class );
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
 
     /** The syntax OID associated with this AttributeType */
     protected String syntaxOid;
@@ -445,8 +443,8 @@ public class AttributeType extends Abstr
     {
         return substringOid;
     }
-    
-    
+
+
     /**
      * Tells if the attributeType is a USER attribute or not
      * @return true if this is a USER attributeType
@@ -455,8 +453,8 @@ public class AttributeType extends Abstr
     {
         return usage == UsageEnum.USER_APPLICATIONS;
     }
-    
-    
+
+
     /**
      * Tells if the attributeType is an OPERATIONAL attribute or not
      * @return true if this is an OPERATIONAL attributeType

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitContentRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitContentRule.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitContentRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitContentRule.java Mon May 20 23:43:35 2013
@@ -111,10 +111,11 @@ import org.apache.directory.api.i18n.I18
  * @see DescriptionUtils#getDescription(DitContentRule)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class DitContentRule extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** The list of Auxiliary ObjectClass OIDs entries may belong to */
     private List<String> auxObjectClassOids;
 
@@ -634,8 +635,6 @@ public class DitContentRule extends Abst
      * @see Object#equals(Object)
      */
     @Override
-    @SuppressWarnings("PMD.UnusedLocalVariable")
-    // Remove me when the TODO is fixed
     public boolean equals( Object o )
     {
         if ( !super.equals( o ) )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitStructureRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitStructureRule.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitStructureRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitStructureRule.java Mon May 20 23:43:35 2013
@@ -80,10 +80,11 @@ import org.apache.directory.api.util.exc
  * @see DescriptionUtils#getDescription(DitStructureRule)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class DitStructureRule extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** The rule ID. A DSR does not have an OID */
     private int ruleId;
 
@@ -257,8 +258,6 @@ public class DitStructureRule extends Ab
      * {@inheritDoc}
      */
     @Override
-    @SuppressWarnings("PMD.UnusedLocalVariable")
-    // Remove me when the TODO is fixed 
     public boolean equals( Object o )
     {
         if ( !super.equals( o ) )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LdapSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LdapSyntax.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LdapSyntax.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LdapSyntax.java Mon May 20 23:43:35 2013
@@ -68,13 +68,14 @@ import org.apache.directory.api.ldap.mod
  * @see DescriptionUtils#getDescription(Syntax)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class LdapSyntax extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** the human readable flag */
     protected boolean isHumanReadable = false;
-    
+
     /** A flag set to true if the Syntax has a X-NOT-HUMAN-READABLE extension */
     private boolean hasHumanReadableFlag = false;
 
@@ -147,7 +148,7 @@ public class LdapSyntax extends Abstract
             {
                 String value = values.get( 0 );
                 hasHumanReadableFlag = true;
-                
+
                 if ( value.equalsIgnoreCase( "FALSE" ) )
                 {
                     isHumanReadable = true;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LoadableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LoadableSchemaObject.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LoadableSchemaObject.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LoadableSchemaObject.java Mon May 20 23:43:35 2013
@@ -30,8 +30,6 @@ import org.apache.directory.api.util.Str
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public abstract class LoadableSchemaObject extends AbstractSchemaObject
 {
     /** The serial version UID */

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRule.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRule.java Mon May 20 23:43:35 2013
@@ -20,8 +20,6 @@
 package org.apache.directory.api.ldap.model.schema;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -74,12 +72,10 @@ import org.slf4j.LoggerFactory;
  * @see DescriptionUtils#getDescription(MatchingRule)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MatchingRule extends AbstractSchemaObject
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( MatchingRule.class );
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
 
     /** The associated Comparator */
     protected LdapComparator<? super Object> ldapComparator;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java Mon May 20 23:43:35 2013
@@ -81,10 +81,11 @@ import org.apache.directory.api.i18n.I18
  *      [SYNTAXES]</a>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MatchingRuleUse extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** The list of attributes types OID the matching rule applies to */
     private List<String> applicableAttributeOids;
 
@@ -246,8 +247,6 @@ public class MatchingRuleUse extends Abs
      * @see Object#equals(Object)
      */
     @Override
-    @SuppressWarnings("PMD.UnusedLocalVariable")
-    // Remove me when the TODO is fixed
     public boolean equals( Object o )
     {
         if ( !super.equals( o ) )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java Mon May 20 23:43:35 2013
@@ -21,8 +21,6 @@ package org.apache.directory.api.ldap.mo
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -132,8 +130,8 @@ import org.slf4j.LoggerFactory;
  */
 public class MutableAttributeType extends AttributeType
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( MutableAttributeType.class );
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
 
 
     /**

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java Mon May 20 23:43:35 2013
@@ -21,8 +21,6 @@ package org.apache.directory.api.ldap.mo
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -75,12 +73,11 @@ import org.slf4j.LoggerFactory;
  * @see DescriptionUtils#getDescription(MutableMatchingRule)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MutableMatchingRule extends MatchingRule
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( MutableMatchingRule.class );
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
 
     /**
      * Creates a new instance of MatchingRule.

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java Mon May 20 23:43:35 2013
@@ -68,10 +68,12 @@ import org.apache.directory.api.i18n.I18
  * @see DescriptionUtils#getDescription(MutableObjectClass)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MutableObjectClass extends ObjectClass
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * Creates a new instance of MatchingRuleUseDescription
      * @param oid the OID for this objectClass

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java Mon May 20 23:43:35 2013
@@ -92,10 +92,11 @@ import org.apache.directory.api.ldap.mod
  * @see DescriptionUtils#getDescription(NameForm)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class NameForm extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** The structural object class OID this rule applies to */
     private String structuralObjectClassOid;
 
@@ -475,8 +476,6 @@ public class NameForm extends AbstractSc
      * @see Object#equals(Object)
      */
     @Override
-    @SuppressWarnings("PMD.UnusedLocalVariable")
-    // Remove me when the TODO is fixed
     public boolean equals( Object o )
     {
         if ( !super.equals( o ) )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java Mon May 20 23:43:35 2013
@@ -29,11 +29,12 @@ import org.apache.directory.api.ldap.mod
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings(
-    { "PMD.OverrideBothEqualsAndHashcode", "serial" })
 public abstract class Normalizer extends LoadableSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * The Normalizer base constructor. We use it's MR OID to
      * initialize the SchemaObject instance

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java Mon May 20 23:43:35 2013
@@ -67,10 +67,11 @@ import java.util.List;
  * @see DescriptionUtils#getDescription(ObjectClass)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class ObjectClass extends AbstractSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
     /** The ObjectClass type : ABSTRACT, AUXILIARY or STRUCTURAL */
     protected ObjectClassTypeEnum objectClassType = ObjectClassTypeEnum.STRUCTURAL;
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java Mon May 20 23:43:35 2013
@@ -974,8 +974,6 @@ public final class SchemaUtils
     /**
      * NOT FULLY IMPLEMENTED!
      */
-    @SuppressWarnings("PMD.UnusedLocalVariable")
-    // Remove me when the TODO is fixed
     public static StringBuffer render( DitStructureRule dsr )
     {
         StringBuffer buf = new StringBuffer();

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SyntaxChecker.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SyntaxChecker.java Mon May 20 23:43:35 2013
@@ -32,11 +32,12 @@ import org.apache.directory.api.ldap.mod
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings(
-    { "PMD.OverrideBothEqualsAndHashcode", "serial" })
 public abstract class SyntaxChecker extends LoadableSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * The SyntaxChecker base constructor
      * @param oid The associated OID

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java Mon May 20 23:43:35 2013
@@ -32,6 +32,10 @@ import org.apache.directory.api.ldap.mod
  */
 public class LdapComparatorDescription extends LoadableSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * A constructor for a LdapComparatorDescription.
      * @param oid The associated OID

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java Mon May 20 23:43:35 2013
@@ -32,6 +32,10 @@ import org.apache.directory.api.ldap.mod
  */
 public class NormalizerDescription extends LoadableSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * Default constructor for a NormalizerDecription
      * @param oid The SyntaxChecker OID

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java Mon May 20 23:43:35 2013
@@ -32,6 +32,10 @@ import org.apache.directory.api.ldap.mod
  */
 public class SyntaxCheckerDescription extends LoadableSchemaObject
 {
+    /** The mandatory serialVersionUID */
+    public static final long serialVersionUID = 1L;
+
+
     /**
      * Default constructor for a SyntaxCheckerDecription
      * @param oid The SyntaxChecker OID

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java Mon May 20 23:43:35 2013
@@ -138,7 +138,7 @@ public abstract class DefaultSchemaObjec
      */
     public Iterator<T> iterator()
     {
-        return ( Iterator<T> ) oidRegistry.iterator();
+        return oidRegistry.iterator();
     }
 
 
@@ -359,8 +359,7 @@ public abstract class DefaultSchemaObjec
      * {@inheritDoc}
      */
     // This will suppress PMD.EmptyCatchBlock warnings in this method
-    @SuppressWarnings(
-        { "PMD.EmptyCatchBlock", "unchecked" })
+    @SuppressWarnings("unchecked")
     public SchemaObjectRegistry<T> copy( SchemaObjectRegistry<T> original )
     {
         // Fill the byName and OidRegistry maps, the type has already be copied

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java Mon May 20 23:43:35 2013
@@ -284,8 +284,6 @@ public class Registries implements Schem
      * @param name The name we are looking at
      * @return The associated OID
      */
-    // This will suppress PMD.EmptyCatchBlock warnings in this method
-    @SuppressWarnings("PMD.EmptyCatchBlock")
     public String getOid( String name )
     {
         // we have many possible Registries to look at.
@@ -600,8 +598,6 @@ public class Registries implements Schem
     /**
      * Build the DitContentRule references
      */
-    // Remove me when TODO is implemented
-    @SuppressWarnings("PMD.UnusedFormalParameter")
     private void buildDitContentRuleReferences( List<Throwable> errors )
     {
         for ( @SuppressWarnings("unused")
@@ -615,8 +611,6 @@ public class Registries implements Schem
     /**
      * Build the DitStructureRule references
      */
-    // Remove me when TODO is implemented
-    @SuppressWarnings("PMD.UnusedFormalParameter")
     private void buildDitStructureRuleReferences( List<Throwable> errors )
     {
         for ( @SuppressWarnings("unused")
@@ -767,8 +761,6 @@ public class Registries implements Schem
     /**
      * Build the NameForm references
      */
-    // Remove me when TODO is implemented
-    @SuppressWarnings("PMD.UnusedFormalParameter")
     private void buildNameFormReferences( List<Throwable> errors )
     {
         for ( @SuppressWarnings("unused")
@@ -1218,8 +1210,6 @@ public class Registries implements Schem
     }
 
 
-    // This will suppress PMD.EmptyCatchBlock warnings in this method
-    @SuppressWarnings("PMD.EmptyCatchBlock")
     private void resolveRecursive( ObjectClass objectClass, Set<String> processed, List<Throwable> errors )
     {
         // Process the Superiors, if any
@@ -1498,8 +1488,6 @@ public class Registries implements Schem
     /**
      * Register the given SchemaObject into the associated Registry
      */
-    // Remove SuppressWarnings when TODO is fixed
-    @SuppressWarnings("PMD.EmptyIfStmt")
     private void register( List<Throwable> errors, SchemaObject schemaObject ) throws LdapException
     {
         LOG.debug( "Registering {}:{}", schemaObject.getObjectType(), schemaObject.getOid() );
@@ -1717,9 +1705,6 @@ public class Registries implements Schem
      * @param schemaObject The SchemaObject we want to deregister
      * @throws LdapException If the removal failed
      */
-    // Remove me when TODO is implemented
-    @SuppressWarnings(
-        { "PMD.UnusedFormalParameter", "PMD.EmptyIfStmt" })
     private SchemaObject unregister( List<Throwable> errors, SchemaObject schemaObject ) throws LdapException
     {
         LOG.debug( "Unregistering {}:{}", schemaObject.getObjectType(), schemaObject.getOid() );
@@ -2500,7 +2485,6 @@ public class Registries implements Schem
      * - second restore the relation between them
      */
     // False positive
-    @SuppressWarnings("PMD.EmptyCatchBlock")
     public Registries clone() throws CloneNotSupportedException
     {
         // First clone the structure

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitContentRuleHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitContentRuleHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitContentRuleHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitContentRuleHelper.java Mon May 20 23:43:35 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
+
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -26,8 +27,7 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.api.ldap.model.schema.registries.ObjectClassRegistry;
 import org.apache.directory.api.ldap.model.schema.registries.Registries;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 
 /**
  * An helper class used to store all the methods associated with an DitContentRule
@@ -37,9 +37,6 @@ import org.slf4j.LoggerFactory;
  */
 public class DitContentRuleHelper
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( DitContentRuleHelper.class );
-
     /**
      * Inject the DitContentRule into the registries, updating the references to
      * other SchemaObject
@@ -49,7 +46,8 @@ public class DitContentRuleHelper
      * @param registries The Registries
      * @exception If the addition failed
      */
-    public static void addToRegistries( DitContentRule ditContentRule, List<Throwable> errors,  Registries registries ) throws LdapException
+    public static void addToRegistries( DitContentRule ditContentRule, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {
@@ -58,41 +56,41 @@ public class DitContentRuleHelper
                 ditContentRule.unlock();
                 AttributeTypeRegistry atRegistry = registries.getAttributeTypeRegistry();
                 ObjectClassRegistry ocRegistry = registries.getObjectClassRegistry();
-    
+
                 if ( ditContentRule.getMayAttributeTypeOids() != null )
                 {
                     ditContentRule.getMayAttributeTypes().clear();
-    
+
                     for ( String oid : ditContentRule.getMayAttributeTypeOids() )
                     {
                         ditContentRule.getMayAttributeTypes().add( atRegistry.lookup( oid ) );
                     }
                 }
-    
+
                 if ( ditContentRule.getMustAttributeTypeOids() != null )
                 {
                     ditContentRule.getMustAttributeTypes().clear();
-    
+
                     for ( String oid : ditContentRule.getMustAttributeTypeOids() )
                     {
                         ditContentRule.getMustAttributeTypes().add( atRegistry.lookup( oid ) );
                     }
                 }
-    
+
                 if ( ditContentRule.getNotAttributeTypeOids() != null )
                 {
                     ditContentRule.getNotAttributeTypes().clear();
-    
+
                     for ( String oid : ditContentRule.getNotAttributeTypeOids() )
                     {
                         ditContentRule.getNotAttributeTypes().add( atRegistry.lookup( oid ) );
                     }
                 }
-    
+
                 if ( ditContentRule.getAuxObjectClassOids() != null )
                 {
                     ditContentRule.getAuxObjectClasses().clear();
-    
+
                     for ( String oid : ditContentRule.getAuxObjectClassOids() )
                     {
                         ditContentRule.getAuxObjectClasses().add( ocRegistry.lookup( oid ) );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java Mon May 20 23:43:35 2013
@@ -19,8 +19,6 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An helper class used to store all the methods associated with an DitStructureRule
@@ -30,6 +28,4 @@ import org.slf4j.LoggerFactory;
  */
 public class DitStructureRuleHelper
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( DitStructureRuleHelper.class );
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java Mon May 20 23:43:35 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
+
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -26,8 +27,7 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.api.ldap.model.schema.registries.Registries;
 import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 
 /**
  * An helper class used to store all the methods associated with an LdapSyntax
@@ -37,9 +37,6 @@ import org.slf4j.LoggerFactory;
  */
 public class LdapSyntaxHelper
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( LdapSyntaxHelper.class );
-
     /**
      * Inject the LdapSyntax into the registries, updating the references to
      * other SchemaObject
@@ -49,18 +46,19 @@ public class LdapSyntaxHelper
      * @param registries The Registries
      * @exception If the addition failed
      */
-    public static void addToRegistries( LdapSyntax ldapSyntax, List<Throwable> errors,  Registries registries ) throws LdapException
+    public static void addToRegistries( LdapSyntax ldapSyntax, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {
             try
             {
                 ldapSyntax.unlock();
-    
+
                 if ( registries != null )
                 {
                     SyntaxChecker syntaxChecker = null;
-                    
+
                     try
                     {
                         // Gets the associated SyntaxChecker
@@ -101,7 +99,8 @@ public class LdapSyntaxHelper
      * @param registries The Registries
      * @exception If the LdapSyntax is not valid
      */
-    public static void removeFromRegistries( LdapSyntax ldapSyntax, List<Throwable> errors, Registries registries ) throws LdapException
+    public static void removeFromRegistries( LdapSyntax ldapSyntax, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java Mon May 20 23:43:35 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
+
 import java.util.List;
 
 import org.apache.directory.api.i18n.I18n;
@@ -36,6 +37,7 @@ import org.apache.directory.api.ldap.mod
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * An helper class used to store all the methods associated with an MatchingRule
  * in relation with the Registries and SchemaManager.
@@ -47,6 +49,7 @@ public class MatchingRuleHelper
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleHelper.class );
 
+
     /**
      * Inject the MatchingRule into the Registries, updating the references to
      * other SchemaObject
@@ -56,20 +59,22 @@ public class MatchingRuleHelper
      * @param registries The Registries
      * @exception If the addition failed
      */
-    public static void addToRegistries( MutableMatchingRule matchingRule, List<Throwable> errors,  Registries registries ) throws LdapException
+    @SuppressWarnings("rawtypes")
+    public static void addToRegistries( MutableMatchingRule matchingRule, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {
             try
             {
                 matchingRule.unlock();
-                
+
                 if ( registries != null )
                 {
                     LdapComparator<?> ldapComparator = null;
                     Normalizer normalizer = null;
                     LdapSyntax ldapSyntax = null;
-                    
+
                     try
                     {
                         // Gets the associated Comparator
@@ -155,7 +160,8 @@ public class MatchingRuleHelper
      * @param registries The Registries
      * @exception If the MatchingRule is not valid
      */
-    public static void removeFromRegistries( MatchingRule matchingRule, List<Throwable> errors, Registries registries ) throws LdapException
+    public static void removeFromRegistries( MatchingRule matchingRule, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleUseHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleUseHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleUseHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleUseHelper.java Mon May 20 23:43:35 2013
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
+
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.api.ldap.model.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.api.ldap.model.schema.registries.Registries;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 
 /**
  * An helper class used to store all the methods associated with a MatchingRuleUse
@@ -36,9 +36,6 @@ import org.slf4j.LoggerFactory;
  */
 public class MatchingRuleUseHelper
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleUseHelper.class );
-
     /**
      * Inject the MatchingRuleUse into the registries, updating the references to
      * other SchemaObject
@@ -48,16 +45,17 @@ public class MatchingRuleUseHelper
      * @param registries The Registries
      * @exception If the addition failed
      */
-    public static void addToRegistries( MatchingRuleUse matchingRuleUse, List<Throwable> errors,  Registries registries ) throws LdapException
+    public static void addToRegistries( MatchingRuleUse matchingRuleUse, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {
             try
             {
                 matchingRuleUse.unlock();
-    
+
                 AttributeTypeRegistry atRegistry = registries.getAttributeTypeRegistry();
-                
+
                 matchingRuleUse.getApplicableAttributes().clear();
 
                 for ( String oid : matchingRuleUse.getApplicableAttributeOids() )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/NameFormHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/NameFormHelper.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/NameFormHelper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/NameFormHelper.java Mon May 20 23:43:35 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.api.ldap.model.schema.registries.helper;
 
+
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -26,8 +27,7 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.schema.ObjectClass;
 import org.apache.directory.api.ldap.model.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.api.ldap.model.schema.registries.Registries;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 
 /**
  * An helper class used to store all the methods associated with an NameForm
@@ -37,9 +37,6 @@ import org.slf4j.LoggerFactory;
  */
 public class NameFormHelper
 {
-    /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( NameFormHelper.class );
-
     /**
      * Inject the NameForm into the registries, updating the references to
      * other SchemaObject
@@ -49,28 +46,30 @@ public class NameFormHelper
      * @param registries The Registries
      * @exception If the addition failed
      */
-    public static void addToRegistries( NameForm nameForm, List<Throwable> errors, Registries registries ) throws LdapException
+    public static void addToRegistries( NameForm nameForm, List<Throwable> errors, Registries registries )
+        throws LdapException
     {
         if ( registries != null )
         {
             try
             {
                 nameForm.unlock();
-    
+
                 AttributeTypeRegistry atRegistry = registries.getAttributeTypeRegistry();
 
-                ObjectClass structuralObjectClass = registries.getObjectClassRegistry().lookup( nameForm.getStructuralObjectClassOid() );
+                ObjectClass structuralObjectClass = registries.getObjectClassRegistry().lookup(
+                    nameForm.getStructuralObjectClassOid() );
                 nameForm.setStructuralObjectClass( structuralObjectClass );
-                
+
                 nameForm.getMayAttributeTypes().clear();
-                
+
                 for ( String oid : nameForm.getMayAttributeTypeOids() )
                 {
                     nameForm.getMayAttributeTypes().add( atRegistry.lookup( oid ) );
                 }
 
                 nameForm.getMustAttributeTypes().clear();
-                
+
                 for ( String oid : nameForm.getMustAttributeTypeOids() )
                 {
                     nameForm.getMustAttributeTypes().add( atRegistry.lookup( oid ) );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java Mon May 20 23:43:35 2013
@@ -335,11 +335,8 @@ public class LdapUrl
      *         apply to the byte buffer TODO check that the topLabel is valid
      *         (it must start with an alpha)
      */
-    @SuppressWarnings("PMD.CollapsibleIfStatements")
-    // Used because of comments
     private int parseHost( char[] chars, int pos )
     {
-
         int start = pos;
         boolean hadDot = false;
         boolean hadMinus = false;
@@ -364,7 +361,6 @@ public class LdapUrl
 
             if ( Chars.isCharASCII( chars, pos, '.' ) )
             {
-
                 if ( ( hadMinus ) || ( hadDot ) )
                 {
 
@@ -391,10 +387,8 @@ public class LdapUrl
             }
             else
             {
-
                 if ( hadDot && Chars.isCharASCII( chars, pos, '-' ) )
                 {
-
                     // We can't have a '-' just after a '.'
                     return -1;
                 }
@@ -404,7 +398,6 @@ public class LdapUrl
 
             if ( Chars.isDigit( chars, pos ) )
             {
-
                 if ( isHostNumber && ( nbDots < 4 ) )
                 {
                     ipElem[nbDots] = ( ipElem[nbDots] * 10 ) + ( chars[pos] - '0' );
@@ -433,7 +426,6 @@ public class LdapUrl
 
         if ( start == pos )
         {
-
             // An empty host is valid
             return pos;
         }
@@ -441,7 +433,6 @@ public class LdapUrl
         // Checks the hostNumber
         if ( isHostNumber )
         {
-
             // As this is a host number, we must have 3 dots.
             if ( nbDots != 3 )
             {

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java Mon May 20 23:43:35 2013
@@ -34,9 +34,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.StringValue;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
@@ -97,6 +94,9 @@ public class BinaryValueAttributeTypeTes
         mr.setLdapComparator( new ByteArrayComparator( "1.1.1" ) );
         mr.setNormalizer( new Normalizer( "1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isHumanReadable() )

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java Mon May 20 23:43:35 2013
@@ -33,8 +33,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.LdapSyntax;
@@ -92,6 +90,9 @@ public class BinaryValueTest
         mr.setLdapComparator( new ByteArrayComparator( "1.1.1" ) );
         mr.setNormalizer( new Normalizer( "1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isHumanReadable() )
@@ -126,30 +127,11 @@ public class BinaryValueTest
         at.setSyntax( s );
     }
 
-    /**
-     * A binary normalizer which set the normalized value to a empty byte array
-     */
-    private static final Normalizer BINARY_NORMALIZER_EMPTY = new Normalizer( "1.1.1" )
+    private static final SyntaxChecker BINARY_CHECKER = new SyntaxChecker( "1.1.1" )
     {
-        public Value<?> normalize( Value<?> value ) throws LdapException
-        {
-            if ( !value.isHumanReadable() )
-            {
-                return new BinaryValue( StringConstants.EMPTY_BYTES );
-            }
+        public static final long serialVersionUID = 1L;
 
-            throw new IllegalStateException( "expected byte[] to normalize" );
-        }
-
-
-        public String normalize( String value ) throws LdapException
-        {
-            throw new IllegalStateException( "expected byte[] to normalize" );
-        }
-    };
 
-    private static final SyntaxChecker BINARY_CHECKER = new SyntaxChecker( "1.1.1" )
-    {
         public boolean isValidSyntax( Object value )
         {
             if ( value == null )

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java Mon May 20 23:43:35 2013
@@ -21,9 +21,6 @@ package org.apache.directory.api.ldap.mo
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.StringValue;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.LdapComparator;
@@ -71,6 +68,9 @@ public class EntryUtils
      */
     static class MR extends MutableMatchingRule
     {
+        public static final long serialVersionUID = 1L;
+
+
         protected MR( String oid )
         {
             super( oid );
@@ -81,7 +81,6 @@ public class EntryUtils
     /**
      * A local Syntax class used for the tests
      */
-    @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
     public static LdapSyntax syntaxFactory( String oid, boolean humanReadable )
     {
         LdapSyntax ldapSyntax = new LdapSyntax( oid );
@@ -93,6 +92,9 @@ public class EntryUtils
 
     static class S extends LdapSyntax
     {
+        public static final long serialVersionUID = 1L;
+
+
         public S( String oid, boolean humanReadable )
         {
             super( oid, "", humanReadable );
@@ -107,6 +109,9 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public boolean isValidSyntax( Object value )
             {
                 if ( value == null )
@@ -137,6 +142,9 @@ public class EntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public int compare( String o1, String o2 )
             {
                 return ( o1 == null ?
@@ -147,6 +155,9 @@ public class EntryUtils
 
         Normalizer normalizer = new Normalizer( "1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( value.isHumanReadable() )
@@ -181,6 +192,9 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public boolean isValidSyntax( Object value )
             {
                 return ( ( String ) value == null ) || ( ( ( String ) value ).length() < 7 );
@@ -192,6 +206,9 @@ public class EntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public int compare( String o1, String o2 )
             {
                 return ( ( o1 == null ) ?
@@ -216,6 +233,9 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.2.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public boolean isValidSyntax( Object value )
             {
                 return ( value == null ) || ( ( ( byte[] ) value ).length < 5 );
@@ -229,6 +249,9 @@ public class EntryUtils
 
         matchingRule.setNormalizer( new Normalizer( "1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isHumanReadable() )

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java Mon May 20 23:43:35 2013
@@ -38,9 +38,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.StringValue;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
@@ -433,6 +430,9 @@ public class StringValueAttributeTypeTes
     {
         s.setSyntaxChecker( new SyntaxChecker( "1.1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public boolean isValidSyntax( Object value )
             {
                 if ( value instanceof String )
@@ -447,6 +447,9 @@ public class StringValueAttributeTypeTes
         mr.setSyntax( s );
         mr.setLdapComparator( new LdapComparator<String>( mr.getOid() )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public int compare( String o1, String o2 )
             {
                 if ( o1 == null )

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java Mon May 20 23:43:35 2013
@@ -28,9 +28,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.StringValue;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.Normalizer;
@@ -96,6 +93,9 @@ public class ValueSerializationTest
         mrb.setLdapComparator( new ByteArrayComparator( "1.1.1" ) );
         mrb.setNormalizer( new Normalizer( "1.1.1" )
         {
+            public static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isHumanReadable() )

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractMessageTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractMessageTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractMessageTest.java Mon May 20 23:43:35 2013
@@ -23,15 +23,12 @@ package org.apache.directory.api.ldap.mo
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
-import org.apache.directory.api.ldap.model.message.AbstractMessage;
-import org.apache.directory.api.ldap.model.message.Control;
-import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Test cases for the AbstractMessage class' methods.
@@ -52,7 +49,6 @@ public class AbstractMessageTest
         AbstractMessage msg;
         msg = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertTrue( msg.equals( msg ) );
     }
@@ -68,11 +64,9 @@ public class AbstractMessageTest
         AbstractMessage msg1;
         msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertTrue( msg0.equals( msg1 ) );
         assertTrue( msg1.equals( msg0 ) );
@@ -89,11 +83,9 @@ public class AbstractMessageTest
         AbstractMessage msg1;
         msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         msg1 = new AbstractMessage( 6, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );
@@ -110,11 +102,9 @@ public class AbstractMessageTest
         AbstractMessage msg1;
         msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         msg1 = new AbstractMessage( 5, MessageTypeEnum.UNBIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );
@@ -132,14 +122,10 @@ public class AbstractMessageTest
 
         msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
 
         msg0.addControl( new Control()
         {
-            private static final long serialVersionUID = 1L;
-
-
             public boolean isCritical()
             {
                 return false;
@@ -159,10 +145,9 @@ public class AbstractMessageTest
 
         msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
+
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );
     }
-
 }

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractResultResponseTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractResultResponseTest.java Mon May 20 23:43:35 2013
@@ -24,13 +24,6 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.message.AbstractResultResponse;
-import org.apache.directory.api.ldap.model.message.Control;
-import org.apache.directory.api.ldap.model.message.LdapResult;
-import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.api.ldap.model.message.Referral;
-import org.apache.directory.api.ldap.model.message.ReferralImpl;
-import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,7 +50,6 @@ public class AbstractResultResponseTest
         AbstractResultResponse msg;
         msg = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertTrue( msg.equals( msg ) );
     }
@@ -71,11 +63,9 @@ public class AbstractResultResponseTest
     {
         AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         LdapResult r0 = msg0.getLdapResult();
         LdapResult r1 = msg1.getLdapResult();
@@ -110,11 +100,9 @@ public class AbstractResultResponseTest
     {
         AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         LdapResult r0 = msg0.getLdapResult();
         LdapResult r1 = msg1.getLdapResult();
@@ -151,11 +139,9 @@ public class AbstractResultResponseTest
         AbstractResultResponse msg1;
         msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         msg1 = new AbstractResultResponse( 6, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );
@@ -172,11 +158,9 @@ public class AbstractResultResponseTest
         AbstractResultResponse msg1;
         msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         msg1 = new AbstractResultResponse( 5, MessageTypeEnum.UNBIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );
@@ -194,14 +178,10 @@ public class AbstractResultResponseTest
 
         msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
 
         msg0.addControl( new Control()
         {
-            private static final long serialVersionUID = 1L;
-
-
             public boolean isCritical()
             {
                 return false;
@@ -221,7 +201,6 @@ public class AbstractResultResponseTest
 
         msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
-            private static final long serialVersionUID = 1L;
         };
         assertFalse( msg0.equals( msg1 ) );
         assertFalse( msg1.equals( msg0 ) );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java Mon May 20 23:43:35 2013
@@ -27,11 +27,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.directory.api.ldap.model.exception.MessageException;
-import org.apache.directory.api.ldap.model.message.Control;
-import org.apache.directory.api.ldap.model.message.ExtendedRequest;
-import org.apache.directory.api.ldap.model.message.ExtendedRequestImpl;
-import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -175,9 +170,6 @@ public class ExtendedRequestImplTest
     {
         ExtendedRequest<ExtendedResponse> req0 = new ExtendedRequest<ExtendedResponse>()
         {
-            private static final long serialVersionUID = 1L;
-
-
             public ExtendedRequest<ExtendedResponse> setRequestName( String oid )
             {
                 return this;

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImplTest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImplTest.java Mon May 20 23:43:35 2013
@@ -28,14 +28,6 @@ import java.util.Map;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.MessageException;
-import org.apache.directory.api.ldap.model.message.Control;
-import org.apache.directory.api.ldap.model.message.ExtendedResponse;
-import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.api.ldap.model.message.LdapResult;
-import org.apache.directory.api.ldap.model.message.LdapResultImpl;
-import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.api.ldap.model.message.ReferralImpl;
-import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -120,9 +112,6 @@ public class ExtendedResponseImplTest
         ExtendedResponseImpl resp0 = createStub();
         ExtendedResponse resp1 = new ExtendedResponse()
         {
-            private static final long serialVersionUID = 5297000474419901408L;
-
-
             public String getResponseName()
             {
                 return "1.1.1.1";

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java Mon May 20 23:43:35 2013
@@ -20,11 +20,11 @@
 package org.apache.directory.api.ldap.model.schema.syntaxes.parser;
 
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 import java.util.ArrayList;

Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java Mon May 20 23:43:35 2013
@@ -31,16 +31,15 @@ import org.osgi.framework.ServiceRegistr
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@SuppressWarnings(
-    { "UnusedDeclaration" })
 public class LdapProtocolCodecActivator implements BundleActivator
 {
     private LdapProtocolCodecFactory factory;
     private ServiceRegistration registration;
 
 
-    @SuppressWarnings(
-        { "UnusedDeclaration" })
+    /**
+     * Create a new instance of a LdapProtocolCodecActivator 
+     */
     public LdapProtocolCodecActivator()
     {
         this.factory = new LdapProtocolCodecFactory();



Mime
View raw message