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/11/26 06:53:11 UTC
svn commit: r1771408 [2/3] - in
/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec:
./ api/ controls/cascade/ controls/manageDsaIT/ controls/proxiedauthz/
controls/search/entryChange/ controls/sear...
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java Sat Nov 26 06:53:10 2016
@@ -92,6 +92,7 @@ public class PersistentSearchDecorator e
*
* @return the control length.
*/
+ @Override
public int computeLength()
{
int changeTypesLength = 1 + 1 + BerValue.getNbBytes( getChangeTypes() );
@@ -99,9 +100,8 @@ public class PersistentSearchDecorator e
int returnRCsLength = 1 + 1 + 1;
psearchSeqLength = changeTypesLength + changesOnlyLength + returnRCsLength;
- int valueLength = 1 + TLV.getNbBytes( psearchSeqLength ) + psearchSeqLength;
-
- return valueLength;
+
+ return 1 + TLV.getNbBytes( psearchSeqLength ) + psearchSeqLength;
}
@@ -112,6 +112,7 @@ public class PersistentSearchDecorator e
* @return A ByteBuffer that contains the encoded PDU
* @throws EncoderException If anything goes wrong.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
if ( buffer == null )
@@ -134,6 +135,7 @@ public class PersistentSearchDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getValue()
{
if ( value == null )
@@ -165,52 +167,60 @@ public class PersistentSearchDecorator e
private PersistentSearch getPersistentSearch()
{
- return ( PersistentSearch ) getDecorated();
+ return getDecorated();
}
- public void setChangesOnly( boolean changesOnly )
+ @Override
+public void setChangesOnly( boolean changesOnly )
{
getPersistentSearch().setChangesOnly( changesOnly );
}
+ @Override
public boolean isChangesOnly()
{
return getPersistentSearch().isChangesOnly();
}
+ @Override
public void setReturnECs( boolean returnECs )
{
getPersistentSearch().setReturnECs( returnECs );
}
+ @Override
public boolean isReturnECs()
{
return getPersistentSearch().isReturnECs();
}
+ @Override
public void setChangeTypes( int changeTypes )
{
getPersistentSearch().setChangeTypes( changeTypes );
}
+ @Override
public int getChangeTypes()
{
return getPersistentSearch().getChangeTypes();
}
+ @Override
public boolean isNotificationEnabled( ChangeType changeType )
{
return getPersistentSearch().isNotificationEnabled( changeType );
}
+ @Override
public void enableNotification( ChangeType changeType )
{
getPersistentSearch().enableNotification( changeType );
@@ -220,6 +230,7 @@ public class PersistentSearchDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java Sat Nov 26 06:53:10 2016
@@ -46,6 +46,7 @@ public class PersistentSearchFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return PersistentSearch.OID;
@@ -55,6 +56,7 @@ public class PersistentSearchFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<PersistentSearch> newCodecControl()
{
return new PersistentSearchDecorator( codec );
@@ -64,6 +66,7 @@ public class PersistentSearchFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<PersistentSearch> newCodecControl( PersistentSearch control )
{
return new PersistentSearchDecorator( codec, control );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java Sat Nov 26 06:53:10 2016
@@ -95,13 +95,14 @@ public enum PersistentSearchStates imple
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "PSEARCH_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "PSEARCH_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -111,6 +112,7 @@ public enum PersistentSearchStates imple
/**
* {@inheritDoc}
*/
+ @Override
public PersistentSearchStates getStartState()
{
return START_STATE;
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesContainer.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesContainer.java Sat Nov 26 06:53:10 2016
@@ -83,6 +83,7 @@ public class SubentriesContainer extends
/**
* Clean the current container
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesDecorator.java Sat Nov 26 06:53:10 2016
@@ -78,6 +78,7 @@ public class SubentriesDecorator extends
*
* @return the control length.
*/
+ @Override
public int computeLength()
{
return 1 + 1 + 1;
@@ -91,6 +92,7 @@ public class SubentriesDecorator extends
* @return A ByteBuffer that contains the encoded PDU
* @throws org.apache.directory.api.asn1.EncoderException If anything goes wrong.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
if ( buffer == null )
@@ -108,6 +110,7 @@ public class SubentriesDecorator extends
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getValue()
{
if ( value == null )
@@ -132,12 +135,14 @@ public class SubentriesDecorator extends
}
+ @Override
public boolean isVisible()
{
return getDecorated().isVisible();
}
+ @Override
public void setVisibility( boolean visibility )
{
getDecorated().setVisibility( visibility );
@@ -147,6 +152,7 @@ public class SubentriesDecorator extends
/**
* {@inheritDoc}
*/
+ @Override
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesFactory.java Sat Nov 26 06:53:10 2016
@@ -54,6 +54,7 @@ public class SubentriesFactory implement
*
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return Subentries.OID;
@@ -64,6 +65,7 @@ public class SubentriesFactory implement
*
* {@inheritDoc}
*/
+ @Override
public CodecControl<Subentries> newCodecControl()
{
return new SubentriesDecorator( codec );
@@ -74,6 +76,7 @@ public class SubentriesFactory implement
*
* {@inheritDoc}
*/
+ @Override
public CodecControl<Subentries> newCodecControl( Subentries control )
{
return new SubentriesDecorator( codec, control );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java Sat Nov 26 06:53:10 2016
@@ -88,13 +88,14 @@ public enum SubentriesStates implements
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "SUB_ENTRY_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "SUB_ENTRY_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -104,6 +105,7 @@ public enum SubentriesStates implements
/**
* {@inheritDoc}
*/
+ @Override
public SubentriesStates getStartState()
{
return START_STATE;
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestContainer.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestContainer.java Sat Nov 26 06:53:10 2016
@@ -107,6 +107,7 @@ public class SortRequestContainer extend
/**
* Clean the container
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -52,7 +52,7 @@ public class SortRequestDecorator extend
private int sortReqLen = 0;
- private List<Integer> sortKeyLenList = new ArrayList<Integer>();
+ private List<Integer> sortKeyLenList = new ArrayList<>();
public static final int ORDERING_RULE_TAG = 0x80;
@@ -181,6 +181,7 @@ public class SortRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getValue()
{
if ( value == null )
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestFactory.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestFactory.java Sat Nov 26 06:53:10 2016
@@ -52,6 +52,7 @@ public class SortRequestFactory implemen
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return SortRequest.OID;
@@ -61,6 +62,7 @@ public class SortRequestFactory implemen
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<SortRequest> newCodecControl()
{
return new SortRequestDecorator( codec );
@@ -70,6 +72,7 @@ public class SortRequestFactory implemen
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<SortRequest> newCodecControl( SortRequest control )
{
return new SortRequestDecorator( codec, control );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java Sat Nov 26 06:53:10 2016
@@ -82,21 +82,26 @@ public enum SortRequestStates implements
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "SORT_REQUEST_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "SORT_REQUEST_END_STATE" : name();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isEndState()
{
- return ( this == END_STATE );
+ return this == END_STATE;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Enum<?> getStartState()
{
return START_STATE;
}
-
}
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseContainer.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseContainer.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseContainer.java Sat Nov 26 06:53:10 2016
@@ -103,6 +103,7 @@ public class SortResponseContainer exten
/**
* Clean the container
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -135,6 +135,7 @@ public class SortResponseDecorator exten
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getValue()
{
if ( value == null )
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseFactory.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseFactory.java Sat Nov 26 06:53:10 2016
@@ -52,6 +52,7 @@ public class SortResponseFactory impleme
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return SortResponse.OID;
@@ -61,6 +62,7 @@ public class SortResponseFactory impleme
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<SortResponse> newCodecControl()
{
return new SortResponseDecorator( codec );
@@ -70,6 +72,7 @@ public class SortResponseFactory impleme
/**
* {@inheritDoc}
*/
+ @Override
public CodecControl<SortResponse> newCodecControl( SortResponse control )
{
return new SortResponseDecorator( codec, control );
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java Sat Nov 26 06:53:10 2016
@@ -78,17 +78,23 @@ public enum SortResponseStates implement
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "SORT_REQUEST_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "SORT_REQUEST_END_STATE" : name();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isEndState()
{
- return ( this == END_STATE );
+ return this == END_STATE;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Enum<?> getStartState()
{
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -58,6 +58,7 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
+ @Override
public int getAbandoned()
{
return getDecorated().getAbandoned();
@@ -67,6 +68,7 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
+ @Override
public AbandonRequest setAbandoned( int requestId )
{
getDecorated().setAbandoned( requestId );
@@ -78,6 +80,7 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
+ @Override
public AbandonRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -89,7 +92,8 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
- public AbandonRequest addControl( Control control )
+ @Override
+public AbandonRequest addControl( Control control )
{
return ( AbandonRequest ) super.addControl( control );
}
@@ -98,7 +102,8 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
- public AbandonRequest addAllControls( Control[] controls )
+ @Override
+public AbandonRequest addAllControls( Control[] controls )
{
return ( AbandonRequest ) super.addAllControls( controls );
}
@@ -107,6 +112,7 @@ public final class AbandonRequestDecorat
/**
* {@inheritDoc}
*/
+ @Override
public AbandonRequest removeControl( Control control )
{
return ( AbandonRequest ) super.removeControl( control );
@@ -120,6 +126,7 @@ public final class AbandonRequestDecorat
/**
* Encode the Abandon protocolOp part
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
@@ -154,10 +161,9 @@ public final class AbandonRequestDecorat
* Length(AbandonRequest) = Length(0x50) + 1 + Length(abandoned MessageId)
* </pre>
*/
+ @Override
public int computeLength()
{
- int length = 1 + 1 + BerValue.getNbBytes( getAbandoned() );
-
- return length;
+ return 1 + 1 + BerValue.getNbBytes( getAbandoned() );
}
}
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -48,6 +48,7 @@ public abstract class AbandonableResultR
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasResponse()
{
return getDecorated().hasResponse();
@@ -57,6 +58,7 @@ public abstract class AbandonableResultR
/**
* {@inheritDoc}
*/
+ @Override
public ResultResponse getResultResponse()
{
return getDecorated().getResultResponse();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -88,6 +88,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -99,6 +100,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest addControl( Control control )
{
return ( AddRequest ) super.addControl( control );
@@ -108,6 +110,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest addAllControls( Control[] controls )
{
return ( AddRequest ) super.addAllControls( controls );
@@ -117,6 +120,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest removeControl( Control control )
{
return ( AddRequest ) super.removeControl( control );
@@ -130,6 +134,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public Dn getEntryDn()
{
return getDecorated().getEntryDn();
@@ -139,6 +144,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest setEntryDn( Dn entry )
{
getDecorated().setEntryDn( entry );
@@ -150,6 +156,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public Entry getEntry()
{
return getDecorated().getEntry();
@@ -159,6 +166,7 @@ public final class AddRequestDecorator e
/**
* {@inheritDoc}
*/
+ @Override
public AddRequest setEntry( Entry entry )
{
getDecorated().setEntry( entry );
@@ -276,6 +284,7 @@ public final class AddRequestDecorator e
* +--> 0x04 L7-m-n value
* </pre>
*/
+ @Override
public int computeLength()
{
AddRequest addRequest = getDecorated();
@@ -297,15 +306,15 @@ public final class AddRequestDecorator e
if ( entry.size() != 0 )
{
- attributesLength = new LinkedList<Integer>();
- attributeIds = new LinkedList<byte[]>();
- valuesLength = new LinkedList<Integer>();
+ attributesLength = new LinkedList<>();
+ attributeIds = new LinkedList<>();
+ valuesLength = new LinkedList<>();
// Compute the attributes length
for ( Attribute attribute : entry )
{
- int localAttributeLength = 0;
- int localValuesLength = 0;
+ int localAttributeLength;
+ int localValuesLength;
// Get the type length
byte[] attributeIdBytes = Strings.getBytesUtf8( attribute.getUpId() );
@@ -381,6 +390,7 @@ public final class AddRequestDecorator e
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
@@ -431,7 +441,7 @@ public final class AddRequestDecorator e
BerValue.encode( buffer, Strings.EMPTY_BYTES );
}
- // Go to the next attribute number;
+ // Go to the next attribute number
attributeNumber++;
}
}
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -59,7 +59,7 @@ public class AddResponseDecorator extend
*/
public AddResponse getAddResponse()
{
- return ( AddResponse ) getDecorated();
+ return getDecorated();
}
@@ -80,6 +80,7 @@ public class AddResponseDecorator extend
* Length(AddResponse) = Length(0x69) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
AddResponse addResponse = getAddResponse();
@@ -97,6 +98,7 @@ public class AddResponseDecorator extend
* @return The encoded response
* @throws EncoderException If teh encoding failed
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -76,6 +76,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -87,6 +88,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest addControl( Control control )
{
return ( BindRequest ) super.addControl( control );
@@ -96,6 +98,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest addAllControls( Control[] controls )
{
return ( BindRequest ) super.addAllControls( controls );
@@ -105,6 +108,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest removeControl( Control control )
{
return ( BindRequest ) super.removeControl( control );
@@ -118,6 +122,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSimple()
{
return getDecorated().isSimple();
@@ -127,6 +132,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean getSimple()
{
return getDecorated().getSimple();
@@ -136,6 +142,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setSimple( boolean isSimple )
{
getDecorated().setSimple( isSimple );
@@ -147,6 +154,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getCredentials()
{
return getDecorated().getCredentials();
@@ -156,6 +164,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setCredentials( String credentials )
{
getDecorated().setCredentials( credentials );
@@ -167,6 +176,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setCredentials( byte[] credentials )
{
getDecorated().setCredentials( credentials );
@@ -178,6 +188,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public String getName()
{
return getDecorated().getName();
@@ -187,6 +198,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setName( String name )
{
getDecorated().setName( name );
@@ -198,6 +210,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public Dn getDn()
{
return getDecorated().getDn();
@@ -207,6 +220,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setDn( Dn dn )
{
getDecorated().setDn( dn );
@@ -218,6 +232,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isVersion3()
{
return getDecorated().isVersion3();
@@ -227,6 +242,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean getVersion3()
{
return getDecorated().getVersion3();
@@ -236,6 +252,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setVersion3( boolean isVersion3 )
{
getDecorated().setVersion3( isVersion3 );
@@ -247,6 +264,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public String getSaslMechanism()
{
return getDecorated().getSaslMechanism();
@@ -256,6 +274,7 @@ public class BindRequestDecorator extend
/**
* {@inheritDoc}
*/
+ @Override
public BindRequest setSaslMechanism( String saslMechanism )
{
getDecorated().setSaslMechanism( saslMechanism );
@@ -284,6 +303,7 @@ public class BindRequestDecorator extend
* Length(0x04) + Length(L2) + L2 + Length(authentication)
* </pre>
*/
+ @Override
public int computeLength()
{
// Initialized with version
@@ -365,6 +385,7 @@ public class BindRequestDecorator extend
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -61,6 +61,7 @@ public class BindResponseDecorator exten
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getServerSaslCreds()
{
return getDecorated().getServerSaslCreds();
@@ -70,6 +71,7 @@ public class BindResponseDecorator exten
/**
* {@inheritDoc}
*/
+ @Override
public void setServerSaslCreds( byte[] serverSaslCreds )
{
getDecorated().setServerSaslCreds( serverSaslCreds );
@@ -93,6 +95,7 @@ public class BindResponseDecorator exten
* Length(BindResponse) = Length(0x61) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
BindResponse bindResponse = getDecorated();
@@ -124,6 +127,7 @@ public class BindResponseDecorator exten
* @return The encoded response
* @throws EncoderException when encoding operations fail
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
BindResponse bindResponse = getDecorated();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -80,6 +80,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -89,6 +90,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -100,6 +102,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public Value getAssertionValue()
{
return getDecorated().getAssertionValue();
@@ -109,6 +112,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest setAssertionValue( String value )
{
getDecorated().setAssertionValue( value );
@@ -120,6 +124,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest setAssertionValue( byte[] value )
{
getDecorated().setAssertionValue( value );
@@ -131,6 +136,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public String getAttributeId()
{
return getDecorated().getAttributeId();
@@ -140,6 +146,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest setAttributeId( String attrId )
{
getDecorated().setAttributeId( attrId );
@@ -151,6 +158,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -162,6 +170,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest addControl( Control control )
{
return ( CompareRequest ) super.addControl( control );
@@ -171,6 +180,7 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public CompareRequest addAllControls( Control[] controls )
{
return ( CompareRequest ) super.addAllControls( controls );
@@ -180,7 +190,8 @@ public class CompareRequestDecorator ext
/**
* {@inheritDoc}
*/
- public CompareRequest removeControl( Control control )
+ @Override
+public CompareRequest removeControl( Control control )
{
return ( CompareRequest ) super.removeControl( control );
}
@@ -210,6 +221,7 @@ public class CompareRequestDecorator ext
*
* @return The CompareRequest PDU's length
*/
+ @Override
public int computeLength()
{
// The entry Dn
@@ -220,18 +232,8 @@ public class CompareRequestDecorator ext
attrIdBytes = Strings.getBytesUtf8( getAttributeId() );
avaLength = 1 + TLV.getNbBytes( attrIdBytes.length ) + attrIdBytes.length;
- org.apache.directory.api.ldap.model.entry.Value assertionValue = getAssertionValue();
-
- if ( assertionValue instanceof Value )
- {
- attrValBytes = getAssertionValue().getBytes();
- avaLength += 1 + TLV.getNbBytes( attrValBytes.length ) + attrValBytes.length;
- }
- else
- {
- attrValBytes = Strings.getBytesUtf8( getAssertionValue().getValue() );
- avaLength += 1 + TLV.getNbBytes( attrValBytes.length ) + attrValBytes.length;
- }
+ attrValBytes = getAssertionValue().getBytes();
+ avaLength += 1 + TLV.getNbBytes( attrValBytes.length ) + attrValBytes.length;
compareRequestLength += 1 + TLV.getNbBytes( avaLength ) + avaLength;
@@ -252,6 +254,7 @@ public class CompareRequestDecorator ext
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -62,6 +62,7 @@ public class CompareResponseDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isTrue()
{
return getDecorated().isTrue();
@@ -86,6 +87,7 @@ public class CompareResponseDecorator ex
* Length(CompareResponse) = Length(0x6F) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
compareResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
@@ -99,6 +101,7 @@ public class CompareResponseDecorator ex
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer )
throws EncoderException
{
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -65,6 +65,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -74,6 +75,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public DeleteRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -85,6 +87,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public DeleteRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -96,6 +99,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public DeleteRequest addControl( Control control )
{
return ( DeleteRequest ) super.addControl( control );
@@ -105,6 +109,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public DeleteRequest addAllControls( Control[] controls )
{
return ( DeleteRequest ) super.addAllControls( controls );
@@ -114,6 +119,7 @@ public class DeleteRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public DeleteRequest removeControl( Control control )
{
return ( DeleteRequest ) super.removeControl( control );
@@ -134,6 +140,7 @@ public class DeleteRequestDecorator exte
* Length(DelRequest) = Length(0x4A) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
dnBytes = Strings.getBytesUtf8( getName().getName() );
@@ -154,6 +161,7 @@ public class DeleteRequestDecorator exte
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -73,6 +73,7 @@ public class DeleteResponseDecorator ext
* Length(DelResponse) = Length(0x6B) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
deleteResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
@@ -86,6 +87,7 @@ public class DeleteResponseDecorator ext
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/IntermediateResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -70,6 +70,7 @@ public class IntermediateResponseDecorat
/**
* {@inheritDoc}
*/
+ @Override
public String getResponseName()
{
return getDecorated().getResponseName();
@@ -79,6 +80,7 @@ public class IntermediateResponseDecorat
/**
* {@inheritDoc}
*/
+ @Override
public void setResponseName( String oid )
{
getDecorated().setResponseName( oid );
@@ -88,6 +90,7 @@ public class IntermediateResponseDecorat
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getResponseValue()
{
return getDecorated().getResponseValue();
@@ -97,6 +100,7 @@ public class IntermediateResponseDecorat
/**
* {@inheritDoc}
*/
+ @Override
public void setResponseValue( byte[] value )
{
getDecorated().setResponseValue( value );
@@ -124,6 +128,7 @@ public class IntermediateResponseDecorat
*
* @return The IntermediateResponse length
*/
+ @Override
public int computeLength()
{
intermediateResponseLength = 0;
@@ -159,6 +164,7 @@ public class IntermediateResponseDecorat
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/LdapResultDecorator.java Sat Nov 26 06:53:10 2016
@@ -80,6 +80,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public ResultCodeEnum getResultCode()
{
return decoratedLdapResult.getResultCode();
@@ -89,6 +90,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public void setResultCode( ResultCodeEnum resultCode )
{
decoratedLdapResult.setResultCode( resultCode );
@@ -98,6 +100,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public Dn getMatchedDn()
{
return decoratedLdapResult.getMatchedDn();
@@ -107,6 +110,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public void setMatchedDn( Dn dn )
{
decoratedLdapResult.setMatchedDn( dn );
@@ -116,6 +120,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public String getDiagnosticMessage()
{
return decoratedLdapResult.getDiagnosticMessage();
@@ -125,6 +130,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public void setDiagnosticMessage( String diagnosticMessage )
{
decoratedLdapResult.setDiagnosticMessage( diagnosticMessage );
@@ -134,6 +140,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public boolean isReferral()
{
return decoratedLdapResult.isReferral();
@@ -143,6 +150,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public Referral getReferral()
{
return decoratedLdapResult.getReferral();
@@ -152,6 +160,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public void setReferral( Referral referral )
{
decoratedLdapResult.setReferral( referral );
@@ -161,6 +170,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return decoratedLdapResult.toString();
@@ -196,6 +206,7 @@ public class LdapResultDecorator impleme
* Length(L2) + L2 + Length(0x83) + Length(L3) + L3
* </pre>
*/
+ @Override
public int computeLength()
{
if ( decoratedLdapResult.isDefaultSuccess() )
@@ -204,7 +215,7 @@ public class LdapResultDecorator impleme
return DEFAULT_SUCCESS.length;
}
- int ldapResultLength = 0;
+ int ldapResultLength;
// The result code
ldapResultLength = 1 + 1 + BerValue.getNbBytes( getResultCode().getValue() );
@@ -242,6 +253,7 @@ public class LdapResultDecorator impleme
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
if ( buffer == null )
@@ -288,6 +300,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public LdapResult getDecorated()
{
return decoratedLdapResult;
@@ -297,6 +310,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public LdapApiService getCodecService()
{
return codec;
@@ -306,6 +320,7 @@ public class LdapResultDecorator impleme
/**
* {@inheritDoc}
*/
+ @Override
public boolean isDefaultSuccess()
{
return decoratedLdapResult.isDefaultSuccess();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -73,6 +73,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -82,6 +83,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -93,6 +95,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public Rdn getNewRdn()
{
return getDecorated().getNewRdn();
@@ -102,6 +105,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setNewRdn( Rdn newRdn )
{
getDecorated().setNewRdn( newRdn );
@@ -113,6 +117,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean getDeleteOldRdn()
{
return getDecorated().getDeleteOldRdn();
@@ -122,6 +127,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn )
{
getDecorated().setDeleteOldRdn( deleteOldRdn );
@@ -133,6 +139,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public Dn getNewSuperior()
{
return getDecorated().getNewSuperior();
@@ -142,6 +149,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setNewSuperior( Dn newSuperior )
{
getDecorated().setNewSuperior( newSuperior );
@@ -153,6 +161,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isMove()
{
return getDecorated().isMove();
@@ -162,6 +171,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -173,6 +183,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest addControl( Control control )
{
return ( ModifyDnRequest ) super.addControl( control );
@@ -182,6 +193,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest addAllControls( Control[] controls )
{
return ( ModifyDnRequest ) super.addAllControls( controls );
@@ -191,6 +203,7 @@ public class ModifyDnRequestDecorator ex
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest removeControl( Control control )
{
return ( ModifyDnRequest ) super.removeControl( control );
@@ -258,6 +271,7 @@ public class ModifyDnRequestDecorator ex
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -71,6 +71,7 @@ public class ModifyDnResponseDecorator e
* Length(ModifyDNResponse) = Length(0x6D) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
modifyDnResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
@@ -84,6 +85,7 @@ public class ModifyDnResponseDecorator e
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -156,6 +156,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -165,6 +166,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -176,6 +178,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public Collection<Modification> getModifications()
{
return getDecorated().getModifications();
@@ -185,6 +188,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addModification( Modification mod )
{
getDecorated().addModification( mod );
@@ -196,6 +200,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest removeModification( Modification mod )
{
getDecorated().removeModification( mod );
@@ -207,6 +212,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( String attributeName, String... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
@@ -229,6 +235,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( Attribute attr )
{
getDecorated().remove( attr );
@@ -240,6 +247,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( String attributeName )
{
getDecorated().remove( attributeName );
@@ -251,6 +259,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
@@ -262,6 +271,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest add( String attributeName, String... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
@@ -284,6 +294,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest add( Attribute attr )
{
getDecorated().add( attr );
@@ -295,6 +306,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( String attributeName )
{
getDecorated().replace( attributeName );
@@ -306,6 +318,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( String attributeName, String... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
@@ -328,6 +341,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( Attribute attr )
{
getDecorated().replace( attr );
@@ -339,6 +353,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -350,6 +365,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addControl( Control control )
{
return ( ModifyRequest ) super.addControl( control );
@@ -359,6 +375,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addAllControls( Control[] controls )
{
return ( ModifyRequest ) super.addAllControls( controls );
@@ -368,6 +385,7 @@ public class ModifyRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest removeControl( Control control )
{
return ( ModifyRequest ) super.removeControl( control );
@@ -419,6 +437,7 @@ public class ModifyRequestDecorator exte
* +--> 0x04 L8-2-n attributeValue
* </pre>
*/
+ @Override
public int computeLength()
{
// Initialized with name
@@ -430,11 +449,11 @@ public class ModifyRequestDecorator exte
Collection<Modification> modifications = getModifications();
- if ( ( modifications != null ) && ( modifications.size() != 0 ) )
+ if ( ( modifications != null ) && ( !modifications.isEmpty() ) )
{
- changeLength = new LinkedList<Integer>();
- modificationLength = new LinkedList<Integer>();
- valuesLength = new LinkedList<Integer>();
+ changeLength = new LinkedList<>();
+ modificationLength = new LinkedList<>();
+ valuesLength = new LinkedList<>();
for ( Modification modification : modifications )
{
@@ -518,6 +537,7 @@ public class ModifyRequestDecorator exte
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
@@ -536,7 +556,7 @@ public class ModifyRequestDecorator exte
// The modifications list
Collection<Modification> modifications = getModifications();
- if ( ( modifications != null ) && ( modifications.size() != 0 ) )
+ if ( ( modifications != null ) && ( !modifications.isEmpty() ) )
{
int modificationNumber = 0;
@@ -582,7 +602,7 @@ public class ModifyRequestDecorator exte
}
}
- // Go to the next modification number;
+ // Go to the next modification number
modificationNumber++;
}
}
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -72,6 +72,7 @@ public class ModifyResponseDecorator ext
* Length(ModifyResponse) = Length(0x67) + Length(L1) + L1
* </pre>
*/
+ @Override
public int computeLength()
{
modifyResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
@@ -85,6 +86,7 @@ public class ModifyResponseDecorator ext
*
* @param buffer The buffer where to put the PDU
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/RequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -49,6 +49,7 @@ public abstract class RequestDecorator<M
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasResponse()
{
return ( getDecorated() ).hasResponse();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResponseDecorator.java Sat Nov 26 06:53:10 2016
@@ -47,13 +47,14 @@ public abstract class ResponseDecorator<
{
super( codec, decoratedMessage );
- ldapResultDecorator = new LdapResultDecorator( codec, ( ( ResultResponse ) decoratedMessage ).getLdapResult() );
+ ldapResultDecorator = new LdapResultDecorator( codec, decoratedMessage.getLdapResult() );
}
/**
* @return the ldapResultDecorator
*/
+ @Override
public LdapResult getLdapResult()
{
return ldapResultDecorator;
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -48,6 +48,7 @@ public abstract class ResultResponseRequ
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasResponse()
{
return getDecorated().hasResponse();
@@ -57,6 +58,7 @@ public abstract class ResultResponseRequ
/**
* {@inheritDoc}
*/
+ @Override
public ResultResponse getResultResponse()
{
return getDecorated().getResultResponse();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java Sat Nov 26 06:53:10 2016
@@ -184,6 +184,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setFilter( ExprNode filter )
{
topFilter = transform( filter );
@@ -195,6 +196,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setFilter( String filter ) throws LdapException
{
getDecorated().setFilter( filter );
@@ -335,7 +337,7 @@ public class SearchRequestDecorator exte
// Transform OR, AND or NOT leaves
if ( filter instanceof ConnectorFilter )
{
- BranchNode branch = null;
+ BranchNode branch;
if ( filter instanceof AndFilter )
{
@@ -345,7 +347,7 @@ public class SearchRequestDecorator exte
{
branch = new OrNode();
}
- else if ( filter instanceof NotFilter )
+ else
{
branch = new NotNode();
}
@@ -422,7 +424,7 @@ public class SearchRequestDecorator exte
if ( substrFilter.getAnySubstrings() != null )
{
- anyString = new ArrayList<String>();
+ anyString = new ArrayList<>();
for ( String any : substrFilter.getAnySubstrings() )
{
@@ -482,7 +484,7 @@ public class SearchRequestDecorator exte
{
filter = new OrFilter();
}
- else if ( exprNode instanceof NotNode )
+ else
{
filter = new NotFilter();
}
@@ -662,7 +664,7 @@ public class SearchRequestDecorator exte
return false;
}
- if ( ( o == null ) || ( o instanceof SearchRequestDecorator ) )
+ if ( o instanceof SearchRequestDecorator )
{
return false;
}
@@ -714,6 +716,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum[] getResponseTypes()
{
return getDecorated().getResponseTypes();
@@ -723,6 +726,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public Dn getBase()
{
return getDecorated().getBase();
@@ -732,6 +736,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setBase( Dn baseDn )
{
getDecorated().setBase( baseDn );
@@ -743,6 +748,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchScope getScope()
{
return getDecorated().getScope();
@@ -752,6 +758,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setScope( SearchScope scope )
{
getDecorated().setScope( scope );
@@ -763,6 +770,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public AliasDerefMode getDerefAliases()
{
return getDecorated().getDerefAliases();
@@ -772,6 +780,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases )
{
getDecorated().setDerefAliases( aliasDerefAliases );
@@ -783,6 +792,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public long getSizeLimit()
{
return getDecorated().getSizeLimit();
@@ -792,6 +802,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setSizeLimit( long entriesMax )
{
getDecorated().setSizeLimit( entriesMax );
@@ -803,6 +814,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public int getTimeLimit()
{
return getDecorated().getTimeLimit();
@@ -812,6 +824,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setTimeLimit( int secondsMax )
{
getDecorated().setTimeLimit( secondsMax );
@@ -823,6 +836,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public boolean getTypesOnly()
{
return getDecorated().getTypesOnly();
@@ -832,6 +846,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setTypesOnly( boolean typesOnly )
{
getDecorated().setTypesOnly( typesOnly );
@@ -843,6 +858,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public ExprNode getFilter()
{
return getDecorated().getFilter();
@@ -852,6 +868,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getAttributes()
{
return getDecorated().getAttributes();
@@ -861,6 +878,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addAttributes( String... attributes )
{
getDecorated().addAttributes( attributes );
@@ -872,6 +890,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest removeAttribute( String attribute )
{
getDecorated().removeAttribute( attribute );
@@ -908,6 +927,7 @@ public class SearchRequestDecorator exte
* +--> 0x04 L4-n Attribute description
* </pre>
*/
+ @Override
public int computeLength()
{
searchRequestLength = 0;
@@ -939,7 +959,7 @@ public class SearchRequestDecorator exte
// The attributes description list
attributeDescriptionListLength = 0;
- if ( ( getAttributes() != null ) && ( getAttributes().size() != 0 ) )
+ if ( ( getAttributes() != null ) && ( !getAttributes().isEmpty() ) )
{
attributeNameBytes = new byte[getAttributes().size()][];
int attributeNb = 0;
@@ -984,6 +1004,7 @@ public class SearchRequestDecorator exte
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
@@ -1017,7 +1038,7 @@ public class SearchRequestDecorator exte
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( attributeDescriptionListLength ) );
- if ( ( getAttributes() != null ) && ( getAttributes().size() != 0 ) )
+ if ( ( getAttributes() != null ) && ( !getAttributes().isEmpty() ) )
{
// encode each attribute
for ( byte[] attributeBytes : attributeNameBytes )
@@ -1035,30 +1056,35 @@ public class SearchRequestDecorator exte
}
+ @Override
public SearchResultDone getResultResponse()
{
return ( SearchResultDone ) getDecorated().getResultResponse();
}
+ @Override
public boolean hasResponse()
{
return getDecorated().hasResponse();
}
+ @Override
public void abandon()
{
getDecorated().abandon();
}
+ @Override
public boolean isAbandoned()
{
return getDecorated().isAbandoned();
}
+ @Override
public SearchRequest addAbandonListener( AbandonListener listener )
{
getDecorated().addAbandonListener( listener );
@@ -1070,6 +1096,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setMessageId( int messageId )
{
return ( SearchRequest ) super.setMessageId( messageId );
@@ -1079,6 +1106,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addControl( Control control )
{
return ( SearchRequest ) super.addControl( control );
@@ -1088,6 +1116,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addAllControls( Control[] controls )
{
return ( SearchRequest ) super.addAllControls( controls );
@@ -1097,6 +1126,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest removeControl( Control control )
{
return ( SearchRequest ) super.removeControl( control );
@@ -1106,6 +1136,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public boolean isFollowReferrals()
{
return getDecorated().isFollowReferrals();
@@ -1115,6 +1146,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest followReferrals()
{
return getDecorated().followReferrals();
@@ -1124,7 +1156,8 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
- public boolean isIgnoreReferrals()
+ @Override
+public boolean isIgnoreReferrals()
{
return getDecorated().isIgnoreReferrals();
}
@@ -1133,6 +1166,7 @@ public class SearchRequestDecorator exte
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest ignoreReferrals()
{
return getDecorated().ignoreReferrals();
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultDoneDecorator.java Sat Nov 26 06:53:10 2016
@@ -72,6 +72,7 @@ public class SearchResultDoneDecorator e
* </pre>
*
*/
+ @Override
public int computeLength()
{
searchResultDoneLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
@@ -87,6 +88,7 @@ public class SearchResultDoneDecorator e
* return The encoded response
* @throws EncoderException If the encoding failed
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1771408&r1=1771407&r2=1771408&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java Sat Nov 26 06:53:10 2016
@@ -144,6 +144,7 @@ public class SearchResultEntryDecorator
/**
* {@inheritDoc}
*/
+ @Override
public Dn getObjectName()
{
return getDecorated().getObjectName();
@@ -153,6 +154,7 @@ public class SearchResultEntryDecorator
/**
* {@inheritDoc}
*/
+ @Override
public void setObjectName( Dn objectName )
{
getDecorated().setObjectName( objectName );
@@ -162,6 +164,7 @@ public class SearchResultEntryDecorator
/**
* {@inheritDoc}
*/
+ @Override
public Entry getEntry()
{
return getDecorated().getEntry();
@@ -171,6 +174,7 @@ public class SearchResultEntryDecorator
/**
* {@inheritDoc}
*/
+ @Override
public void setEntry( Entry entry )
{
getDecorated().setEntry( entry );
@@ -221,6 +225,7 @@ public class SearchResultEntryDecorator
* +--> 0x04 L7-m-n value
* </pre>
*/
+ @Override
public int computeLength()
{
Dn dn = getObjectName();
@@ -237,17 +242,17 @@ public class SearchResultEntryDecorator
if ( ( entry != null ) && ( entry.size() != 0 ) )
{
- attributeLength = new LinkedList<Integer>();
- attributeIds = new LinkedList<byte[]>();
- valuesLength = new LinkedList<Integer>();
+ attributeLength = new LinkedList<>();
+ attributeIds = new LinkedList<>();
+ valuesLength = new LinkedList<>();
// Store those lists in the object
- valuesLength = new LinkedList<Integer>();
+ valuesLength = new LinkedList<>();
// Compute the attributes length
for ( Attribute attribute : entry )
{
- int localAttributeLength = 0;
+ int localAttributeLength;
int localValuesLength = 0;
// Get the type length
@@ -329,6 +334,7 @@ public class SearchResultEntryDecorator
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
+ @Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
try
@@ -375,7 +381,7 @@ public class SearchResultEntryDecorator
}
}
- // Go to the next attribute number;
+ // Go to the next attribute number
attributeNumber++;
}
}