directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1746258 [5/9] - in /directory/shared/branches/shared-value: asn1/ber/src/main/java/org/apache/directory/api/asn1/actions/ asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/ asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/gr...
Date Tue, 31 May 2016 09:32:13 GMT
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java Tue May 31 09:32:09 2016
@@ -59,6 +59,7 @@ public class IntegerComparator extends L
     /**
      * Implementation of the Compare method
      */
+    @Override
     public int compare( Object v1, Object v2 )
     {
         if ( v1 instanceof String )
@@ -96,7 +97,7 @@ public class IntegerComparator extends L
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {
-            return ( backendValue == null ? -1 : 1 );
+            return backendValue == null ? -1 : 1;
         }
 
         return backendValue.compareTo( assertValue );
@@ -123,7 +124,7 @@ public class IntegerComparator extends L
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {
-            return ( backendValue == null ? -1 : 1 );
+            return backendValue == null ? -1 : 1;
         }
 
         // Both objects must be stored as String for numeric.

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NormalizingComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NormalizingComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NormalizingComparator.java Tue May 31 09:32:09 2016
@@ -41,9 +41,6 @@ public class NormalizingComparator exten
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( NormalizingComparator.class );
 
-    /** the Normalizer to normalize values with before comparing */
-    private Normalizer normalizer;
-
     /** the underlying comparator to use for comparisons */
     private LdapComparator<String> comparator;
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java Tue May 31 09:32:09 2016
@@ -73,7 +73,7 @@ public class NumericStringComparator ext
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {
-            return ( backendValue == null ? -1 : 1 );
+            return backendValue == null ? -1 : 1;
         }
 
         // Both objects must be stored as String for numeric.

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java Tue May 31 09:32:09 2016
@@ -42,6 +42,10 @@ public class ObjectClassTypeComparator<T
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public int compare( T o1, T o2 )
     {
         String s1 = getString( o1 );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java Tue May 31 09:32:09 2016
@@ -52,6 +52,7 @@ public class ObjectIdentifierComparator
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
+    @Override
     public int compare( Object o1, Object o2 )
     {
         LOG.debug( "comparing ObjectIdentifier objects '{}' with '{}'", o1, o2 );
@@ -75,12 +76,6 @@ public class ObjectIdentifierComparator
 
         if ( !( o1 instanceof String && o2 instanceof String ) )
         {
-            // Both objects must be strings...
-            if ( o1.equals( o2 ) )
-            {
-                return 0;
-            }
-
             return -1;
         }
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java Tue May 31 09:32:09 2016
@@ -71,6 +71,7 @@ public class SerializableComparator<E> e
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
     @SuppressWarnings("unchecked")
+    @Override
     public int compare( E o1, E o2 )
     {
         if ( wrapped == null )
@@ -93,6 +94,7 @@ public class SerializableComparator<E> e
      * @param schemaManager the schemaManager to set
      */
     @SuppressWarnings("unchecked")
+    @Override
     public void setSchemaManager( SchemaManager schemaManager )
     {
         if ( wrapped == null )
@@ -106,7 +108,7 @@ public class SerializableComparator<E> e
             {
                 // Not found : get the default comparator
                 wrapped = ( Comparator<E> )
-                    new ComparableComparator<Comparable<E>>( matchingRuleOid );
+                    new ComparableComparator<>( matchingRuleOid );
             }
         }
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java Tue May 31 09:32:09 2016
@@ -68,12 +68,7 @@ public class StringComparator extends Ld
         // -------------------------------------------------------------------
         if ( s1 == null )
         {
-            return ( s2 == null ) ? 0 : -1;
-        }
-
-        if ( s2 == null )
-        {
-            return 1;
+            return -1;
         }
 
         return s1.compareTo( s2 );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java Tue May 31 09:32:09 2016
@@ -100,6 +100,6 @@ public class TelephoneNumberComparator e
         String strippedTelephoneNumber1 = strip( telephoneNumber1 );
         String strippedTelephoneNumber2 = strip( telephoneNumber2 );
 
-        return ( strippedTelephoneNumber1.compareToIgnoreCase( strippedTelephoneNumber2 ) );
+        return strippedTelephoneNumber1.compareToIgnoreCase( strippedTelephoneNumber2 );
     }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java Tue May 31 09:32:09 2016
@@ -41,7 +41,7 @@ public class UniqueMemberComparator exte
     private static final long serialVersionUID = 2L;
 
     /** A reference to the schema manager */
-    private SchemaManager schemaManager;
+    private transient SchemaManager schemaManager;
 
 
     /**
@@ -101,8 +101,8 @@ public class UniqueMemberComparator exte
                 return 1;
             }
 
-            Dn dn1 = null;
-            Dn dn2 = null;
+            Dn dn1;
+            Dn dn2;
 
             // This is an UID if the '#' is immediatly
             // followed by a BitString, except if the '#' is
@@ -159,6 +159,7 @@ public class UniqueMemberComparator exte
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setSchemaManager( SchemaManager schemaManager )
     {
         this.schemaManager = schemaManager;
@@ -167,13 +168,13 @@ public class UniqueMemberComparator exte
 
     public Dn getDn( Object obj ) throws LdapInvalidDnException
     {
-        Dn dn = null;
+        Dn dn;
 
         if ( obj instanceof Dn )
         {
             dn = ( Dn ) obj;
 
-            dn = ( dn.isSchemaAware() ? dn : new Dn( schemaManager, dn ) );
+            dn = dn.isSchemaAware() ? dn : new Dn( schemaManager, dn );
         }
         else if ( obj instanceof String )
         {
@@ -181,7 +182,7 @@ public class UniqueMemberComparator exte
         }
         else
         {
-            throw new IllegalStateException( I18n.err( I18n.ERR_04218, ( obj == null ? null : obj.getClass() ) ) );
+            throw new IllegalStateException( I18n.err( I18n.ERR_04218, obj == null ? null : obj.getClass() ) );
         }
 
         return dn;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public class UuidComparator extends Seri
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
+    @Override
     public int compare( String uuid1, String uuid2 )
     {
         if ( IS_DEBUG )
@@ -68,12 +69,7 @@ public class UuidComparator extends Seri
         // -------------------------------------------------------------------
         if ( uuid1 == null )
         {
-            return ( uuid2 == null ) ? 0 : -1;
-        }
-
-        if ( uuid2 == null )
-        {
-            return 1;
+            return -1;
         }
 
         return uuid1.compareTo( uuid2 );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java Tue May 31 09:32:09 2016
@@ -45,7 +45,7 @@ public class NameOrNumericIdNormalizer e
     private NumericOidSyntaxChecker checker = new NumericOidSyntaxChecker();
 
     /** A reference to the schema manager used to normalize the Name */
-    private SchemaManager schemaManager;
+    private transient SchemaManager schemaManager;
 
     /** A static instance of this normalizer */
     public static final NameOrNumericIdNormalizer INSTANCE = new NameOrNumericIdNormalizer();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java Tue May 31 09:32:09 2016
@@ -41,7 +41,7 @@ import org.apache.directory.api.util.Str
 public class ObjectIdentifierNormalizer extends Normalizer
 {
     /** A reference to the schema manager used to normalize the Name */
-    private SchemaManager schemaManager;
+    private transient SchemaManager schemaManager;
 
     /**
      * Creates a new instance of ObjectIdentifierNormalizer.

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java Tue May 31 09:32:09 2016
@@ -89,6 +89,7 @@ public class OidNormalizer
     /**
      * Return a String representation of this class
      */
+    @Override
     public String toString()
     {
         return "OidNormalizer : { " + attributeTypeOid + ", " + normalizer.toString() + "}";

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java Tue May 31 09:32:09 2016
@@ -106,9 +106,10 @@ public class RegexNormalizer extends Nor
     /**
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append( "RegexNormalizer( " );
 
         for ( int i = 0; i < regexes.length; i++ )

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java Tue May 31 09:32:09 2016
@@ -170,26 +170,22 @@ public abstract class AbstractSchemaPars
         }
         catch ( RecognitionException re )
         {
-            ParseException parseException = wrapRecognitionException( schemaDescription, re );
-            throw parseException;
+            throw wrapRecognitionException( schemaDescription, re );
         }
         catch ( TokenStreamRecognitionException tsre )
         {
             if ( tsre.recog != null )
             {
-                ParseException parseException = wrapRecognitionException( schemaDescription, tsre.recog );
-                throw parseException;
+                throw wrapRecognitionException( schemaDescription, tsre.recog );
             }
             else
             {
-                ParseException parseException = wrapTokenStreamException( schemaDescription, tsre );
-                throw parseException;
+                throw wrapTokenStreamException( schemaDescription, tsre );
             }
         }
         catch ( TokenStreamException tse )
         {
-            ParseException parseException = wrapTokenStreamException( schemaDescription, tse );
-            throw parseException;
+            throw wrapTokenStreamException( schemaDescription, tse );
         }
     }
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java Tue May 31 09:32:09 2016
@@ -31,6 +31,10 @@ public class ConsoleParserMonitor implem
     public static final String TRACE_KEY = "maven.eve.schema.parser.trace";
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void matchedProduction( String prod )
     {
         if ( System.getProperties().containsKey( TRACE_KEY ) )
@@ -40,6 +44,10 @@ public class ConsoleParserMonitor implem
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void startedParse( String s )
     {
         if ( System.getProperties().containsKey( TRACE_KEY ) )
@@ -49,6 +57,10 @@ public class ConsoleParserMonitor implem
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void finishedParse( String s )
     {
         if ( System.getProperties().containsKey( TRACE_KEY ) )

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java Tue May 31 09:32:09 2016
@@ -49,6 +49,7 @@ public class LdapComparatorDescription e
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return "Comparator description : " + getDescription();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java Tue May 31 09:32:09 2016
@@ -74,5 +74,4 @@ public class LdapSyntaxDescriptionSchema
     {
         return parser.ldapSyntaxDescription();
     }
-
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java Tue May 31 09:32:09 2016
@@ -49,6 +49,7 @@ public class NormalizerDescription exten
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return "SyntaxChecker description : " + getDescription();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java Tue May 31 09:32:09 2016
@@ -39,6 +39,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.SchemaObject;
 import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
+import org.apache.directory.api.util.Strings;
 
 import antlr.RecognitionException;
 import antlr.TokenStreamException;
@@ -137,9 +138,9 @@ public class OpenLdapSchemaParser extend
      */
     private void afterParse() throws ParseException
     {
-        objectClasses = new ArrayList<ObjectClass>();
-        attributeTypes = new ArrayList<MutableAttributeType>();
-        objectIdentifierMacros = new HashMap<String, OpenLdapObjectIdentifierMacro>();
+        objectClasses = new ArrayList<>();
+        attributeTypes = new ArrayList<>();
+        objectIdentifierMacros = new HashMap<>();
 
         // split parsed schema descriptions
         for ( Object obj : schemaDescriptions )
@@ -253,9 +254,10 @@ public class OpenLdapSchemaParser extend
      * @return the schema object
      * @throws ParseException If the schemaObject can't be parsed
      */
+    @Override
     public SchemaObject parse( String schemaObject ) throws ParseException
     {
-        if ( schemaObject == null || schemaObject.trim().equals( "" ) )
+        if ( ( schemaObject == null ) || Strings.isEmpty( schemaObject.trim() ) )
         {
             throw new ParseException( I18n.err( I18n.ERR_04258 ), 0 );
         }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java Tue May 31 09:32:09 2016
@@ -30,6 +30,7 @@ public class ParserMonitorAdapter implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public void matchedProduction( String prod )
     {
     }
@@ -38,6 +39,7 @@ public class ParserMonitorAdapter implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public void startedParse( String s )
     {
     }
@@ -46,6 +48,7 @@ public class ParserMonitorAdapter implem
     /**
      * {@inheritDoc}
      */
+    @Override
     public void finishedParse( String s )
     {
     }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java Tue May 31 09:32:09 2016
@@ -49,6 +49,7 @@ public class SyntaxCheckerDescription ex
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return "SyntaxChecker description : " + getDescription();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java Tue May 31 09:32:09 2016
@@ -60,9 +60,10 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public final Collection<Schema> getAllEnabled()
     {
-        Collection<Schema> enabledSchemas = new ArrayList<Schema>();
+        Collection<Schema> enabledSchemas = new ArrayList<>();
 
         for ( Schema schema : schemaMap.values() )
         {
@@ -79,6 +80,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public final Collection<Schema> getAllSchemas()
     {
         return schemaMap.values();
@@ -88,6 +90,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public Schema getSchema( String schemaName )
     {
         return schemaMap.get( Strings.toLowerCaseAscii( schemaName ) );
@@ -97,6 +100,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addSchema( Schema schema )
     {
         schemaMap.put( schema.getSchemaName(), schema );
@@ -106,6 +110,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public void removeSchema( Schema schema )
     {
         schemaMap.remove( Strings.toLowerCaseAscii( schema.getSchemaName() ) );
@@ -170,12 +175,12 @@ public abstract class AbstractSchemaLoad
         {
             String value = entry.get( MetaSchemaConstants.M_DISABLED_AT ).getString();
             value = Strings.upperCase( value );
-            isDisabled = value.equals( "TRUE" );
+            isDisabled = "TRUE".equals( value );
         }
 
         if ( entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT ) != null )
         {
-            Set<String> depsSet = new HashSet<String>();
+            Set<String> depsSet = new HashSet<>();
             Attribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
 
             for ( Value value : depsAttr )
@@ -207,11 +212,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadAttributeTypes( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadAttributeTypes( buildSchemaArray( schemaNames ) );
@@ -221,11 +227,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadComparators( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadComparators( buildSchemaArray( schemaNames ) );
@@ -235,11 +242,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadDitContentRules( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadDitContentRules( buildSchemaArray( schemaNames ) );
@@ -249,11 +257,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadDitStructureRules( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadDitStructureRules( buildSchemaArray( schemaNames ) );
@@ -263,11 +272,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadMatchingRules( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadMatchingRules( buildSchemaArray( schemaNames ) );
@@ -277,11 +287,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadMatchingRuleUses( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadMatchingRuleUses( buildSchemaArray( schemaNames ) );
@@ -291,11 +302,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadNameForms( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadNameForms( buildSchemaArray( schemaNames ) );
@@ -305,11 +317,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadNormalizers( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadNormalizers( buildSchemaArray( schemaNames ) );
@@ -319,11 +332,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadObjectClasses( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadObjectClasses( buildSchemaArray( schemaNames ) );
@@ -333,11 +347,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadSyntaxes( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadSyntaxes( buildSchemaArray( schemaNames ) );
@@ -347,11 +362,12 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Entry> loadSyntaxCheckers( String... schemaNames ) throws LdapException, IOException
     {
         if ( schemaNames == null )
         {
-            return new ArrayList<Entry>();
+            return new ArrayList<>();
         }
 
         return loadSyntaxCheckers( buildSchemaArray( schemaNames ) );
@@ -361,6 +377,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isRelaxed()
     {
         return relaxed == SchemaManager.RELAXED;
@@ -370,6 +387,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isStrict()
     {
         return relaxed == SchemaManager.STRICT;
@@ -379,6 +397,7 @@ public abstract class AbstractSchemaLoad
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setRelaxed( boolean relaxed )
     {
         this.relaxed = relaxed;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AttributeTypeRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AttributeTypeRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AttributeTypeRegistry.java Tue May 31 09:32:09 2016
@@ -130,5 +130,6 @@ public interface AttributeTypeRegistry e
     /**
      * Copy the AttributeTypeRegistry
      */
+    @Override
     AttributeTypeRegistry copy();
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ComparatorRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ComparatorRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ComparatorRegistry.java Tue May 31 09:32:09 2016
@@ -39,6 +39,7 @@ public interface ComparatorRegistry exte
      * @throws LdapException if the LdapComparator is already registered or
      * the registration operation is not supported
      */
+    @Override
     void register( LdapComparator<?> comparator ) throws LdapException;
 
 
@@ -49,6 +50,7 @@ public interface ComparatorRegistry exte
      * @param numericOid the numeric identifier
      * @throws LdapException if the numeric identifier is invalid
      */
+    @Override
     LdapComparator<?> unregister( String numericOid ) throws LdapException;
 
 
@@ -58,11 +60,13 @@ public interface ComparatorRegistry exte
      * 
      * @param schemaName the name of the schema whose LdapComparators will be removed from
      */
+    @Override
     void unregisterSchemaElements( String schemaName ) throws LdapException;
 
 
     /**
      * Copy the ComparatorRegistry
      */
+    @Override
     ComparatorRegistry copy();
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java Tue May 31 09:32:09 2016
@@ -63,14 +63,15 @@ public class DefaultAttributeTypeRegistr
     public DefaultAttributeTypeRegistry()
     {
         super( SchemaObjectType.ATTRIBUTE_TYPE, new OidRegistry<AttributeType>() );
-        oidNormalizerMap = new HashMap<String, OidNormalizer>();
-        oidToDescendantSet = new HashMap<String, Set<AttributeType>>();
+        oidNormalizerMap = new HashMap<>();
+        oidToDescendantSet = new HashMap<>();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public Map<String, OidNormalizer> getNormalizerMapping()
     {
         return Collections.unmodifiableMap( oidNormalizerMap );
@@ -80,6 +81,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasDescendants( String ancestorId ) throws LdapException
     {
         try
@@ -98,6 +100,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasDescendants( AttributeType ancestor ) throws LdapException
     {
         String oid = ancestor.getOid();
@@ -110,6 +113,7 @@ public class DefaultAttributeTypeRegistr
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Iterator<AttributeType> descendants( String ancestorId ) throws LdapException
     {
         try
@@ -135,6 +139,7 @@ public class DefaultAttributeTypeRegistr
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Iterator<AttributeType> descendants( AttributeType ancestor ) throws LdapException
     {
         String oid = ancestor.getOid();
@@ -152,6 +157,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
@@ -166,7 +172,7 @@ public class DefaultAttributeTypeRegistr
         // Initialize the descendant Set to store the descendants for the attributeType
         if ( descendants == null )
         {
-            descendants = new HashSet<AttributeType>( 1 );
+            descendants = new HashSet<>( 1 );
             oidToDescendantSet.put( ancestor.getOid(), descendants );
         }
 
@@ -178,6 +184,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
@@ -193,7 +200,7 @@ public class DefaultAttributeTypeRegistr
         {
             descendants.remove( attributeType );
 
-            if ( descendants.size() == 0 )
+            if ( descendants.isEmpty() )
             {
                 oidToDescendantSet.remove( ancestor.getOid() );
             }
@@ -204,6 +211,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType unregister( String numericOid ) throws LdapException
     {
         try
@@ -232,6 +240,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addMappingFor( AttributeType attributeType ) throws LdapException
     {
         MatchingRule equality = attributeType.getEquality();
@@ -262,6 +271,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * Remove the AttributeType normalizer from the OidNormalizer map 
      */
+    @Override
     public void removeMappingFor( AttributeType attributeType ) throws LdapException
     {
         if ( attributeType == null )
@@ -282,6 +292,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType lookup( String oid ) throws LdapException
     {
         try
@@ -298,6 +309,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultAttributeTypeRegistry copy()
     {
         DefaultAttributeTypeRegistry copy = new DefaultAttributeTypeRegistry();
@@ -312,6 +324,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         // First clear the shared elements

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultComparatorRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultComparatorRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultComparatorRegistry.java Tue May 31 09:32:09 2016
@@ -57,6 +57,7 @@ public class DefaultComparatorRegistry e
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         if ( schemaName == null )
@@ -85,6 +86,7 @@ public class DefaultComparatorRegistry e
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultComparatorRegistry copy()
     {
         DefaultComparatorRegistry copy = new DefaultComparatorRegistry();
@@ -99,6 +101,7 @@ public class DefaultComparatorRegistry e
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java Tue May 31 09:32:09 2016
@@ -44,6 +44,7 @@ public class DefaultDitContentRuleRegist
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultDitContentRuleRegistry copy()
     {
         DefaultDitContentRuleRegistry copy = new DefaultDitContentRuleRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java Tue May 31 09:32:09 2016
@@ -57,13 +57,14 @@ public class DefaultDitStructureRuleRegi
     public DefaultDitStructureRuleRegistry()
     {
         super( SchemaObjectType.DIT_STRUCTURE_RULE, new OidRegistry<DitStructureRule>() );
-        byRuleId = new HashMap<Integer, DitStructureRule>();
+        byRuleId = new HashMap<>();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean contains( int ruleId )
     {
         return byRuleId.containsKey( ruleId );
@@ -73,6 +74,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<DitStructureRule> iterator()
     {
         return byRuleId.values().iterator();
@@ -82,6 +84,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<Integer> ruleIdIterator()
     {
         return byRuleId.keySet().iterator();
@@ -91,6 +94,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSchemaName( int ruleId ) throws LdapException
     {
         DitStructureRule ditStructureRule = byRuleId.get( ruleId );
@@ -109,6 +113,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public void register( DitStructureRule ditStructureRule ) throws LdapException
     {
         int ruleId = ditStructureRule.getRuleId();
@@ -132,6 +137,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public DitStructureRule lookup( int ruleId ) throws LdapException
     {
         DitStructureRule ditStructureRule = byRuleId.get( ruleId );
@@ -155,6 +161,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregister( int ruleId ) throws LdapException
     {
         DitStructureRule ditStructureRule = byRuleId.remove( ruleId );
@@ -169,6 +176,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName )
     {
         if ( schemaName == null )
@@ -197,6 +205,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public void renameSchema( String originalSchemaName, String newSchemaName )
     {
         // Loop on all the SchemaObjects stored and remove those associated
@@ -219,6 +228,7 @@ public class DefaultDitStructureRuleRegi
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultDitStructureRuleRegistry copy()
     {
         DefaultDitStructureRuleRegistry copy = new DefaultDitStructureRuleRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java Tue May 31 09:32:09 2016
@@ -44,6 +44,7 @@ public class DefaultLdapSyntaxRegistry e
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultLdapSyntaxRegistry copy()
     {
         DefaultLdapSyntaxRegistry copy = new DefaultLdapSyntaxRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java Tue May 31 09:32:09 2016
@@ -44,6 +44,7 @@ public class DefaultMatchingRuleRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultMatchingRuleRegistry copy()
     {
         DefaultMatchingRuleRegistry copy = new DefaultMatchingRuleRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java Tue May 31 09:32:09 2016
@@ -47,6 +47,7 @@ public class DefaultMatchingRuleUseRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultMatchingRuleUseRegistry copy()
     {
         DefaultMatchingRuleUseRegistry copy = new DefaultMatchingRuleUseRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNameFormRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNameFormRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNameFormRegistry.java Tue May 31 09:32:09 2016
@@ -44,6 +44,7 @@ public class DefaultNameFormRegistry ext
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultNameFormRegistry copy()
     {
         DefaultNameFormRegistry copy = new DefaultNameFormRegistry();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNormalizerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNormalizerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultNormalizerRegistry.java Tue May 31 09:32:09 2016
@@ -57,6 +57,7 @@ public class DefaultNormalizerRegistry e
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         if ( schemaName == null )
@@ -85,6 +86,7 @@ public class DefaultNormalizerRegistry e
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultNormalizerRegistry copy()
     {
         DefaultNormalizerRegistry copy = new DefaultNormalizerRegistry();
@@ -99,6 +101,7 @@ public class DefaultNormalizerRegistry e
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultObjectClassRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultObjectClassRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultObjectClassRegistry.java Tue May 31 09:32:09 2016
@@ -53,13 +53,14 @@ public class DefaultObjectClassRegistry
     public DefaultObjectClassRegistry()
     {
         super( SchemaObjectType.OBJECT_CLASS, new OidRegistry<ObjectClass>() );
-        oidToDescendants = new HashMap<String, Set<ObjectClass>>();
+        oidToDescendants = new HashMap<>();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasDescendants( String ancestorId ) throws LdapException
     {
         try
@@ -79,6 +80,7 @@ public class DefaultObjectClassRegistry
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Iterator<ObjectClass> descendants( String ancestorId ) throws LdapException
     {
         try
@@ -103,11 +105,12 @@ public class DefaultObjectClassRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors )
         throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
-        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) )
+        if ( ( ancestors == null ) || ancestors.isEmpty() )
         {
             return;
         }
@@ -120,7 +123,7 @@ public class DefaultObjectClassRegistry
             // Initialize the descendant Set to store the descendants for the attributeType
             if ( descendants == null )
             {
-                descendants = new HashSet<ObjectClass>( 1 );
+                descendants = new HashSet<>( 1 );
                 oidToDescendants.put( ancestor.getOid(), descendants );
             }
 
@@ -143,11 +146,12 @@ public class DefaultObjectClassRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors )
         throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
-        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) )
+        if ( ( ancestors == null ) || ancestors.isEmpty() )
         {
             return;
         }
@@ -161,7 +165,7 @@ public class DefaultObjectClassRegistry
             {
                 descendants.remove( attributeType );
 
-                if ( descendants.size() == 0 )
+                if ( descendants.isEmpty() )
                 {
                     oidToDescendants.remove( ancestor.getOid() );
                 }
@@ -183,6 +187,7 @@ public class DefaultObjectClassRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public ObjectClass unregister( String numericOid ) throws LdapException
     {
         try
@@ -209,6 +214,7 @@ public class DefaultObjectClassRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultObjectClassRegistry copy()
     {
         DefaultObjectClassRegistry copy = new DefaultObjectClassRegistry();
@@ -223,6 +229,7 @@ public class DefaultObjectClassRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         // Clear the contained SchemaObjects

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchema.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchema.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchema.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchema.java Tue May 31 09:32:09 2016
@@ -132,7 +132,7 @@ public class DefaultSchema implements Sc
 
         this.disabled = disabled;
 
-        content = new HashSet<SchemaObjectWrapper>();
+        content = new HashSet<>();
         
         this.schemaLoader = schemaLoader;
     }
@@ -141,6 +141,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public String[] getDependencies()
     {
         String[] copy = new String[dependencies.length];
@@ -152,6 +153,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addDependencies( String... dependenciesToAdd )
     {
         if ( dependenciesToAdd != null )
@@ -178,6 +180,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOwner()
     {
         return owner;
@@ -187,6 +190,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSchemaName()
     {
         return name;
@@ -196,6 +200,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isDisabled()
     {
         return disabled;
@@ -205,6 +210,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isEnabled()
     {
         return !disabled;
@@ -214,6 +220,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public void disable()
     {
         this.disabled = true;
@@ -223,6 +230,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public void enable()
     {
         this.disabled = false;
@@ -232,6 +240,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public Set<SchemaObjectWrapper> getContent()
     {
         return content;
@@ -241,6 +250,7 @@ public class DefaultSchema implements Sc
     /**
      * {@inheritDoc}
      */
+    @Override
     public SchemaLoader getSchemaLoader()
     {
         return schemaLoader;
@@ -268,7 +278,6 @@ public class DefaultSchema implements Sc
             sb.append( schemaLoader.getClass().getSimpleName() );
         }
 
-        // TODO : print the associated ShcemaObjects
         return sb.toString();
     }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java Tue May 31 09:32:09 2016
@@ -69,7 +69,7 @@ public abstract class DefaultSchemaObjec
      */
     protected DefaultSchemaObjectRegistry( SchemaObjectType schemaObjectType, OidRegistry<T> oidRegistry )
     {
-        byName = new HashMap<String, T>();
+        byName = new HashMap<>();
         this.schemaObjectType = schemaObjectType;
         this.oidRegistry = oidRegistry;
         this.isRelaxed = Registries.STRICT;
@@ -123,6 +123,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean contains( String oid )
     {
         if ( !byName.containsKey( oid ) )
@@ -137,6 +138,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSchemaName( String oid ) throws LdapException
     {
         if ( !Oid.isOid( oid ) )
@@ -162,6 +164,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public void renameSchema( String originalSchemaName, String newSchemaName )
     {
         // Loop on all the SchemaObjects stored and remove those associated
@@ -184,6 +187,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<T> iterator()
     {
         return oidRegistry.iterator();
@@ -193,6 +197,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<String> oidsIterator()
     {
         return byName.keySet().iterator();
@@ -202,6 +207,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public T lookup( String oid ) throws LdapException
     {
         if ( oid == null )
@@ -236,6 +242,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public void register( T schemaObject ) throws LdapException
     {
         String oid = schemaObject.getOid();
@@ -288,6 +295,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public T unregister( String numericOid ) throws LdapException
     {
         if ( !Oid.isOid( numericOid ) )
@@ -319,6 +327,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public T unregister( T schemaObject ) throws LdapException
     {
         String oid = schemaObject.getOid();
@@ -352,6 +361,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         if ( schemaName == null )
@@ -380,7 +390,8 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
-    public String getOidByName( String name ) throws LdapException
+    @Override
+public String getOidByName( String name ) throws LdapException
     {
         T schemaObject = byName.get( name );
 
@@ -463,6 +474,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public T get( String oid )
     {
         try
@@ -479,6 +491,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public SchemaObjectType getType()
     {
         return schemaObjectType;
@@ -488,6 +501,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public int size()
     {
         return oidRegistry.size();
@@ -497,6 +511,7 @@ public abstract class DefaultSchemaObjec
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
@@ -528,6 +543,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         // Clear all the schemaObjects

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java Tue May 31 09:32:09 2016
@@ -57,6 +57,7 @@ public class DefaultSyntaxCheckerRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         if ( schemaName == null )
@@ -85,6 +86,7 @@ public class DefaultSyntaxCheckerRegistr
     /**
      * {@inheritDoc}
      */
+    @Override
     public DefaultSyntaxCheckerRegistry copy()
     {
         DefaultSyntaxCheckerRegistry copy = new DefaultSyntaxCheckerRegistry();
@@ -99,6 +101,7 @@ public class DefaultSyntaxCheckerRegistr
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitContentRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitContentRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitContentRuleRegistry.java Tue May 31 09:32:09 2016
@@ -34,5 +34,6 @@ public interface DitContentRuleRegistry
     /**
      * Copy the DitContentRuleRegistry
      */
+    @Override
     DitContentRuleRegistry copy();
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitStructureRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitStructureRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DitStructureRuleRegistry.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public interface DitStructureRuleRegistr
      *
      * @return an Iterator of descriptions
      */
+    @Override
     Iterator<DitStructureRule> iterator();
 
 
@@ -78,6 +79,7 @@ public interface DitStructureRuleRegistr
      * @throws LdapException if the DitStructureRule is already registered or
      * the registration operation is not supported
      */
+    @Override
     void register( DitStructureRule ditStructureRule ) throws LdapException;
 
 
@@ -108,6 +110,7 @@ public interface DitStructureRuleRegistr
      * @param schemaName the name of the schema whose syntaxCheckers will be removed from
      * @throws LdapException if no such SchemaElement exists
      */
+    @Override
     void unregisterSchemaElements( String schemaName ) throws LdapException;
 
 
@@ -118,11 +121,13 @@ public interface DitStructureRuleRegistr
      * @param newSchemaName The new Schema name
      * @throws org.apache.directory.api.ldap.model.exception.LdapException if the schema can't be renamed
      */
+    @Override
     void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException;
 
 
     /**
      * Copy the DitStructureRuleRegistry
      */
+    @Override
     DitStructureRuleRegistry copy();
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java Tue May 31 09:32:09 2016
@@ -58,6 +58,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public Map<String, OidNormalizer> getNormalizerMapping()
     {
         return immutableAttributeTypeRegistry.getNormalizerMapping();
@@ -67,7 +68,8 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public boolean hasDescendants( String ancestorId ) throws LdapException
+    @Override
+public boolean hasDescendants( String ancestorId ) throws LdapException
     {
         return immutableAttributeTypeRegistry.hasDescendants( ancestorId );
     }
@@ -76,6 +78,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasDescendants( AttributeType ancestor ) throws LdapException
     {
         return immutableAttributeTypeRegistry.hasDescendants( ancestor );
@@ -85,6 +88,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<AttributeType> descendants( String ancestorId ) throws LdapException
     {
         return immutableAttributeTypeRegistry.descendants( ancestorId );
@@ -94,6 +98,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<AttributeType> descendants( AttributeType ancestor ) throws LdapException
     {
         return immutableAttributeTypeRegistry.descendants( ancestor );
@@ -103,6 +108,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void register( AttributeType attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -112,6 +118,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -121,6 +128,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -130,6 +138,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType unregister( String numericOid ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION,
@@ -140,6 +149,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addMappingFor( AttributeType attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -149,6 +159,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void removeMappingFor( AttributeType attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -158,6 +169,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType lookup( String oid ) throws LdapException
     {
         return immutableAttributeTypeRegistry.lookup( oid );
@@ -167,6 +179,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return immutableAttributeTypeRegistry.toString();
@@ -176,15 +189,17 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeTypeRegistry copy()
     {
-        return ( AttributeTypeRegistry ) immutableAttributeTypeRegistry.copy();
+        return immutableAttributeTypeRegistry.copy();
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public int size()
     {
         return immutableAttributeTypeRegistry.size();
@@ -194,6 +209,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<AttributeType> iterator()
     {
         return immutableAttributeTypeRegistry.iterator();
@@ -203,6 +219,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<String> oidsIterator()
     {
         return immutableAttributeTypeRegistry.oidsIterator();
@@ -212,6 +229,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean contains( String oid )
     {
         return immutableAttributeTypeRegistry.contains( oid );
@@ -221,6 +239,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOidByName( String name ) throws LdapException
     {
         try
@@ -237,6 +256,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSchemaName( String oid ) throws LdapException
     {
         return immutableAttributeTypeRegistry.getSchemaName( oid );
@@ -246,6 +266,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public SchemaObjectType getType()
     {
         return immutableAttributeTypeRegistry.getType();
@@ -255,6 +276,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void renameSchema( String originalSchemaName, String newSchemaName )
     {
         // Do nothing
@@ -264,6 +286,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -273,6 +296,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType get( String oid )
     {
         return immutableAttributeTypeRegistry.get( oid );
@@ -282,6 +306,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear() throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
@@ -291,6 +316,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
+    @Override
     public AttributeType unregister( AttributeType schemaObject ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableComparatorRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableComparatorRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableComparatorRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void register( LdapComparator<?> comparator ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );
@@ -64,6 +65,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public LdapComparator<?> unregister( String numericOid ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );
@@ -73,6 +75,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void unregisterSchemaElements( String schemaName ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );
@@ -82,6 +85,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public ImmutableComparatorRegistry copy()
     {
         return ( ImmutableComparatorRegistry ) immutableComparatorRegistry.copy();
@@ -91,6 +95,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public int size()
     {
         return immutableComparatorRegistry.size();
@@ -100,6 +105,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean contains( String oid )
     {
         return immutableComparatorRegistry.contains( oid );
@@ -109,6 +115,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getOidByName( String name ) throws LdapException
     {
         return immutableComparatorRegistry.getOidByName( name );
@@ -118,6 +125,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSchemaName( String oid ) throws LdapException
     {
         return immutableComparatorRegistry.getSchemaName( oid );
@@ -127,6 +135,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public SchemaObjectType getType()
     {
         return immutableComparatorRegistry.getType();
@@ -136,6 +145,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<LdapComparator<?>> iterator()
     {
         return immutableComparatorRegistry.iterator();
@@ -145,6 +155,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public LdapComparator<?> lookup( String oid ) throws LdapException
     {
         return immutableComparatorRegistry.lookup( oid );
@@ -154,6 +165,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<String> oidsIterator()
     {
         return immutableComparatorRegistry.oidsIterator();
@@ -163,6 +175,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );
@@ -172,6 +185,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public LdapComparator<?> get( String oid )
     {
         return immutableComparatorRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear() throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );
@@ -190,6 +205,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
+    @Override
     public LdapComparator<?> unregister( LdapComparator<?> schemaObject ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) );



Mime
View raw message