directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1743766 - in /directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model: constants/ csn/ cursor/
Date Fri, 13 May 2016 22:27:55 GMT
Author: elecharny
Date: Fri May 13 22:27:55 2016
New Revision: 1743766

URL: http://svn.apache.org/viewvc?rev=1743766&view=rev
Log:
Fixed some Sonar quality warnings

Modified:
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/AuthenticationLevel.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/JndiPropertyConstants.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/MetaSchemaConstants.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/PasswordPolicySchemaConstants.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SupportedSaslMechanisms.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorLdapReferralException.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
    directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/AuthenticationLevel.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/AuthenticationLevel.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/AuthenticationLevel.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/AuthenticationLevel.java
Fri May 13 22:27:55 2016
@@ -98,6 +98,7 @@ public enum AuthenticationLevel
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return name;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/JndiPropertyConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/JndiPropertyConstants.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/JndiPropertyConstants.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/JndiPropertyConstants.java
Fri May 13 22:27:55 2016
@@ -30,15 +30,6 @@ package org.apache.directory.api.ldap.mo
  */
 public final class JndiPropertyConstants
 {
-    /**
-     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
-     *  (Implicit super constructor is not visible for default constructor),
-     *  but is still self documenting.
-     */
-    private JndiPropertyConstants()
-    {
-    }
-
     // Pure JNDI properties
     /** Batch size of search results returned */
     public static final String JNDI_BATCHSIZE = "java.naming.batchsize";
@@ -143,4 +134,13 @@ public final class JndiPropertyConstants
 
     /** Tells if the SASL mechanism accept or not anonymous connections */
     public static final String JNDI_SASL_POLICY_NO_ANONYMOUS = "javax.security.sasl.policy.noanonymous";
+    
+    /**
+     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
+     *  (Implicit super constructor is not visible for default constructor),
+     *  but is still self documenting.
+     */
+    private JndiPropertyConstants()
+    {
+    }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/MetaSchemaConstants.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/MetaSchemaConstants.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/MetaSchemaConstants.java
Fri May 13 22:27:55 2016
@@ -29,15 +29,6 @@ package org.apache.directory.api.ldap.mo
 //This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
 public final class MetaSchemaConstants
 {
-    /**
-     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
-     *  (Implicit super constructor is not visible for default constructor),
-     *  but is still self documenting.
-     */
-    private MetaSchemaConstants()
-    {
-    }
-
     public static final String SCHEMA_NAME = "apachemeta";
     public static final String SCHEMA_OTHER = "other";
 
@@ -182,4 +173,13 @@ public final class MetaSchemaConstants
     // The x-read-only extension
     public static final String X_READ_ONLY_AT = "X-READ-ONLY";
     public static final String X_READ_ONLY_AT_OID = "1.3.6.1.4.1.18060.0.4.0.2.36";
+
+    /**
+     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
+     *  (Implicit super constructor is not visible for default constructor),
+     *  but is still self documenting.
+     */
+    private MetaSchemaConstants()
+    {
+    }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/PasswordPolicySchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/PasswordPolicySchemaConstants.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/PasswordPolicySchemaConstants.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/PasswordPolicySchemaConstants.java
Fri May 13 22:27:55 2016
@@ -29,15 +29,6 @@ package org.apache.directory.api.ldap.mo
  */
 public final class PasswordPolicySchemaConstants
 {
-    /**
-     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
-     *  (Implicit super constructor is not visible for default constructor),
-     *  but is still self documenting.
-     */
-    private PasswordPolicySchemaConstants()
-    {
-    }
-
     // ---- ObjectClasses -----------------------------------------------------
     // pwdPolicy
     public static final String PWD_POLICY_OC = "pwdPolicy";
@@ -163,4 +154,13 @@ public final class PasswordPolicySchemaC
     // pwdMaxLength
     public static final String PWD_MAX_LENGTH_AT = "pwdMaxLength";
     public static final String PWD_MAX_LENGTH_AT_OID = "1.3.6.1.4.1.42.2.27.8.1.31";
+
+    /**
+     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
+     *  (Implicit super constructor is not visible for default constructor),
+     *  but is still self documenting.
+     */
+    private PasswordPolicySchemaConstants()
+    {
+    }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
Fri May 13 22:27:55 2016
@@ -29,15 +29,6 @@ package org.apache.directory.api.ldap.mo
  */
 public final class SchemaConstants
 {
-    /**
-     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
-     *  (Implicit super constructor is not visible for default constructor),
-     *  but is still self documenting.
-     */
-    private SchemaConstants()
-    {
-    }
-
     // SchemaEntity names
     public static final String ATTRIBUTE_TYPE = "AttributeType";
     public static final String COMPARATOR = "Comparator";
@@ -2218,4 +2209,13 @@ public final class SchemaConstants
     // TriggerExecutionInnerArea
     public static final String TRIGGER_EXECUTION_INNER_AREA = "triggerExecutionInnerArea";
     public static final String TRIGGER_EXECUTION_INNER_AREA_OID = "1.3.6.1.4.1.18060.0.4.1.6.2";
+
+    /**
+     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
+     *  (Implicit super constructor is not visible for default constructor),
+     *  but is still self documenting.
+     */
+    private SchemaConstants()
+    {
+    }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SupportedSaslMechanisms.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SupportedSaslMechanisms.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SupportedSaslMechanisms.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SupportedSaslMechanisms.java
Fri May 13 22:27:55 2016
@@ -29,15 +29,6 @@ package org.apache.directory.api.ldap.mo
  */
 public final class SupportedSaslMechanisms
 {
-    /**
-     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
-     *  (Implicit super constructor is not visible for default constructor),
-     *  but is still self documenting.
-     */
-    private SupportedSaslMechanisms()
-    {
-    }
-
     /** CRAM-MD5 mechanism */
     public static final String CRAM_MD5 = "CRAM-MD5";
 
@@ -55,4 +46,13 @@ public final class SupportedSaslMechanis
 
     /** Not a SASL JDK supported mechanism */
     public static final String GSS_SPNEGO = "GSS-SPNEGO";
+
+    /**
+     *  Ensures no construction of this class, also ensures there is no need for final keyword
above
+     *  (Implicit super constructor is not visible for default constructor),
+     *  but is still self documenting.
+     */
+    private SupportedSaslMechanisms()
+    {
+    }
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
Fri May 13 22:27:55 2016
@@ -589,6 +589,7 @@ public class Csn implements Comparable<C
     /**
      * @return The CSN as a String
      */
+    @Override
     public String toString()
     {
         if ( csnStr == null )
@@ -632,6 +633,7 @@ public class Csn implements Comparable<C
      * 
      * @return a hash code value for this object.
      */
+    @Override
     public int hashCode()
     {
         int h = 37;
@@ -652,6 +654,7 @@ public class Csn implements Comparable<C
      * @return <code>true</code> if this object is the same as the obj argument;

      * <code>false</code> otherwise.
      */
+    @Override
     public boolean equals( Object o )
     {
         if ( this == o )
@@ -680,6 +683,7 @@ public class Csn implements Comparable<C
      * @return  a negative integer, zero, or a positive integer as this object
      *      is less than, equal to, or greater than the specified object.
      */
+    @Override
     public int compareTo( Csn csn )
     {
         if ( csn == null )

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/CsnFactory.java
Fri May 13 22:27:55 2016
@@ -57,7 +57,7 @@ public class CsnFactory
      */
     public Csn newInstance()
     {
-        int tmpChangeCount = 0;
+        int tmpChangeCount;
 
         synchronized ( lock )
         {

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
Fri May 13 22:27:55 2016
@@ -40,6 +40,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setClosureMonitor( ClosureMonitor monitor )
     {
         if ( monitor == null )
@@ -66,6 +67,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isClosed()
     {
         return monitor.isClosed();
@@ -75,6 +77,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public void close( Exception cause ) throws IOException
     {
         monitor.close( cause );
@@ -84,6 +87,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public void close() throws IOException
     {
         monitor.close();
@@ -93,15 +97,17 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<E> iterator()
     {
-        return new CursorIterator<E>( this );
+        return new CursorIterator<>( this );
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isAfterLast()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION,
getClass().getName()
@@ -112,6 +118,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isBeforeFirst()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION,
getClass().getName()
@@ -122,6 +129,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isFirst()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION,
getClass().getName()
@@ -132,6 +140,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isLast()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION,
getClass().getName()
@@ -142,6 +151,7 @@ public abstract class AbstractCursor<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString( String tabs )
     {
         return tabs;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
Fri May 13 22:27:55 2016
@@ -64,6 +64,7 @@ public class CursorIterator<E> implement
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasNext()
     {
         return available;
@@ -73,6 +74,7 @@ public class CursorIterator<E> implement
     /**
      * {@inheritDoc}
      */
+    @Override
     public E next()
     {
         try
@@ -91,6 +93,7 @@ public class CursorIterator<E> implement
     /**
      * {@inheritDoc}
      */
+    @Override
     public void remove()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02003_REMOVAL_NOT_SUPPORTED
) );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorLdapReferralException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorLdapReferralException.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorLdapReferralException.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorLdapReferralException.java
Fri May 13 22:27:55 2016
@@ -38,7 +38,7 @@ public class CursorLdapReferralException
     public static final CursorLdapReferralException INSTANCE = new CursorLdapReferralException(
null );
 
     /** The contained referralException */
-    private LdapReferralException ldapReferralException;
+    private final LdapReferralException ldapReferralException;
 
 
     /**

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
Fri May 13 22:27:55 2016
@@ -43,6 +43,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void close()
     {
         // state check needed to "try" not to overwrite exception (lack of
@@ -61,6 +62,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void close( final String cause )
     {
         // state check needed to "try" not to overwrite exception (lack of
@@ -79,6 +81,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void close( final Exception cause )
     {
         // state check needed to "try" not to overwrite exception (lack of
@@ -97,6 +100,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public final Exception getCause()
     {
         return cause;
@@ -106,6 +110,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public final boolean isClosed()
     {
         return closed;
@@ -115,6 +120,7 @@ public class DefaultClosureMonitor imple
     /**
      * {@inheritDoc}
      */
+    @Override
     public void checkNotClosed() throws CursorClosedException
     {
         // lack of synchronization may cause pass but eventually it will work

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
Fri May 13 22:27:55 2016
@@ -55,6 +55,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean available()
     {
         return false;
@@ -64,6 +65,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void before( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "before()" );
@@ -73,6 +75,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void after( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "after()" );
@@ -82,6 +85,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void beforeFirst() throws LdapException, CursorException
     {
         checkNotClosed( "beforeFirst()" );
@@ -91,6 +95,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void afterLast() throws LdapException, CursorException
     {
         checkNotClosed( "afterLast()" );
@@ -100,6 +105,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean first() throws LdapException, CursorException
     {
         checkNotClosed( "first()" );
@@ -110,6 +116,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean last() throws LdapException, CursorException
     {
         checkNotClosed( "last()" );
@@ -120,6 +127,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean previous() throws LdapException, CursorException
     {
         checkNotClosed( "previous()" );
@@ -130,6 +138,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean next() throws LdapException, CursorException
     {
         checkNotClosed( "next()" );
@@ -140,6 +149,7 @@ public class EmptyCursor<E> extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public E get() throws CursorException
     {
         checkNotClosed( "get()" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
Fri May 13 22:27:55 2016
@@ -94,7 +94,7 @@ public class ListCursor<E> extends Abstr
 
         // check list is not empty list since the empty list is the only situation
         // where we allow for start to equal the end: in other cases it makes no sense
-        if ( ( list.size() > 0 ) && ( start >= end ) )
+        if ( !list.isEmpty() && ( start >= end ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_02007_START_INDEX_ABOVE_END_INDEX,
start, end ) );
         }
@@ -238,6 +238,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean available()
     {
         return index >= 0 && index < end;
@@ -247,6 +248,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void before( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "before()" );
@@ -257,7 +259,7 @@ public class ListCursor<E> extends Abstr
         }
 
         // handle some special cases
-        if ( list.size() == 0 )
+        if ( list.isEmpty() )
         {
             return;
         }
@@ -280,6 +282,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void after( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "after()" );
@@ -290,7 +293,7 @@ public class ListCursor<E> extends Abstr
         }
 
         // handle some special cases
-        if ( list.size() == 0 )
+        if ( list.isEmpty() )
         {
             return;
         }
@@ -313,6 +316,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void beforeFirst() throws LdapException, CursorException
     {
         checkNotClosed( "beforeFirst()" );
@@ -323,6 +327,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void afterLast() throws LdapException, CursorException
     {
         checkNotClosed( "afterLast()" );
@@ -333,11 +338,12 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean first() throws LdapException, CursorException
     {
         checkNotClosed( "first()" );
 
-        if ( list.size() > 0 )
+        if ( !list.isEmpty() )
         {
             index = start;
 
@@ -351,11 +357,12 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean last() throws LdapException, CursorException
     {
         checkNotClosed( "last()" );
 
-        if ( list.size() > 0 )
+        if ( !list.isEmpty() )
         {
             index = end - 1;
 
@@ -372,7 +379,7 @@ public class ListCursor<E> extends Abstr
     @Override
     public boolean isFirst()
     {
-        return list.size() > 0 && index == start;
+        return !list.isEmpty() && index == start;
     }
 
 
@@ -382,7 +389,7 @@ public class ListCursor<E> extends Abstr
     @Override
     public boolean isLast()
     {
-        return list.size() > 0 && index == end - 1;
+        return !list.isEmpty() && index == end - 1;
     }
 
 
@@ -409,6 +416,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean previous() throws LdapException, CursorException
     {
         checkNotClosed( "previous()" );
@@ -435,7 +443,7 @@ public class ListCursor<E> extends Abstr
             return false;
         }
 
-        if ( list.size() <= 0 )
+        if ( list.isEmpty() )
         {
             index = -1;
         }
@@ -447,12 +455,13 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean next() throws LdapException, CursorException
     {
         checkNotClosed( "next()" );
 
         // if parked at -1 we advance to the start index and return true
-        if ( ( list.size() > 0 ) && ( index == -1 ) )
+        if ( !list.isEmpty() && ( index == -1 ) )
         {
             index = start;
 
@@ -460,7 +469,7 @@ public class ListCursor<E> extends Abstr
         }
 
         // if the index plus one is less than the end then increment and return true
-        if ( ( list.size() > 0 ) && ( index + 1 < end ) )
+        if ( !list.isEmpty() && ( index + 1 < end ) )
         {
             index++;
 
@@ -468,14 +477,14 @@ public class ListCursor<E> extends Abstr
         }
 
         // if the index plus one is equal to the end then increment and return false
-        if ( ( list.size() > 0 ) && ( index + 1 == end ) )
+        if ( !list.isEmpty() && ( index + 1 == end ) )
         {
             index++;
 
             return false;
         }
 
-        if ( list.size() <= 0 )
+        if ( list.isEmpty() )
         {
             index = end;
         }
@@ -487,6 +496,7 @@ public class ListCursor<E> extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public E get() throws CursorException
     {
         checkNotClosed( "get()" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
Fri May 13 22:27:55 2016
@@ -128,6 +128,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean available()
     {
         return ( index >= 0 ) && ( index < set.length );
@@ -137,6 +138,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public void before( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "before()" );
@@ -170,6 +172,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public void after( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "after()" );
@@ -203,6 +206,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public void beforeFirst() throws LdapException, CursorException
     {
         checkNotClosed( "beforeFirst()" );
@@ -213,6 +217,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public void afterLast() throws LdapException, CursorException
     {
         checkNotClosed( "afterLast()" );
@@ -223,6 +228,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean first() throws LdapException, CursorException
     {
         checkNotClosed( "first()" );
@@ -241,6 +247,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean last() throws LdapException, CursorException
     {
         checkNotClosed( "last()" );
@@ -299,6 +306,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean previous() throws LdapException, CursorException
     {
         checkNotClosed( "previous()" );
@@ -337,6 +345,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean next() throws LdapException, CursorException
     {
         checkNotClosed( "next()" );
@@ -377,6 +386,7 @@ public class SetCursor<E> extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public E get() throws CursorException
     {
         checkNotClosed( "get()" );
@@ -423,6 +433,7 @@ public class SetCursor<E> extends Abstra
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString( String tabs )
     {
         StringBuilder sb = new StringBuilder();
@@ -456,6 +467,7 @@ public class SetCursor<E> extends Abstra
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         return toString( "" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
Fri May 13 22:27:55 2016
@@ -92,6 +92,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean available()
     {
         return onSingleton;
@@ -101,6 +102,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void before( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "before()" );
@@ -126,7 +128,8 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
-    public void after( E element ) throws LdapException, CursorException
+    @Override
+public void after( E element ) throws LdapException, CursorException
     {
         checkNotClosed( "after()" );
 
@@ -151,6 +154,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void beforeFirst() throws LdapException, CursorException
     {
         checkNotClosed( "beforeFirst" );
@@ -163,6 +167,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void afterLast() throws LdapException, CursorException
     {
         checkNotClosed( "afterLast" );
@@ -175,6 +180,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean first() throws LdapException, CursorException
     {
         checkNotClosed( "first" );
@@ -189,6 +195,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean last() throws LdapException, CursorException
     {
         checkNotClosed( "last" );
@@ -243,6 +250,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean previous() throws LdapException, CursorException
     {
         checkNotClosed( "previous" );
@@ -273,6 +281,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean next() throws LdapException, CursorException
     {
         checkNotClosed( "next" );
@@ -303,6 +312,7 @@ public class SingletonCursor<E> extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public E get() throws CursorException
     {
         checkNotClosed( "get" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java?rev=1743766&r1=1743765&r2=1743766&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java
(original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java
Fri May 13 22:27:55 2016
@@ -228,6 +228,7 @@ public class Tuple<K, V>
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder();




Mime
View raw message