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 2012/01/24 18:27:12 UTC
svn commit: r1235364 [10/27] - in /directory/shared/trunk:
asn1/api/src/main/java/org/apache/directory/shared/asn1/util/
asn1/api/src/test/java/org/apache/directory/shared/asn1/util/
asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/ asn1...
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java Tue Jan 24 17:27:00 2012
@@ -78,7 +78,7 @@ public final class PersistentSearchGramm
setName( PersistentSearchGrammar.class.getName() );
// Create the transitions table
- super.transitions = new GrammarTransition[ PersistentSearchStates.LAST_PSEARCH_STATE.ordinal()][256];
+ super.transitions = new GrammarTransition[PersistentSearchStates.LAST_PSEARCH_STATE.ordinal()][256];
/**
* Transition from initial state to Psearch sequence
@@ -87,11 +87,10 @@ public final class PersistentSearchGramm
*
* Initialize the persistence search object
*/
- super.transitions[ PersistentSearchStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
+ super.transitions[PersistentSearchStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
new GrammarTransition<PersistentSearchContainer>( PersistentSearchStates.START_STATE,
- PersistentSearchStates.PSEARCH_SEQUENCE_STATE,
- UniversalTag.SEQUENCE.getValue(), null );
-
+ PersistentSearchStates.PSEARCH_SEQUENCE_STATE,
+ UniversalTag.SEQUENCE.getValue(), null );
/**
* Transition from Psearch sequence to Change types
@@ -101,38 +100,38 @@ public final class PersistentSearchGramm
*
* Stores the change types value
*/
- super.transitions[ PersistentSearchStates.PSEARCH_SEQUENCE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[PersistentSearchStates.PSEARCH_SEQUENCE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
new GrammarTransition<PersistentSearchContainer>( PersistentSearchStates.PSEARCH_SEQUENCE_STATE,
PersistentSearchStates.CHANGE_TYPES_STATE,
UniversalTag.INTEGER.getValue(),
new GrammarAction<PersistentSearchContainer>( "Set PSearchControl changeTypes" )
- {
- public void action( PersistentSearchContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- try
+ public void action( PersistentSearchContainer container ) throws DecoderException
{
- // Check that the value is into the allowed interval
- int changeTypes = IntegerDecoder.parse( value,
- PersistentSearch.CHANGE_TYPES_MIN,
- PersistentSearch.CHANGE_TYPES_MAX );
-
- if ( IS_DEBUG )
+ Value value = container.getCurrentTLV().getValue();
+
+ try
{
- LOG.debug( "changeTypes = " + changeTypes );
- }
+ // Check that the value is into the allowed interval
+ int changeTypes = IntegerDecoder.parse( value,
+ PersistentSearch.CHANGE_TYPES_MIN,
+ PersistentSearch.CHANGE_TYPES_MAX );
+
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "changeTypes = " + changeTypes );
+ }
- container.getPersistentSearchDecorator().setChangeTypes( changeTypes );
- }
- catch ( IntegerDecoderException e )
- {
- String msg = I18n.err( I18n.ERR_04051 );
- LOG.error( msg, e );
- throw new DecoderException( msg );
+ container.getPersistentSearchDecorator().setChangeTypes( changeTypes );
+ }
+ catch ( IntegerDecoderException e )
+ {
+ String msg = I18n.err( I18n.ERR_04051 );
+ LOG.error( msg, e );
+ throw new DecoderException( msg );
+ }
}
- }
- } );
+ } );
/**
* Transition from Change types to Changes only
@@ -143,34 +142,34 @@ public final class PersistentSearchGramm
*
* Stores the change only flag
*/
- super.transitions[ PersistentSearchStates.CHANGE_TYPES_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
+ super.transitions[PersistentSearchStates.CHANGE_TYPES_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition<PersistentSearchContainer>( PersistentSearchStates.CHANGE_TYPES_STATE,
- PersistentSearchStates.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN.getValue(),
+ PersistentSearchStates.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction<PersistentSearchContainer>( "Set PSearchControl changesOnly" )
- {
- public void action( PersistentSearchContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- try
+ public void action( PersistentSearchContainer container ) throws DecoderException
{
- boolean changesOnly = BooleanDecoder.parse( value );
+ Value value = container.getCurrentTLV().getValue();
- if ( IS_DEBUG )
+ try
{
- LOG.debug( "changesOnly = " + changesOnly );
- }
+ boolean changesOnly = BooleanDecoder.parse( value );
- container.getPersistentSearchDecorator().setChangesOnly( changesOnly );
- }
- catch ( BooleanDecoderException e )
- {
- String msg = I18n.err( I18n.ERR_04052 );
- LOG.error( msg, e );
- throw new DecoderException( msg );
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "changesOnly = " + changesOnly );
+ }
+
+ container.getPersistentSearchDecorator().setChangesOnly( changesOnly );
+ }
+ catch ( BooleanDecoderException e )
+ {
+ String msg = I18n.err( I18n.ERR_04052 );
+ LOG.error( msg, e );
+ throw new DecoderException( msg );
+ }
}
- }
- } );
+ } );
/**
* Transition from Change types to Changes only
@@ -181,37 +180,37 @@ public final class PersistentSearchGramm
*
* Stores the return ECs flag
*/
- super.transitions[ PersistentSearchStates.CHANGES_ONLY_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
+ super.transitions[PersistentSearchStates.CHANGES_ONLY_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition<PersistentSearchContainer>( PersistentSearchStates.CHANGES_ONLY_STATE,
- PersistentSearchStates.RETURN_ECS_STATE, UniversalTag.BOOLEAN.getValue(),
+ PersistentSearchStates.RETURN_ECS_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction<PersistentSearchContainer>( "Set PSearchControl returnECs" )
- {
- public void action( PersistentSearchContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- try
+ public void action( PersistentSearchContainer container ) throws DecoderException
{
- boolean returnECs = BooleanDecoder.parse( value );
+ Value value = container.getCurrentTLV().getValue();
- if ( IS_DEBUG )
+ try
{
- LOG.debug( "returnECs = " + returnECs );
- }
+ boolean returnECs = BooleanDecoder.parse( value );
- container.getPersistentSearchDecorator().setReturnECs( returnECs );
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "returnECs = " + returnECs );
+ }
- // We can have an END transition
- container.setGrammarEndAllowed( true );
- }
- catch ( BooleanDecoderException e )
- {
- String msg = I18n.err( I18n.ERR_04053 );
- LOG.error( msg, e );
- throw new DecoderException( msg );
+ container.getPersistentSearchDecorator().setReturnECs( returnECs );
+
+ // We can have an END transition
+ container.setGrammarEndAllowed( true );
+ }
+ catch ( BooleanDecoderException e )
+ {
+ String msg = I18n.err( I18n.ERR_04053 );
+ LOG.error( msg, e );
+ throw new DecoderException( msg );
+ }
}
- }
- } );
+ } );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java Tue Jan 24 17:27:00 2012
@@ -49,7 +49,7 @@ public enum PersistentSearchStates imple
/** changeTypes Value */
CHANGE_TYPES_STATE,
-
+
/** changesOnly Value */
CHANGES_ONLY_STATE,
@@ -59,7 +59,6 @@ public enum PersistentSearchStates imple
/** terminal state */
LAST_PSEARCH_STATE;
-
/**
* Get the grammar name
*
@@ -99,7 +98,7 @@ public enum PersistentSearchStates imple
return ( ( state == END_STATE.ordinal() ) ? "PSEARCH_END_STATE" : name() );
}
-
+
/**
* {@inheritDoc}
*/
@@ -107,8 +106,8 @@ public enum PersistentSearchStates imple
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java Tue Jan 24 17:27:00 2012
@@ -45,7 +45,7 @@ public class SubentriesDecorator extends
/** The sub entry decoder */
private static final Asn1Decoder decoder = new Asn1Decoder();
-
+
/**
* Default constructor
*/
@@ -95,8 +95,8 @@ public class SubentriesDecorator extends
return buffer;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -105,13 +105,13 @@ public class SubentriesDecorator extends
if ( value == null )
{
try
- {
+ {
computeLength();
ByteBuffer buffer = ByteBuffer.allocate( valueLength );
-
+
// Now encode the Subentries specific part
Value.encode( buffer, isVisible() );
-
+
value = buffer.array();
}
catch ( Exception e )
@@ -119,7 +119,7 @@ public class SubentriesDecorator extends
return null;
}
}
-
+
return value;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java Tue Jan 24 17:27:00 2012
@@ -36,8 +36,8 @@ public class SubentriesFactory implement
{
/** The LDAP codec service */
private LdapApiService codec;
-
-
+
+
/**
* Creates a new instance of SubentriesFactory.
*
@@ -47,8 +47,8 @@ public class SubentriesFactory implement
{
this.codec = codec;
}
-
-
+
+
/**
*
* {@inheritDoc}
@@ -58,7 +58,7 @@ public class SubentriesFactory implement
return Subentries.OID;
}
-
+
/**
*
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java Tue Jan 24 17:27:00 2012
@@ -60,41 +60,41 @@ public final class SubentriesGrammar ext
setName( SubentriesGrammar.class.getName() );
// Create the transitions table
- super.transitions = new GrammarTransition[ SubentriesStates.LAST_SUB_ENTRY_STATE.ordinal()][256];
+ super.transitions = new GrammarTransition[SubentriesStates.LAST_SUB_ENTRY_STATE.ordinal()][256];
- super.transitions[ SubentriesStates.START_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
+ super.transitions[SubentriesStates.START_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition<SubentriesContainer>( SubentriesStates.START_STATE,
- SubentriesStates.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN.getValue(),
+ SubentriesStates.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction<SubentriesContainer>( "SubEntryControl visibility" )
- {
- public void action( SubentriesContainer container ) throws DecoderException
{
- TLV tlv = container.getCurrentTLV();
-
- // We get the value. If it's a 0, it's a FALSE. If it's
- // a FF, it's a TRUE. Any other value should be an error,
- // but we could relax this constraint. So if we have
- // something
- // which is not 0, it will be interpreted as TRUE, but we
- // will generate a warning.
- Value value = tlv.getValue();
-
- try
- {
- container.getSubentriesControl().setVisibility( BooleanDecoder.parse( value ) );
-
- // We can have an END transition
- container.setGrammarEndAllowed( true );
- }
- catch ( BooleanDecoderException bde )
+ public void action( SubentriesContainer container ) throws DecoderException
{
- LOG.error( I18n.err( I18n.ERR_04054, Strings.dumpBytes( value.getData()), bde.getMessage() ) );
+ TLV tlv = container.getCurrentTLV();
- // This will generate a PROTOCOL_ERROR
- throw new DecoderException( bde.getMessage() );
+ // We get the value. If it's a 0, it's a FALSE. If it's
+ // a FF, it's a TRUE. Any other value should be an error,
+ // but we could relax this constraint. So if we have
+ // something
+ // which is not 0, it will be interpreted as TRUE, but we
+ // will generate a warning.
+ Value value = tlv.getValue();
+
+ try
+ {
+ container.getSubentriesControl().setVisibility( BooleanDecoder.parse( value ) );
+
+ // We can have an END transition
+ container.setGrammarEndAllowed( true );
+ }
+ catch ( BooleanDecoderException bde )
+ {
+ LOG.error( I18n.err( I18n.ERR_04054, Strings.dumpBytes( value.getData() ), bde.getMessage() ) );
+
+ // This will generate a PROTOCOL_ERROR
+ throw new DecoderException( bde.getMessage() );
+ }
}
- }
- } );
+ } );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java Tue Jan 24 17:27:00 2012
@@ -51,7 +51,6 @@ public enum SubentriesStates implements
/** terminal state */
LAST_SUB_ENTRY_STATE;
-
/**
* Get the grammar name
*
@@ -92,7 +91,7 @@ public enum SubentriesStates implements
return ( ( state == END_STATE.ordinal() ) ? "SUB_ENTRY_END_STATE" : name() );
}
-
+
/**
* {@inheritDoc}
*/
@@ -100,8 +99,8 @@ public enum SubentriesStates implements
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -55,8 +55,7 @@ public final class AbandonRequestDecorat
//-------------------------------------------------------------------------
// The AbandonRequest methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -72,54 +71,53 @@ public final class AbandonRequestDecorat
public AbandonRequest setAbandoned( int requestId )
{
getDecorated().setAbandoned( requestId );
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public AbandonRequest addControl( Control control ) throws MessageException
{
- return (AbandonRequest)super.addControl( control );
+ return ( AbandonRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest addAllControls( Control[] controls ) throws MessageException
{
- return (AbandonRequest)super.addAllControls( controls );
+ return ( AbandonRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest removeControl( Control control ) throws MessageException
{
- return (AbandonRequest)super.removeControl( control );
+ return ( AbandonRequest ) super.removeControl( control );
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Encode the Abandon protocolOp part
*/
@@ -142,7 +140,7 @@ public final class AbandonRequestDecorat
String msg = I18n.err( I18n.ERR_04005 );
throw new EncoderException( msg );
}
-
+
return buffer;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -31,8 +31,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbandonableRequestDecorator<M extends AbandonableResultResponseRequest<R>, R extends ResultResponse>
- extends ResultResponseRequestDecorator<M,R>
+public abstract class AbandonableRequestDecorator<M extends AbandonableResultResponseRequest<R>, R extends ResultResponse>
+ extends ResultResponseRequestDecorator<M, R>
implements AbandonableRequest
{
/**
@@ -45,7 +45,7 @@ public abstract class AbandonableRequest
super( codec, decoratedMessage );
}
-
+
/**
* Gets the decorated AbandonableRequest.
*
@@ -55,8 +55,8 @@ public abstract class AbandonableRequest
{
return getDecorated();
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -65,7 +65,7 @@ public abstract class AbandonableRequest
getAbandonableRequest().abandon();
}
-
+
/**
* {@inheritDoc}
*/
@@ -81,7 +81,7 @@ public abstract class AbandonableRequest
public AbandonableRequest addAbandonListener( AbandonListener listener )
{
getAbandonableRequest().addAbandonListener( listener );
-
+
return this;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequest.java Tue Jan 24 17:27:00 2012
@@ -29,6 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface AbandonableResultResponseRequest<R extends ResultResponse> extends ResultResponseRequest<R>, AbandonableRequest
+public interface AbandonableResultResponseRequest<R extends ResultResponse> extends ResultResponseRequest<R>,
+ AbandonableRequest
{
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbandonableResultResponseRequestDecorator<M extends AbandonableResultResponseRequest<R>,
- R extends ResultResponse> extends AbandonableRequestDecorator<M,R> implements ResultResponseRequest<R>
+public abstract class AbandonableResultResponseRequestDecorator<M extends AbandonableResultResponseRequest<R>, R extends ResultResponse>
+ extends AbandonableRequestDecorator<M, R> implements ResultResponseRequest<R>
{
/**
* Makes Request a MessageDecorator.
@@ -42,7 +42,7 @@ public abstract class AbandonableResultR
{
super( codec, decoratedMessage );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -48,7 +48,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class AddRequestDecorator extends SingleReplyRequestDecorator<AddRequest,AddResponse> implements AddRequest
+public final class AddRequestDecorator extends SingleReplyRequestDecorator<AddRequest, AddResponse> implements
+ AddRequest
{
/** The add request length */
private int addRequestLength;
@@ -65,7 +66,7 @@ public final class AddRequestDecorator e
/** The current attribute being decoded */
private Attribute currentAttribute;
-
+
/**
* Makes a AddRequest a MessageDecorator.
*
@@ -151,41 +152,43 @@ public final class AddRequestDecorator e
{
return valuesLength;
}
+
+
/**
* {@inheritDoc}
*/
public AddRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public AddRequest addControl( Control control ) throws MessageException
{
- return (AddRequest)super.addControl( control );
+ return ( AddRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AddRequest addAllControls( Control[] controls ) throws MessageException
{
- return (AddRequest)super.addAllControls( controls );
+ return ( AddRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AddRequest removeControl( Control control ) throws MessageException
{
- return (AddRequest)super.removeControl( control );
+ return ( AddRequest ) super.removeControl( control );
}
@@ -193,7 +196,6 @@ public final class AddRequestDecorator e
// The AddRequest methods
//-------------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -209,7 +211,7 @@ public final class AddRequestDecorator e
public AddRequest setEntryDn( Dn entry )
{
getDecorated().setEntryDn( entry );
-
+
return this;
}
@@ -229,11 +231,11 @@ public final class AddRequestDecorator e
public AddRequest setEntry( Entry entry )
{
getDecorated().setEntry( entry );
-
+
return this;
}
-
+
/**
* Create a new attributeValue
*
@@ -294,8 +296,8 @@ public final class AddRequestDecorator e
{
currentAttribute.add( value );
}
-
-
+
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -349,7 +351,7 @@ public final class AddRequestDecorator e
}
// The entry Dn
- int addRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(entry.getDn()) ) + Dn.getNbBytes(entry.getDn());
+ int addRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes( entry.getDn() ) ) + Dn.getNbBytes( entry.getDn() );
// The attributes sequence
int entryLength = 0;
@@ -484,7 +486,7 @@ public final class AddRequestDecorator e
attributeNumber++;
}
}
-
+
return buffer;
}
catch ( BufferOverflowException boe )
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -80,7 +80,7 @@ public class AddResponseDecorator extend
return addResponseLength;
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -101,7 +101,7 @@ public class AddResponseDecorator extend
{
AddResponse addResponse = getAddResponse();
setLdapResult( new LdapResultDecorator( addResponse.getLdapResult() ) );
- int addResponseLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int addResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setAddResponseLength( addResponseLength );
@@ -124,8 +124,8 @@ public class AddResponseDecorator extend
buffer.put( TLV.getBytes( getAddResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
-
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
+
return buffer;
}
catch ( BufferOverflowException boe )
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -442,7 +442,7 @@ public class BindRequestDecorator extend
if ( !Dn.isNullOrEmpty( dn ) )
{
// A DN has been provided
-
+
Value.encode( buffer, Dn.getBytes( dn ) );
}
else
@@ -455,7 +455,7 @@ public class BindRequestDecorator extend
{
name = "";
}
-
+
Value.encode( buffer, name.getBytes() );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -75,8 +75,7 @@ public class BindResponseDecorator exten
//-------------------------------------------------------------------------
// The BindResponse methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -93,8 +92,8 @@ public class BindResponseDecorator exten
{
getDecorated().setServerSaslCreds( serverSaslCreds );
}
-
-
+
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -115,7 +114,7 @@ public class BindResponseDecorator exten
public int computeLength()
{
BindResponse bindResponse = getDecorated();
- int ldapResultLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int ldapResultLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
int bindResponseLength = ldapResultLength;
@@ -156,7 +155,7 @@ public class BindResponseDecorator exten
buffer.put( TLV.getBytes( getBindResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
// The serverSaslCredential, if any
byte[] serverSaslCreds = bindResponse.getServerSaslCreds();
@@ -177,7 +176,7 @@ public class BindResponseDecorator exten
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -44,7 +44,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareRequestDecorator extends SingleReplyRequestDecorator<CompareRequest, CompareResponse>
+public class CompareRequestDecorator extends SingleReplyRequestDecorator<CompareRequest, CompareResponse>
implements CompareRequest
{
/** The bytes of the attribute id used in the comparison */
@@ -157,7 +157,6 @@ public class CompareRequestDecorator ext
// The CompareRequest methods
//-------------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -173,7 +172,7 @@ public class CompareRequestDecorator ext
public CompareRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
@@ -193,7 +192,7 @@ public class CompareRequestDecorator ext
public CompareRequest setAssertionValue( String value )
{
getDecorated().setAssertionValue( value );
-
+
return this;
}
@@ -204,7 +203,7 @@ public class CompareRequestDecorator ext
public CompareRequest setAssertionValue( byte[] value )
{
getDecorated().setAssertionValue( value );
-
+
return this;
}
@@ -224,49 +223,49 @@ public class CompareRequestDecorator ext
public CompareRequest setAttributeId( String attrId )
{
getDecorated().setAttributeId( attrId );
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public CompareRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public CompareRequest addControl( Control control ) throws MessageException
{
- return (CompareRequest)super.addControl( control );
+ return ( CompareRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public CompareRequest addAllControls( Control[] controls ) throws MessageException
{
- return (CompareRequest)super.addAllControls( controls );
+ return ( CompareRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public CompareRequest removeControl( Control control ) throws MessageException
{
- return (CompareRequest)super.removeControl( control );
+ return ( CompareRequest ) super.removeControl( control );
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -360,7 +359,7 @@ public class CompareRequestDecorator ext
// The assertionValue
org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer, ( byte[] ) getAttrValBytes() );
-
+
return buffer;
}
- }
+}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareResponseDecorator extends ResponseDecorator<CompareResponse>
+public class CompareResponseDecorator extends ResponseDecorator<CompareResponse>
implements CompareResponse
{
/** The encoded compareResponse length */
@@ -77,7 +77,6 @@ public class CompareResponseDecorator ex
// The CompareResponse methods
//-------------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -86,11 +85,10 @@ public class CompareResponseDecorator ex
return getDecorated().isTrue();
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
/**
* Compute the CompareResponse length
@@ -107,7 +105,7 @@ public class CompareResponseDecorator ex
*/
public int computeLength()
{
- int compareResponseLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int compareResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setCompareResponseLength( compareResponseLength );
@@ -130,13 +128,13 @@ public class CompareResponseDecorator ex
buffer.put( TLV.getBytes( getCompareResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
}
catch ( BufferOverflowException boe )
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DeleteRequestDecorator extends SingleReplyRequestDecorator<DeleteRequest, DeleteResponse>
+public class DeleteRequestDecorator extends SingleReplyRequestDecorator<DeleteRequest, DeleteResponse>
implements DeleteRequest
{
/**
@@ -58,7 +58,6 @@ public class DeleteRequestDecorator exte
// The DeleteRequest methods
//-------------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -74,49 +73,49 @@ public class DeleteRequestDecorator exte
public DeleteRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public DeleteRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public DeleteRequest addControl( Control control ) throws MessageException
{
- return (DeleteRequest)super.addControl( control );
+ return ( DeleteRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public DeleteRequest addAllControls( Control[] controls ) throws MessageException
{
- return (DeleteRequest)super.addAllControls( controls );
+ return ( DeleteRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public DeleteRequest removeControl( Control control ) throws MessageException
{
- return (DeleteRequest)super.removeControl( control );
+ return ( DeleteRequest ) super.removeControl( control );
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -159,7 +158,7 @@ public class DeleteRequestDecorator exte
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DeleteResponseDecorator extends ResponseDecorator<DeleteResponse>
+public class DeleteResponseDecorator extends ResponseDecorator<DeleteResponse>
implements DeleteResponse
{
/** The encoded deleteResponse length */
@@ -72,12 +72,11 @@ public class DeleteResponseDecorator ext
return deleteResponseLength;
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the DelResponse length
*
@@ -93,7 +92,7 @@ public class DeleteResponseDecorator ext
*/
public int computeLength()
{
- int deleteResponseLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int deleteResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setDeleteResponseLength( deleteResponseLength );
@@ -115,13 +114,13 @@ public class DeleteResponseDecorator ext
buffer.put( TLV.getBytes( getDeleteResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
}
catch ( BufferOverflowException boe )
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -38,7 +38,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class IntermediateResponseDecorator extends MessageDecorator<IntermediateResponse>
+public class IntermediateResponseDecorator extends MessageDecorator<IntermediateResponse>
implements IntermediateResponse
{
/** The response name as a byte[] */
@@ -100,12 +100,11 @@ public class IntermediateResponseDecorat
this.responseNameBytes = responseNameBytes;
}
-
+
//-------------------------------------------------------------------------
// The IntermediateResponse methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -140,8 +139,8 @@ public class IntermediateResponseDecorat
{
getDecorated().setResponseValue( value );
}
-
-
+
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -234,7 +233,7 @@ public class IntermediateResponseDecorat
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java Tue Jan 24 17:27:00 2012
@@ -52,7 +52,7 @@ public class LdapResultDecorator impleme
/** Temporary storage of the byte[] representing the matchedDN */
private byte[] matchedDnBytes;
-
+
/** The codec responsible for encoding and decoding this object. */
private LdapApiService codec;
@@ -71,7 +71,7 @@ public class LdapResultDecorator impleme
/**
* @return The encoded Error message
*/
- public byte[] getErrorMessageBytes()
+ public byte[] getErrorMessageBytes()
{
return errorMessageBytes;
}
@@ -110,8 +110,7 @@ public class LdapResultDecorator impleme
//-------------------------------------------------------------------------
// The LdapResult methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -192,7 +191,7 @@ public class LdapResultDecorator impleme
decoratedLdapResult.setReferral( referral );
}
-
+
/**
* {@inheritDoc}
*/
@@ -200,8 +199,8 @@ public class LdapResultDecorator impleme
{
return decoratedLdapResult.toString();
}
-
-
+
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -243,7 +242,7 @@ public class LdapResultDecorator impleme
}
else
{
- byte[] matchedDNBytes = Strings.getBytesUtf8( Strings .trimLeft( getMatchedDn().getName() ) );
+ byte[] matchedDNBytes = Strings.getBytesUtf8( Strings.trimLeft( getMatchedDn().getName() ) );
ldapResultLength += 1 + TLV.getNbBytes( matchedDNBytes.length ) + matchedDNBytes.length;
setMatchedDnBytes( matchedDNBytes );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -43,7 +43,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyDnRequestDecorator extends SingleReplyRequestDecorator<ModifyDnRequest,ModifyDnResponse>
+public class ModifyDnRequestDecorator extends SingleReplyRequestDecorator<ModifyDnRequest, ModifyDnResponse>
implements ModifyDnRequest
{
/** The modify Dn request length */
@@ -83,8 +83,7 @@ public class ModifyDnRequestDecorator ex
//-------------------------------------------------------------------------
// The ModifyDnResponse methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -100,7 +99,7 @@ public class ModifyDnRequestDecorator ex
public ModifyDnRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
@@ -120,7 +119,7 @@ public class ModifyDnRequestDecorator ex
public ModifyDnRequest setNewRdn( Rdn newRdn )
{
getDecorated().setNewRdn( newRdn );
-
+
return this;
}
@@ -140,7 +139,7 @@ public class ModifyDnRequestDecorator ex
public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn )
{
getDecorated().setDeleteOldRdn( deleteOldRdn );
-
+
return this;
}
@@ -160,7 +159,7 @@ public class ModifyDnRequestDecorator ex
public ModifyDnRequest setNewSuperior( Dn newSuperior )
{
getDecorated().setNewSuperior( newSuperior );
-
+
return this;
}
@@ -172,51 +171,50 @@ public class ModifyDnRequestDecorator ex
{
return getDecorated().isMove();
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyDnRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public ModifyDnRequest addControl( Control control ) throws MessageException
{
- return (ModifyDnRequest)super.addControl( control );
+ return ( ModifyDnRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyDnRequest addAllControls( Control[] controls ) throws MessageException
{
- return (ModifyDnRequest)super.addAllControls( controls );
+ return ( ModifyDnRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyDnRequest removeControl( Control control ) throws MessageException
{
- return (ModifyDnRequest)super.removeControl( control );
+ return ( ModifyDnRequest ) super.removeControl( control );
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the ModifyDNRequest length
*
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyDnResponseDecorator extends ResponseDecorator<ModifyDnResponse>
+public class ModifyDnResponseDecorator extends ResponseDecorator<ModifyDnResponse>
implements ModifyDnResponse
{
/** The encoded modifyDnResponse length */
@@ -91,14 +91,14 @@ public class ModifyDnResponseDecorator e
*/
public int computeLength()
{
- int modifyDnResponseLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int modifyDnResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setModifyDnResponseLength( modifyDnResponseLength );
return 1 + TLV.getNbBytes( modifyDnResponseLength ) + modifyDnResponseLength;
}
-
-
+
+
/**
* Encode the ModifyDnResponse message to a PDU.
*
@@ -113,13 +113,13 @@ public class ModifyDnResponseDecorator e
buffer.put( TLV.getBytes( getModifyDnResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
}
catch ( BufferOverflowException boe )
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest,ModifyResponse>
+public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest, ModifyResponse>
implements ModifyRequest
{
/** The modify request length */
@@ -76,7 +76,6 @@ public class ModifyRequestDecorator exte
private ModificationOperation currentOperation;
-
/**
* Makes a ModifyRequest encodable.
*
@@ -176,8 +175,8 @@ public class ModifyRequestDecorator exte
{
return valuesLength;
}
-
-
+
+
/**
* Store the current operation
*
@@ -237,8 +236,7 @@ public class ModifyRequestDecorator exte
//-------------------------------------------------------------------------
// The ModifyRequest methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -254,7 +252,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
@@ -274,7 +272,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest addModification( Modification mod )
{
getDecorated().addModification( mod );
-
+
return this;
}
@@ -285,7 +283,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest removeModification( Modification mod )
{
getDecorated().removeModification( mod );
-
+
return this;
}
@@ -296,7 +294,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest remove( String attributeName, String... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
-
+
return this;
}
@@ -307,7 +305,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest remove( String attributeName, byte[]... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
-
+
return this;
}
@@ -318,7 +316,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest remove( Attribute attr )
{
getDecorated().remove( attr );
-
+
return this;
}
@@ -329,7 +327,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
-
+
return this;
}
@@ -340,7 +338,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest add( String attributeName, String... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
-
+
return this;
}
@@ -351,7 +349,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest add( String attributeName, byte[]... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
-
+
return this;
}
@@ -362,7 +360,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest add( Attribute attr )
{
getDecorated().add( attr );
-
+
return this;
}
@@ -373,7 +371,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest replace( String attributeName )
{
getDecorated().replace( attributeName );
-
+
return this;
}
@@ -384,7 +382,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest replace( String attributeName, String... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
-
+
return this;
}
@@ -395,7 +393,7 @@ public class ModifyRequestDecorator exte
public ModifyRequest replace( String attributeName, byte[]... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
-
+
return this;
}
@@ -406,54 +404,53 @@ public class ModifyRequestDecorator exte
public ModifyRequest replace( Attribute attr )
{
getDecorated().replace( attr );
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public ModifyRequest addControl( Control control ) throws MessageException
{
- return (ModifyRequest)super.addControl( control );
+ return ( ModifyRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyRequest addAllControls( Control[] controls ) throws MessageException
{
- return (ModifyRequest)super.addAllControls( controls );
+ return ( ModifyRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ModifyRequest removeControl( Control control ) throws MessageException
{
- return (ModifyRequest)super.removeControl( control );
+ return ( ModifyRequest ) super.removeControl( control );
}
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the ModifyRequest length
*
@@ -663,7 +660,7 @@ public class ModifyRequestDecorator exte
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyResponseDecorator extends ResponseDecorator<ModifyResponse>
+public class ModifyResponseDecorator extends ResponseDecorator<ModifyResponse>
implements ModifyResponse
{
/** The encoded modifyResponse length */
@@ -72,12 +72,11 @@ public class ModifyResponseDecorator ext
return modifyResponseLength;
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the ModifyResponse length
*
@@ -93,7 +92,7 @@ public class ModifyResponseDecorator ext
*/
public int computeLength()
{
- int modifyResponseLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int modifyResponseLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setModifyResponseLength( modifyResponseLength );
@@ -115,13 +114,13 @@ public class ModifyResponseDecorator ext
buffer.put( TLV.getBytes( getModifyResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
}
catch ( BufferOverflowException boe )
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -43,7 +43,7 @@ public abstract class RequestDecorator<M
{
super( codec, decoratedMessage );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -45,7 +45,7 @@ public abstract class ResponseDecorator<
public ResponseDecorator( LdapApiService codec, M decoratedMessage )
{
super( codec, decoratedMessage );
-
+
ldapResultDecorator = new LdapResultDecorator( ( ( ResultResponse ) decoratedMessage ).getLdapResult() );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest<R>, R extends ResultResponse>
+public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest<R>, R extends ResultResponse>
extends RequestDecorator<M> implements ResultResponseRequest<R>
{
/**
@@ -42,7 +42,7 @@ public abstract class ResultResponseRequ
{
super( codec, decoratedMessage );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -216,7 +216,7 @@ public class SearchRequestDecorator exte
public SearchRequest setFilter( ExprNode filter )
{
topFilter = transform( filter );
-
+
return this;
}
@@ -228,7 +228,7 @@ public class SearchRequestDecorator exte
{
getDecorated().setFilter( filter );
this.currentFilter = transform( getDecorated().getFilter() );
-
+
return this;
}
@@ -761,7 +761,7 @@ public class SearchRequestDecorator exte
public SearchRequest setBase( Dn baseDn )
{
getDecorated().setBase( baseDn );
-
+
return this;
}
@@ -781,7 +781,7 @@ public class SearchRequestDecorator exte
public SearchRequest setScope( SearchScope scope )
{
getDecorated().setScope( scope );
-
+
return this;
}
@@ -801,7 +801,7 @@ public class SearchRequestDecorator exte
public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases )
{
getDecorated().setDerefAliases( aliasDerefAliases );
-
+
return this;
}
@@ -821,7 +821,7 @@ public class SearchRequestDecorator exte
public SearchRequest setSizeLimit( long entriesMax )
{
getDecorated().setSizeLimit( entriesMax );
-
+
return this;
}
@@ -841,7 +841,7 @@ public class SearchRequestDecorator exte
public SearchRequest setTimeLimit( int secondsMax )
{
getDecorated().setTimeLimit( secondsMax );
-
+
return this;
}
@@ -861,7 +861,7 @@ public class SearchRequestDecorator exte
public SearchRequest setTypesOnly( boolean typesOnly )
{
getDecorated().setTypesOnly( typesOnly );
-
+
return this;
}
@@ -890,7 +890,7 @@ public class SearchRequestDecorator exte
public SearchRequest addAttributes( String... attributes )
{
getDecorated().addAttributes( attributes );
-
+
return this;
}
@@ -901,7 +901,7 @@ public class SearchRequestDecorator exte
public SearchRequest removeAttribute( String attribute )
{
getDecorated().removeAttribute( attribute );
-
+
return this;
}
@@ -1084,7 +1084,7 @@ public class SearchRequestDecorator exte
public SearchRequest addAbandonListener( AbandonListener listener )
{
getDecorated().addAbandonListener( listener );
-
+
return this;
}
@@ -1094,33 +1094,33 @@ public class SearchRequestDecorator exte
*/
public SearchRequest setMessageId( int messageId )
{
- return (SearchRequest)super.setMessageId( messageId );
+ return ( SearchRequest ) super.setMessageId( messageId );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public SearchRequest addControl( Control control ) throws MessageException
{
- return (SearchRequest)super.addControl( control );
+ return ( SearchRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public SearchRequest addAllControls( Control[] controls ) throws MessageException
{
- return (SearchRequest)super.addAllControls( controls );
+ return ( SearchRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public SearchRequest removeControl( Control control ) throws MessageException
{
- return (SearchRequest)super.removeControl( control );
+ return ( SearchRequest ) super.removeControl( control );
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java Tue Jan 24 17:27:00 2012
@@ -75,8 +75,7 @@ public class SearchResultDoneDecorator e
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the SearchResultDone length
*
@@ -92,7 +91,7 @@ public class SearchResultDoneDecorator e
*/
public int computeLength()
{
- int searchResultDoneLength = ((LdapResultDecorator)getLdapResult()).computeLength();
+ int searchResultDoneLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
setSearchResultDoneLength( searchResultDoneLength );
@@ -115,13 +114,13 @@ public class SearchResultDoneDecorator e
buffer.put( TLV.getBytes( getSearchResultDoneLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
}
catch ( BufferOverflowException boe )
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Tue Jan 24 17:27:00 2012
@@ -64,7 +64,7 @@ public class SearchResultEntryDecorator
/** The list of all vals length */
private List<Integer> valsLength;
-
+
/** The current attribute being processed */
private Attribute currentAttribute;
@@ -175,8 +175,8 @@ public class SearchResultEntryDecorator
{
this.valsLength = valsLength;
}
-
-
+
+
public Attribute getCurrentAttribute()
{
return currentAttribute;
@@ -217,8 +217,7 @@ public class SearchResultEntryDecorator
//-------------------------------------------------------------------------
// The IntermediateResponse methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -258,8 +257,7 @@ public class SearchResultEntryDecorator
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the SearchResultEntry length
*
@@ -304,7 +302,7 @@ public class SearchResultEntryDecorator
{
Dn dn = getObjectName();
- byte[] dnBytes = Strings.getBytesUtf8(dn.getName());
+ byte[] dnBytes = Strings.getBytesUtf8( dn.getName() );
// The entry
int searchResultEntryLength = 1 + TLV.getNbBytes( dnBytes.length ) + dnBytes.length;
@@ -475,7 +473,7 @@ public class SearchResultEntryDecorator
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java Tue Jan 24 17:27:00 2012
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchResultReferenceDecorator extends MessageDecorator<SearchResultReference>
+public class SearchResultReferenceDecorator extends MessageDecorator<SearchResultReference>
implements SearchResultReference
{
/** The length of the referral */
@@ -102,8 +102,7 @@ public class SearchResultReferenceDecora
//-------------------------------------------------------------------------
// The SearchResultReference methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -118,15 +117,14 @@ public class SearchResultReferenceDecora
*/
public void setReferral( Referral referral )
{
- getDecorated().setReferral( referral );
+ getDecorated().setReferral( referral );
}
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the SearchResultReference length
*
@@ -208,7 +206,7 @@ public class SearchResultReferenceDecora
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -33,8 +33,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest<R>, R extends ResultResponse>
- extends ResultResponseRequestDecorator<M,R> implements SingleReplyRequest<R>, AbandonableRequest
+public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest<R>, R extends ResultResponse>
+ extends ResultResponseRequestDecorator<M, R> implements SingleReplyRequest<R>, AbandonableRequest
{
/**
* Makes Request a MessageDecorator.
@@ -46,7 +46,7 @@ public abstract class SingleReplyRequest
super( codec, decoratedMessage );
}
-
+
/**
* {@inheritDoc}
*/
@@ -71,7 +71,7 @@ public abstract class SingleReplyRequest
public AbandonableRequest addAbandonListener( AbandonListener listener )
{
( ( AbandonableRequest ) getDecorated() ).addAbandonListener( listener );
-
+
return this;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -56,43 +56,42 @@ public class UnbindRequestDecorator exte
public UnbindRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public UnbindRequest addControl( Control control ) throws MessageException
{
- return (UnbindRequest)super.addControl( control );
+ return ( UnbindRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public UnbindRequest addAllControls( Control[] controls ) throws MessageException
{
- return (UnbindRequest)super.addAllControls( controls );
+ return ( UnbindRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public UnbindRequest removeControl( Control control ) throws MessageException
{
- return (UnbindRequest)super.removeControl( control );
+ return ( UnbindRequest ) super.removeControl( control );
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
/**
* Compute the UnBindRequest length
*
@@ -103,8 +102,8 @@ public class UnbindRequestDecorator exte
{
return 2; // Always 2
}
-
-
+
+
/**
* Encode the Unbind protocolOp part
*/
@@ -123,7 +122,7 @@ public class UnbindRequestDecorator exte
String msg = I18n.err( I18n.ERR_04005 );
throw new EncoderException( msg );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Tue Jan 24 17:27:00 2012
@@ -551,7 +551,7 @@ public class DefaultLdapCodecService imp
else
{
req = new ExtendedRequestDecorator<ExtendedRequest<ExtendedResponse>, ExtendedResponse>( this,
- ( ExtendedRequest<ExtendedResponse> ) decoratedMessage );
+ ( ExtendedRequest<ExtendedResponse> ) decoratedMessage );
}
return req;