You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/12/17 06:19:33 UTC
svn commit: r1774710 -
/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/
Author: elecharny
Date: Sat Dec 17 06:19:33 2016
New Revision: 1774710
URL: http://svn.apache.org/viewvc?rev=1774710&view=rev
Log:
Fixed sonarlint warnings
Modified:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/AbstractCursor.java Sat Dec 17 06:19:33 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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/CursorIterator.java Sat Dec 17 06:19:33 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
@@ -92,6 +94,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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java Sat Dec 17 06:19:33 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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/EmptyCursor.java Sat Dec 17 06:19:33 2016
@@ -58,6 +58,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public boolean available()
{
return false;
@@ -67,6 +68,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public void before( E element ) throws LdapException, CursorException
{
checkNotClosed( "before()" );
@@ -76,6 +78,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public void after( E element ) throws LdapException, CursorException
{
checkNotClosed( "after()" );
@@ -85,6 +88,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public void beforeFirst() throws LdapException, CursorException
{
checkNotClosed( "beforeFirst()" );
@@ -94,6 +98,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public void afterLast() throws LdapException, CursorException
{
checkNotClosed( "afterLast()" );
@@ -103,6 +108,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public boolean first() throws LdapException, CursorException
{
checkNotClosed( "first()" );
@@ -113,6 +119,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public boolean last() throws LdapException, CursorException
{
checkNotClosed( "last()" );
@@ -123,6 +130,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public boolean previous() throws LdapException, CursorException
{
checkNotClosed( "previous()" );
@@ -133,6 +141,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public boolean next() throws LdapException, CursorException
{
checkNotClosed( "next()" );
@@ -143,6 +152,7 @@ public class EmptyCursor<E> extends Abst
/**
* {@inheritDoc}
*/
+ @Override
public E get() throws CursorException
{
checkNotClosed( "get()" );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/ListCursor.java Sat Dec 17 06:19:33 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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java Sat Dec 17 06:19:33 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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SingletonCursor.java Sat Dec 17 06:19:33 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,6 +128,7 @@ public class SingletonCursor<E> extends
/**
* {@inheritDoc}
*/
+ @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/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java?rev=1774710&r1=1774709&r2=1774710&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/Tuple.java Sat Dec 17 06:19:33 2016
@@ -228,6 +228,7 @@ public class Tuple<K, V>
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
StringBuilder buf = new StringBuilder();