Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java Fri May 20 15:32:49 2011 @@ -67,11 +67,7 @@ public class ModifyDnRequestImpl extends // ----------------------------------------------------------------------- /** - * Gets the flag which determines if the old Rdn attribute is to be removed - * from the entry when the new Rdn is used in its stead. This property - * corresponds to the deleteoldrdn - * - * @return true if the old rdn is to be deleted, false if it is not + * {@inheritDoc} */ public boolean getDeleteOldRdn() { @@ -80,25 +76,18 @@ public class ModifyDnRequestImpl extends /** - * Sets the flag which determines if the old Rdn attribute is to be removed - * from the entry when the new Rdn is used in its stead. This property - * corresponds to the deleteoldrdn - * - * @param deleteOldRdn true if the old rdn is to be deleted, false if it is not + * {@inheritDoc} */ - public void setDeleteOldRdn( boolean deleteOldRdn ) + public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn ) { this.deleteOldRdn = deleteOldRdn; + + return this; } /** - * Gets whether or not this request is a Dn change resulting in a move - * operation. Setting the newSuperior property to a non-null name, toggles - * this flag. - * - * @return true if the newSuperior property is NOT null, false - * otherwise. + * {@inheritDoc} */ public boolean isMove() { @@ -107,10 +96,7 @@ public class ModifyDnRequestImpl extends /** - * Gets the entry's distinguished name representing the entry PDU - * field. - * - * @return the distinguished name of the entry. + * {@inheritDoc} */ public Dn getName() { @@ -119,23 +105,18 @@ public class ModifyDnRequestImpl extends /** - * Sets the entry's distinguished name representing the entry PDU - * field. - * - * @param name - * the distinguished name of the entry. + * {@inheritDoc} */ - public void setName( Dn name ) + public ModifyDnRequest setName( Dn name ) { this.name = name; + + return this; } /** - * Gets the new relative distinguished name for the entry which represents - * the PDU's newrdn field. - * - * @return the relative dn with one component + * {@inheritDoc} */ public Rdn getNewRdn() { @@ -144,24 +125,18 @@ public class ModifyDnRequestImpl extends /** - * Sets the new relative distinguished name for the entry which represents - * the PDU's newrdn field. - * - * @param newRdn the relative dn with one component + * {@inheritDoc} */ - public void setNewRdn( Rdn newRdn ) + public ModifyDnRequest setNewRdn( Rdn newRdn ) { this.newRdn = newRdn; + + return this; } /** - * Gets the optional distinguished name of the new superior entry where the - * candidate entry is to be moved. This property corresponds to the PDU's - * newSuperior field. May be null representing a simple Rdn change - * rather than a move operation. - * - * @return the dn of the superior entry the candidate entry is moved under. + * {@inheritDoc} */ public Dn getNewSuperior() { @@ -170,18 +145,24 @@ public class ModifyDnRequestImpl extends /** - * Sets the optional distinguished name of the new superior entry where the - * candidate entry is to be moved. This property corresponds to the PDU's - * newSuperior field. May be null representing a simple Rdn change - * rather than a move operation. Setting this property to a non-null value - * toggles the move flag obtained via the isMove method. - * - * @param newSuperior the dn of the superior entry the candidate entry for Dn - * modification is moved under. + * {@inheritDoc} */ - public void setNewSuperior( Dn newSuperior ) + public ModifyDnRequest setNewSuperior( Dn newSuperior ) { this.newSuperior = newSuperior; + + return this; + } + + + /** + * {@inheritDoc} + */ + public ModifyDnRequest setMessageId( int messageId ) + { + super.setMessageId( messageId ); + + return this; } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java Fri May 20 15:32:49 2011 @@ -118,10 +118,10 @@ public interface ModifyRequest extends S * Sets the distinguished name of the entry to be modified by this request. * This property represents the PDU's object field. * - * @param name - * the Dn of the modified entry. + * @param name the Dn of the modified entry. + * @return The ModifyRequest instance */ - void setName( Dn name ); + ModifyRequest setName( Dn name ); /** @@ -138,8 +138,9 @@ public interface ModifyRequest extends S * request. * * @param mod a Modification to add. + * @return The ModifyRequest instance */ - void addModification( Modification mod ); + ModifyRequest addModification( Modification mod ); /** @@ -147,8 +148,9 @@ public interface ModifyRequest extends S * modify request. * * @param mod a Modification to remove. + * @return The ModifyRequest instance */ - void removeModification( Modification mod ); + ModifyRequest removeModification( Modification mod ); /** @@ -158,14 +160,15 @@ public interface ModifyRequest extends S * * @param attributeName name of the attribute to be added * @param attributeValue values of the attribute + * @return The ModifyRequest instance */ - void remove( String attributeName, String... attributeValue ); + ModifyRequest remove( String attributeName, String... attributeValue ); /** * @see #remove(String, String...) */ - void remove( String attributeName, byte[]... attributeValue ); + ModifyRequest remove( String attributeName, byte[]... attributeValue ); /** @@ -173,11 +176,18 @@ public interface ModifyRequest extends S * marks a given attribute for removal from the target entry. * * @param attr the attribute to be added + * @return The ModifyRequest instance */ - void remove( Attribute attr ); + ModifyRequest remove( Attribute attr ); - void addModification( Attribute attr, ModificationOperation modOp ); + /** + * Add a modification + * @param attr The attribute to be modified + * @param modOp The operation + * @return The ModifyRequest instance + */ + ModifyRequest addModification( Attribute attr, ModificationOperation modOp ); /** @@ -186,28 +196,30 @@ public interface ModifyRequest extends S * * @param attributeName name of the attribute to be added * @param attributeValue values of the attribute + * @return The ModifyRequest instance */ - void add( String attributeName, String... attributeValue ); + ModifyRequest add( String attributeName, String... attributeValue ); /** * @see #add(String, String...) */ - void add( String attributeName, byte[]... attributeValue ); + ModifyRequest add( String attributeName, byte[]... attributeValue ); /** * marks a given attribute for addition in the target entry. * * @param attr the attribute to be added + * @return The ModifyRequest instance */ - void add( Attribute attr ); + ModifyRequest add( Attribute attr ); /** * @see #replace(String, String...) */ - void replace( String attributeName ); + ModifyRequest replace( String attributeName ); /** @@ -216,20 +228,22 @@ public interface ModifyRequest extends S * * @param attributeName name of the attribute to be added * @param attributeValue values of the attribute + * @return The ModifyRequest instance */ - void replace( String attributeName, String... attributeValue ); + ModifyRequest replace( String attributeName, String... attributeValue ); /** * @see #replace(String, String...) */ - void replace( String attributeName, byte[]... attributeValue ); + ModifyRequest replace( String attributeName, byte[]... attributeValue ); /** * marks a given attribute for replacement in the target entry. * * @param attr the attribute to be added + * @return The ModifyRequest instance */ - void replace( Attribute attr ); + ModifyRequest replace( Attribute attr ); } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Fri May 20 15:32:49 2011 @@ -70,10 +70,7 @@ public class ModifyRequestImpl extends A // ModifyRequest Interface Method Implementations // ------------------------------------------------------------------------ /** - * Gets an immutable Collection of modification items representing the - * atomic changes to perform on the candidate entry to modify. - * - * @return an immutable Collection of Modification instances. + * {@inheritDoc} */ public Collection getModifications() { @@ -82,10 +79,7 @@ public class ModifyRequestImpl extends A /** - * Gets the distinguished name of the entry to be modified by this request. - * This property represents the PDU's object field. - * - * @return the Dn of the modified entry. + * {@inheritDoc} */ public Dn getName() { @@ -94,26 +88,24 @@ public class ModifyRequestImpl extends A /** - * Sets the distinguished name of the entry to be modified by this request. - * This property represents the PDU's object field. - * - * @param name the Dn of the modified entry. + * {@inheritDoc} */ - public void setName( Dn name ) + public ModifyRequest setName( Dn name ) { this.name = name; + + return this; } /** - * Adds a Modification to the set of modifications composing this modify - * request. - * - * @param mod a Modification to add + * {@inheritDoc} */ - public void addModification( Modification mod ) + public ModifyRequest addModification( Modification mod ) { mods.add( mod ); + + return this; } @@ -131,133 +123,146 @@ public class ModifyRequestImpl extends A } - public void addModification( Attribute attr, ModificationOperation modOp ) + /** + * {@inheritDoc} + */ + public ModifyRequest addModification( Attribute attr, ModificationOperation modOp ) { mods.add( new DefaultModification( modOp, attr ) ); + + return this; } /** - * - * marks a given attribute for addition in the target entry with the - * given values. - * - * @param attributeName name of the attribute to be added - * @param attributeValue values of the attribute + *{@inheritDoc} */ - public void add( String attributeName, String... attributeValue ) + public ModifyRequest add( String attributeName, String... attributeValue ) { addModification( ModificationOperation.ADD_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** * @see #add(String, String...) */ - public void add( String attributeName, byte[]... attributeValue ) + public ModifyRequest add( String attributeName, byte[]... attributeValue ) { addModification( ModificationOperation.ADD_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** - * - * marks a given attribute for addition in the target entry. - * - * @param attr the attribute to be added + *{@inheritDoc} */ - public void add( Attribute attr ) + public ModifyRequest add( Attribute attr ) { addModification( attr, ModificationOperation.ADD_ATTRIBUTE ); + + return this; } /** * @see #replace(String, String...) */ - public void replace( String attributeName ) + public ModifyRequest replace( String attributeName ) { addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, StringConstants.EMPTY_STRINGS ); + + return this; } /** - * - * marks a given attribute for replacement with the given - * values in the target entry. - * - * @param attributeName name of the attribute to be added - * @param attributeValue values of the attribute + *{@inheritDoc} */ - public void replace( String attributeName, String... attributeValue ) + public ModifyRequest replace( String attributeName, String... attributeValue ) { addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** * @see #replace(String, String...) */ - public void replace( String attributeName, byte[]... attributeValue ) + public ModifyRequest replace( String attributeName, byte[]... attributeValue ) { addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** - * - * marks a given attribute for replacement in the target entry. - * - * @param attr the attribute to be added + *{@inheritDoc} */ - public void replace( Attribute attr ) + public ModifyRequest replace( Attribute attr ) { addModification( attr, ModificationOperation.REPLACE_ATTRIBUTE ); + + return this; } /** - * Removes a Modification to the set of modifications composing this - * modify request. - * - * @param mod a Modification to remove. + * {@inheritDoc} */ - public void removeModification( Modification mod ) + public ModifyRequest removeModification( Modification mod ) { mods.remove( mod ); + + return this; } /** - * marks a given attribute for removal with the given - * values from the target entry. - * - * @param attributeName name of the attribute to be added - * @param attributeValue values of the attribute + * {@inheritDoc} */ - public void remove( String attributeName, String... attributeValue ) + public ModifyRequest remove( String attributeName, String... attributeValue ) { addModification( ModificationOperation.REMOVE_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** - * @see #remove(String, String...) + * {@inheritDoc} */ - public void remove( String attributeName, byte[]... attributeValue ) + public ModifyRequest remove( String attributeName, byte[]... attributeValue ) { addModification( ModificationOperation.REMOVE_ATTRIBUTE, attributeName, attributeValue ); + + return this; } /** - * marks a given attribute for removal from the target entry. - * - * @param attr the attribute to be added + * {@inheritDoc} */ - public void remove( Attribute attr ) + public ModifyRequest remove( Attribute attr ) { addModification( attr, ModificationOperation.REMOVE_ATTRIBUTE ); + + return this; + } + + + /** + * {@inheritDoc} + */ + public ModifyRequest setMessageId( int messageId ) + { + super.setMessageId( messageId ); + + return this; } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java Fri May 20 15:32:49 2011 @@ -68,8 +68,9 @@ public interface SearchRequest extends M * Sets the search base as a distinguished name. * * @param baseDn the search base + * @return The SearchRequest instance */ - void setBase( Dn baseDn ); + SearchRequest setBase( Dn baseDn ); /** @@ -84,8 +85,9 @@ public interface SearchRequest extends M * Sets the search scope parameter enumeration. * * @param scope the scope enumeration parameter. + * @return The SearchRequest instance */ - void setScope( SearchScope scope ); + SearchRequest setScope( SearchScope scope ); /** @@ -100,8 +102,9 @@ public interface SearchRequest extends M * Sets the alias handling parameter. * * @param aliasDerefAliases the alias handling parameter enumeration. + * @return The SearchRequest instance */ - void setDerefAliases( AliasDerefMode aliasDerefAliases ); + SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases ); /** @@ -122,8 +125,9 @@ public interface SearchRequest extends M * search. Servers may enforce a maximum number of entries to return. * * @param entriesMax maximum search result entries to return. + * @return The SearchRequest instance */ - void setSizeLimit( long entriesMax ); + SearchRequest setSizeLimit( long entriesMax ); /** @@ -142,8 +146,9 @@ public interface SearchRequest extends M * requested timelimit restrictions are in effect for the search. * * @param secondsMax the search time limit in seconds. + * @return The SearchRequest instance */ - void setTimeLimit( int secondsMax ); + SearchRequest setTimeLimit( int secondsMax ); /** @@ -164,8 +169,9 @@ public interface SearchRequest extends M * field to FALSE causes both attribute types and values to be returned. * * @param typesOnly true for only types, false for types and values. + * @return The SearchRequest instance */ - void setTypesOnly( boolean typesOnly ); + SearchRequest setTypesOnly( boolean typesOnly ); /** @@ -180,16 +186,18 @@ public interface SearchRequest extends M * Sets the search filter associated with this search request. * * @param filter the expression node for the root of the filter expression tree. + * @return The SearchRequest instance */ - void setFilter( ExprNode filter ); + SearchRequest setFilter( ExprNode filter ); /** * Sets the search filter associated with this search request. * * @param filter the expression node for the root of the filter expression tree. + * @return The SearchRequest instance */ - void setFilter( String filter ) throws LdapException; + SearchRequest setFilter( String filter ) throws LdapException; /** @@ -221,14 +229,16 @@ public interface SearchRequest extends M * Adds some attributes to the set of entry attributes to return. * * @param attributes the attributes description or identifier. + * @return The SearchRequest instance */ - void addAttributes( String... attributes ); + SearchRequest addAttributes( String... attributes ); /** * Removes an attribute to the set of entry attributes to return. * * @param attribute the attribute description or identifier. + * @return The SearchRequest instance */ - void removeAttribute( String attribute ); + SearchRequest removeAttribute( String attribute ); } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java Fri May 20 15:32:49 2011 @@ -90,26 +90,7 @@ public class SearchRequestImpl extends A /** - * Gets a list of the attributes to be returned from each entry which - * matches the search filter. There are two special values which may be - * used: an empty list with no attributes, and the attribute description - * string "*". Both of these signify that all user attributes are to be - * returned. (The "*" allows the client to request all user attributes in - * addition to specific operational attributes). Attributes MUST be named at - * most once in the list, and are returned at most once in an entry. If - * there are attribute descriptions in the list which are not recognized, - * they are ignored by the server. If the client does not want any - * attributes returned, it can specify a list containing only the attribute - * with OID "1.1". This OID was chosen arbitrarily and does not correspond - * to any attribute in use. Client implementors should note that even if all - * user attributes are requested, some attributes of the entry may not be - * included in search results due to access control or other restrictions. - * Furthermore, servers will not return operational attributes, such as - * objectClasses or attributeTypes, unless they are listed by name, since - * there may be extremely large number of values for certain operational - * attributes. - * - * @return the collection of attributes to return for each entry + * {@inheritDoc} */ public List getAttributes() { @@ -129,21 +110,18 @@ public class SearchRequestImpl extends A /** - * Sets the search base as a distinguished name. - * - * @param base - * the search base + * {@inheritDoc} */ - public void setBase( Dn base ) + public SearchRequest setBase( Dn base ) { baseDn = base; + + return this; } /** - * Gets the alias handling parameter. - * - * @return the alias handling parameter enumeration. + * {@inheritDoc} */ public AliasDerefMode getDerefAliases() { @@ -152,21 +130,18 @@ public class SearchRequestImpl extends A /** - * Sets the alias handling parameter. - * - * @param aliasDerefAliases - * the alias handling parameter enumeration. + * {@inheritDoc} */ - public void setDerefAliases( AliasDerefMode aliasDerefAliases ) + public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases ) { this.aliasDerefMode = aliasDerefAliases; + + return this; } /** - * Gets the search filter associated with this search request. - * - * @return the expression node for the root of the filter expression tree. + * {@inheritDoc} */ public ExprNode getFilter() { @@ -177,16 +152,17 @@ public class SearchRequestImpl extends A /** * {@inheritDoc} */ - public void setFilter( ExprNode filter ) + public SearchRequest setFilter( ExprNode filter ) { this.filterNode = filter; + return this; } /** * {@inheritDoc} */ - public void setFilter( String filter ) throws LdapException + public SearchRequest setFilter( String filter ) throws LdapException { try { @@ -197,14 +173,13 @@ public class SearchRequestImpl extends A String msg = "The filter" + filter + " is invalid."; throw new LdapProtocolErrorException( msg ); } + + return this; } /** - * Gets the different response types generated by a search request. - * - * @return the RESPONSE_TYPES array - * @see #RESPONSE_TYPES + * {@inheritDoc} */ public MessageTypeEnum[] getResponseTypes() { @@ -213,9 +188,7 @@ public class SearchRequestImpl extends A /** - * Gets the search scope parameter enumeration. - * - * @return the scope enumeration parameter. + * {@inheritDoc} */ public SearchScope getScope() { @@ -224,23 +197,18 @@ public class SearchRequestImpl extends A /** - * Sets the search scope parameter enumeration. - * - * @param scope the scope enumeration parameter. + * {@inheritDoc} */ - public void setScope( SearchScope scope ) + public SearchRequest setScope( SearchScope scope ) { this.scope = scope; + + return this; } /** - * A sizelimit that restricts the maximum number of entries to be returned - * as a result of the search. A value of 0 in this field indicates that no - * client-requested sizelimit restrictions are in effect for the search. - * Servers may enforce a maximum number of entries to return. - * - * @return search size limit. + * {@inheritDoc} */ public long getSizeLimit() { @@ -249,25 +217,18 @@ public class SearchRequestImpl extends A /** - * Sets sizelimit that restricts the maximum number of entries to be - * returned as a result of the search. A value of 0 in this field indicates - * that no client-requested sizelimit restrictions are in effect for the - * search. Servers may enforce a maximum number of entries to return. - * - * @param entriesMax maximum search result entries to return. + * {@inheritDoc} */ - public void setSizeLimit( long entriesMax ) + public SearchRequest setSizeLimit( long entriesMax ) { sizeLimit = entriesMax; + + return this; } /** - * Gets the timelimit that restricts the maximum time (in seconds) allowed - * for a search. A value of 0 in this field indicates that no client- - * requested timelimit restrictions are in effect for the search. - * - * @return the search time limit in seconds. + * {@inheritDoc} */ public int getTimeLimit() { @@ -276,25 +237,18 @@ public class SearchRequestImpl extends A /** - * Sets the timelimit that restricts the maximum time (in seconds) allowed - * for a search. A value of 0 in this field indicates that no client- - * requested timelimit restrictions are in effect for the search. - * - * @param secondsMax the search time limit in seconds. + * {@inheritDoc} */ - public void setTimeLimit( int secondsMax ) + public SearchRequest setTimeLimit( int secondsMax ) { timeLimit = secondsMax; + + return this; } /** - * An indicator as to whether search results will contain both attribute - * types and values, or just attribute types. Setting this field to TRUE - * causes only attribute types (no values) to be returned. Setting this - * field to FALSE causes both attribute types and values to be returned. - * - * @return true for only types, false for types and values. + * {@inheritDoc} */ public boolean getTypesOnly() { @@ -303,43 +257,40 @@ public class SearchRequestImpl extends A /** - * An indicator as to whether search results will contain both attribute - * types and values, or just attribute types. Setting this field to TRUE - * causes only attribute types (no values) to be returned. Setting this - * field to FALSE causes both attribute types and values to be returned. - * - * @param typesOnly true for only types, false for types and values. + * {@inheritDoc} */ - public void setTypesOnly( boolean typesOnly ) + public SearchRequest setTypesOnly( boolean typesOnly ) { this.typesOnly = typesOnly; + + return this; } /** * {@inheritDoc} */ - public void addAttributes( String... attributesToAdd ) + public SearchRequest addAttributes( String... attributesToAdd ) { this.attributes.addAll( Arrays.asList( attributesToAdd ) ); + + return this; } /** - * Removes an attribute to the set of entry attributes to return. - * - * @param attribute the attribute description or identifier. + * {@inheritDoc} */ - public void removeAttribute( String attribute ) + public SearchRequest removeAttribute( String attribute ) { attributes.remove( attribute ); + + return this; } /** - * The result containing response for this request. - * - * @return the result containing response for this request + * {@inheritDoc} */ public SearchResultDone getResultResponse() { @@ -350,6 +301,17 @@ public class SearchRequestImpl extends A return response; } + + + /** + * {@inheritDoc} + */ + public SearchRequest setMessageId( int messageId ) + { + super.setMessageId( messageId ); + + return this; + } /** Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java Fri May 20 15:32:49 2011 @@ -54,6 +54,17 @@ public class UnbindRequestImpl extends A { throw new UnsupportedOperationException( I18n.err( I18n.ERR_04185 ) ); } + + + /** + * {@inheritDoc} + */ + public UnbindRequest setMessageId( int messageId ) + { + super.setMessageId( messageId ); + + return this; + } /** Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java Fri May 20 15:32:49 2011 @@ -212,8 +212,9 @@ public class AddRequestImplTest } - public void setEntry( Entry entry ) + public AddRequest setEntry( Entry entry ) { + return this; } @@ -223,8 +224,9 @@ public class AddRequestImplTest } - public void setEntryDn( Dn entryDn ) + public AddRequest setEntryDn( Dn entryDn ) { + return this; } @@ -252,13 +254,15 @@ public class AddRequestImplTest } - public void addControl( Control control ) throws MessageException + public AddRequest addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control control ) throws MessageException + public AddRequest removeControl( Control control ) throws MessageException { + return this; } @@ -291,8 +295,9 @@ public class AddRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public AddRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -302,8 +307,9 @@ public class AddRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public AddRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -319,8 +325,9 @@ public class AddRequestImplTest } - public void setMessageId( int messageId ) + public AddRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java Fri May 20 15:32:49 2011 @@ -225,8 +225,9 @@ public class BindRequestImplTest } - public void setSimple( boolean a_isSimple ) + public BindRequest setSimple( boolean a_isSimple ) { + return this; } @@ -236,13 +237,15 @@ public class BindRequestImplTest } - public void setCredentials( String credentials ) + public BindRequest setCredentials( String credentials ) { + return this; } - public void setCredentials( byte[] credentials ) + public BindRequest setCredentials( byte[] credentials ) { + return this; } @@ -252,8 +255,9 @@ public class BindRequestImplTest } - public void setName( Dn name ) + public BindRequest setName( Dn name ) { + return this; } @@ -269,8 +273,9 @@ public class BindRequestImplTest } - public void setVersion3( boolean a_isVersion3 ) + public BindRequest setVersion3( boolean isVersion3 ) { + return this; } @@ -298,13 +303,15 @@ public class BindRequestImplTest } - public void addControl( Control control ) throws MessageException + public BindRequest addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control control ) throws MessageException + public BindRequest removeControl( Control control ) throws MessageException { + return this; } @@ -332,8 +339,9 @@ public class BindRequestImplTest } - public void setSaslMechanism( String saslMechanism ) + public BindRequest setSaslMechanism( String saslMechanism ) { + return this; } @@ -343,8 +351,9 @@ public class BindRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public BindRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -359,8 +368,9 @@ public class BindRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public BindRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -376,8 +386,9 @@ public class BindRequestImplTest } - public void setMessageId( int messageId ) + public BindRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java Fri May 20 15:32:49 2011 @@ -198,15 +198,15 @@ public class CompareRequestImplTest } - public void setAssertionValue( String value ) + public CompareRequest setAssertionValue( String value ) { - + return this; } - public void setAssertionValue( byte[] value ) + public CompareRequest setAssertionValue( byte[] value ) { - + return this; } @@ -216,9 +216,9 @@ public class CompareRequestImplTest } - public void setAttributeId( String attrId ) + public CompareRequest setAttributeId( String attrId ) { - + return this; } @@ -228,8 +228,9 @@ public class CompareRequestImplTest } - public void setName( Dn name ) + public CompareRequest setName( Dn name ) { + return this; } @@ -257,13 +258,15 @@ public class CompareRequestImplTest } - public void addControl( Control a_control ) throws MessageException + public CompareRequest addControl( Control a_control ) throws MessageException { + return this; } - public void removeControl( Control a_control ) throws MessageException + public CompareRequest removeControl( Control a_control ) throws MessageException { + return this; } @@ -296,8 +299,9 @@ public class CompareRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public CompareRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -307,8 +311,9 @@ public class CompareRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public CompareRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -324,8 +329,9 @@ public class CompareRequestImplTest } - public void setMessageId( int messageId ) + public CompareRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java Fri May 20 15:32:49 2011 @@ -159,8 +159,9 @@ public class DeleteRequestImplTest } - public void setName( Dn name ) + public DeleteRequest setName( Dn name ) { + return this; } @@ -188,13 +189,15 @@ public class DeleteRequestImplTest } - public void addControl( Control control ) throws MessageException + public DeleteRequest addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control control ) throws MessageException + public DeleteRequest removeControl( Control control ) throws MessageException { + return this; } @@ -227,8 +230,9 @@ public class DeleteRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public DeleteRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -238,8 +242,9 @@ public class DeleteRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public DeleteRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -255,8 +260,9 @@ public class DeleteRequestImplTest } - public void setMessageId( int messageId ) + public DeleteRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java Fri May 20 15:32:49 2011 @@ -168,13 +168,14 @@ public class ExtendedRequestImplTest @Test public void testEqualsDiffImpl() { - ExtendedRequest req0 = new ExtendedRequest() + ExtendedRequest req0 = new ExtendedRequest() { private static final long serialVersionUID = 1L; - public void setRequestName( String oid ) + public ExtendedRequest setRequestName( String oid ) { + return this; } @@ -202,13 +203,15 @@ public class ExtendedRequestImplTest } - public void addControl( Control control ) throws MessageException + public ExtendedRequest addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control control ) throws MessageException + public ExtendedRequest removeControl( Control control ) throws MessageException { + return this; } @@ -242,8 +245,9 @@ public class ExtendedRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public ExtendedRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -259,8 +263,9 @@ public class ExtendedRequestImplTest } - public void setMessageId( int messageId ) + public ExtendedRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java Fri May 20 15:32:49 2011 @@ -26,14 +26,15 @@ import static org.junit.Assert.assertTru import java.util.HashMap; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.MessageException; import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * TestCase for the ExtendedResponseImpl class. @@ -161,13 +162,15 @@ public class ExtendedResponseImplTest } - public void addControl( Control a_control ) throws MessageException + public ExtendedResponse addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control a_control ) throws MessageException + public ExtendedResponse removeControl( Control control ) throws MessageException { + return this; } @@ -189,8 +192,9 @@ public class ExtendedResponseImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public ExtendedResponse addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -206,8 +210,9 @@ public class ExtendedResponseImplTest } - public void setMessageId( int messageId ) + public ExtendedResponse setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java Fri May 20 15:32:49 2011 @@ -258,8 +258,9 @@ public class ModifyDnRequestImplTest } - public void setName( Dn name ) + public ModifyDnRequest setName( Dn name ) { + return this; } @@ -277,8 +278,9 @@ public class ModifyDnRequestImplTest } - public void setNewRdn( Rdn newRdn ) + public ModifyDnRequest setNewRdn( Rdn newRdn ) { + return this; } @@ -288,8 +290,9 @@ public class ModifyDnRequestImplTest } - public void setDeleteOldRdn( boolean deleteOldRdn ) + public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn ) { + return this; } @@ -307,8 +310,9 @@ public class ModifyDnRequestImplTest } - public void setNewSuperior( Dn newSuperior ) + public ModifyDnRequest setNewSuperior( Dn newSuperior ) { + return this; } @@ -342,13 +346,15 @@ public class ModifyDnRequestImplTest } - public void addControl( Control a_control ) throws MessageException + public ModifyDnRequest addControl( Control a_control ) throws MessageException { + return this; } - public void removeControl( Control a_control ) throws MessageException + public ModifyDnRequest removeControl( Control a_control ) throws MessageException { + return this; } @@ -381,8 +387,9 @@ public class ModifyDnRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public ModifyDnRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -392,8 +399,9 @@ public class ModifyDnRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public ModifyDnRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -409,8 +417,9 @@ public class ModifyDnRequestImplTest } - public void setMessageId( int messageId ) + public ModifyDnRequest setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Fri May 20 15:32:49 2011 @@ -325,13 +325,15 @@ public class ModifyRequestImplTest } - public void addModification( Modification mod ) + public ModifyRequest addModification( Modification mod ) { + return this; } - public void removeModification( Modification mod ) + public ModifyRequest removeModification( Modification mod ) { + return this; } @@ -349,8 +351,9 @@ public class ModifyRequestImplTest } - public void setName( Dn name ) + public ModifyRequest setName( Dn name ) { + return this; } @@ -378,13 +381,15 @@ public class ModifyRequestImplTest } - public void addControl( Control a_control ) throws MessageException + public ModifyRequest addControl( Control a_control ) throws MessageException { + return this; } - public void removeControl( Control a_control ) throws MessageException + public ModifyRequest removeControl( Control a_control ) throws MessageException { + return this; } @@ -417,8 +422,9 @@ public class ModifyRequestImplTest } - public void addAbandonListener( AbandonListener listener ) + public ModifyRequest addAbandonListener( AbandonListener listener ) { + return this; } @@ -428,8 +434,9 @@ public class ModifyRequestImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public ModifyRequest addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -445,63 +452,75 @@ public class ModifyRequestImplTest } - public void setMessageId( int messageId ) + public ModifyRequest setMessageId( int messageId ) { + return this; } - public void addModification( Attribute attr, ModificationOperation modOp ) + public ModifyRequest addModification( Attribute attr, ModificationOperation modOp ) { + return this; } - public void replace( String attributeName ) + public ModifyRequest replace( String attributeName ) { + return this; } - public void replace( String attributeName, String... attributeValue ) + public ModifyRequest replace( String attributeName, String... attributeValue ) { + return this; } - public void replace( String attributeName, byte[]... attributeValue ) + public ModifyRequest replace( String attributeName, byte[]... attributeValue ) { + return this; } - public void replace( Attribute attr ) + public ModifyRequest replace( Attribute attr ) { + return this; } - public void add( String attributeName, String... attributeValue ) + public ModifyRequest add( String attributeName, String... attributeValue ) { + return this; } - public void add( String attributeName, byte[]... attributeValue ) + public ModifyRequest add( String attributeName, byte[]... attributeValue ) { + return this; } - public void add( Attribute attr ) + public ModifyRequest add( Attribute attr ) { + return this; } - public void remove( String attributeName, String... attributeValue ) + public ModifyRequest remove( String attributeName, String... attributeValue ) { + return this; } - public void remove( String attributeName, byte[]... attributeValue ) + public ModifyRequest remove( String attributeName, byte[]... attributeValue ) { + return this; } - public void remove( Attribute attr ) + public ModifyRequest remove( Attribute attr ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java Fri May 20 15:32:49 2011 @@ -26,14 +26,15 @@ import static org.junit.Assert.assertTru import java.util.HashMap; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.model.exception.MessageException; import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.MessageException; import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * TestCases for the SearchResponseImpl class methods. @@ -146,13 +147,15 @@ public class SearchResponseDoneImplTest } - public void addControl( Control a_control ) throws MessageException + public SearchResultDone addControl( Control a_control ) throws MessageException { + return this; } - public void removeControl( Control a_control ) throws MessageException + public SearchResultDone removeControl( Control a_control ) throws MessageException { + return this; } @@ -174,8 +177,9 @@ public class SearchResponseDoneImplTest } - public void addAllControls( Control[] controls ) throws MessageException + public SearchResultDone addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -191,8 +195,9 @@ public class SearchResponseDoneImplTest } - public void setMessageId( int messageId ) + public SearchResultDone setMessageId( int messageId ) { + return this; } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java?rev=1125432&r1=1125431&r2=1125432&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java Fri May 20 15:32:49 2011 @@ -26,12 +26,13 @@ import static org.junit.Assert.assertTru import java.util.HashMap; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.exception.MessageException; import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * TestCase for the SearchResponseReferenceImpl class. @@ -123,13 +124,15 @@ public class SearchResponseReferenceImpl } - public void addControl( Control control ) throws MessageException + public SearchResultReference addControl( Control control ) throws MessageException { + return this; } - public void removeControl( Control control ) throws MessageException + public SearchResultReference removeControl( Control control ) throws MessageException { + return this; } @@ -151,8 +154,9 @@ public class SearchResponseReferenceImpl } - public void addAllControls( Control[] controls ) throws MessageException + public SearchResultReference addAllControls( Control[] controls ) throws MessageException { + return this; } @@ -168,8 +172,9 @@ public class SearchResponseReferenceImpl } - public void setMessageId( int messageId ) + public SearchResultReference setMessageId( int messageId ) { + return this; } };