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 [3/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/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.dom4j.Element;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BindRequestDsml
+public class BindRequestDsml
extends AbstractResultResponseRequestDsml<BindRequest, BindResponse>
implements BindRequest
{
@@ -256,42 +256,42 @@ public class BindRequestDsml
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public BindRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public BindRequest addControl( Control control ) throws MessageException
{
- return (BindRequest)super.addControl( control );
+ return ( BindRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public BindRequest addAllControls( Control[] controls ) throws MessageException
{
- return (BindRequest)super.addAllControls( controls );
+ return ( BindRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public BindRequest removeControl( Control control ) throws MessageException
{
- return (BindRequest)super.removeControl( control );
+ return ( BindRequest ) super.removeControl( control );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -37,7 +37,7 @@ import org.dom4j.Element;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareRequestDsml
+public class CompareRequestDsml
extends AbstractResultResponseRequestDsml<CompareRequest, CompareResponse>
implements CompareRequest
{
@@ -120,7 +120,7 @@ public class CompareRequestDsml
public CompareRequest setName( Dn entry )
{
getDecorated().setName( entry );
-
+
return this;
}
@@ -180,7 +180,7 @@ public class CompareRequestDsml
public CompareRequest setAssertionValue( String value )
{
getDecorated().setAssertionValue( value );
-
+
return this;
}
@@ -191,7 +191,7 @@ public class CompareRequestDsml
public CompareRequest setAssertionValue( byte[] value )
{
getDecorated().setAssertionValue( value );
-
+
return this;
}
@@ -211,7 +211,7 @@ public class CompareRequestDsml
public CompareRequest setAttributeId( String attrId )
{
getDecorated().setAttributeId( attrId );
-
+
return this;
}
@@ -223,42 +223,42 @@ public class CompareRequestDsml
{
return getDecorated().getAssertionValue();
}
-
-
+
+
/**
* {@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 );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ import org.dom4j.Element;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DelRequestDsml
+public class DelRequestDsml
extends AbstractResultResponseRequestDsml<DeleteRequest, DeleteResponse>
implements DeleteRequest
{
@@ -133,45 +133,45 @@ public class DelRequestDsml
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 );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -38,7 +38,7 @@ import org.dom4j.QName;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedRequestDsml<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
+public class ExtendedRequestDsml<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
extends AbstractResultResponseRequestDsml<Q, P>
implements ExtendedRequest<P>
{
@@ -76,7 +76,7 @@ public class ExtendedRequestDsml<Q exten
// Request Name
if ( getDecorated().getRequestName() != null )
{
- element.addElement( "requestName" ).setText(
+ element.addElement( "requestName" ).setText(
getDecorated().getRequestName() );
}
@@ -88,7 +88,7 @@ public class ExtendedRequestDsml<Q exten
Element valueElement = element.addElement( "requestValue" ).addText(
ParserUtils.base64Encode( getRequestValue() ) );
- valueElement.addAttribute( new QName( "type", xsiNamespace ),
+ valueElement.addAttribute( new QName( "type", xsiNamespace ),
"xsd:" + ParserUtils.BASE64BINARY );
return element;
@@ -154,45 +154,45 @@ public class ExtendedRequestDsml<Q exten
public ExtendedRequest<P> setRequestName( String oid )
{
getDecorated().setRequestName( oid );
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> addControl( Control control ) throws MessageException
{
- return (ExtendedRequest<P>)super.addControl( control );
+ return ( ExtendedRequest<P> ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> addAllControls( Control[] controls ) throws MessageException
{
- return (ExtendedRequest<P>)super.addAllControls( controls );
+ return ( ExtendedRequest<P> ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> removeControl( Control control ) throws MessageException
{
- return (ExtendedRequest<P>)super.removeControl( control );
+ return ( ExtendedRequest<P> ) super.removeControl( control );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtensibleMatchFilter.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtensibleMatchFilter.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtensibleMatchFilter.java Tue Jan 24 17:27:00 2012
@@ -39,7 +39,6 @@ public class ExtensibleMatchFilter exten
/** The dnAttributes flag */
private boolean dnAttributes = false;
-
/**
* Get the dnAttributes flag
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -37,7 +37,7 @@ import org.dom4j.Element;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyDNRequestDsml
+public class ModifyDNRequestDsml
extends AbstractResultResponseRequestDsml<ModifyDnRequest, ModifyDnResponse>
implements ModifyDnRequest
{
@@ -165,7 +165,7 @@ public class ModifyDNRequestDsml
*
* @param newRdn The newRdn to set.
*/
- public void setNewRDN( Rdn newRdn)
+ public void setNewRDN( Rdn newRdn )
{
getDecorated().setNewRdn( newRdn );
}
@@ -190,7 +190,7 @@ public class ModifyDNRequestDsml
public ModifyDnRequest setNewSuperior( Dn newSuperior )
{
getDecorated().setNewSuperior( newSuperior );
-
+
return this;
}
@@ -210,7 +210,7 @@ public class ModifyDNRequestDsml
public ModifyDnRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
@@ -230,7 +230,7 @@ public class ModifyDNRequestDsml
public ModifyDnRequest setNewRdn( Rdn newRdn )
{
getDecorated().setNewRdn( newRdn );
-
+
return this;
}
@@ -250,7 +250,7 @@ public class ModifyDNRequestDsml
public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn )
{
getDecorated().setDeleteOldRdn( deleteOldRdn );
-
+
return this;
}
@@ -262,42 +262,42 @@ public class ModifyDNRequestDsml
{
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 );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -48,7 +48,7 @@ import org.dom4j.QName;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyRequestDsml
+public class ModifyRequestDsml
extends AbstractResultResponseRequestDsml<ModifyRequest, ModifyResponse>
implements ModifyRequest
{
@@ -58,8 +58,8 @@ public class ModifyRequestDsml
/** A local storage for the operation */
private ModificationOperation currentOperation;
-
-
+
+
/**
* Creates a new getDecoratedMessage() of ModifyRequestDsml.
*/
@@ -89,7 +89,7 @@ public class ModifyRequestDsml
return currentAttribute.getId();
}
-
+
/**
* Store the current operation
*
@@ -210,8 +210,7 @@ public class ModifyRequestDsml
//-------------------------------------------------------------------------
// The ModifyRequest methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -236,7 +235,7 @@ public class ModifyRequestDsml
public ModifyRequest setName( Dn name )
{
getDecorated().setName( name );
-
+
return this;
}
@@ -256,7 +255,7 @@ public class ModifyRequestDsml
public ModifyRequest addModification( Modification mod )
{
getDecorated().addModification( mod );
-
+
return this;
}
@@ -267,7 +266,7 @@ public class ModifyRequestDsml
public ModifyRequest removeModification( Modification mod )
{
getDecorated().removeModification( mod );
-
+
return this;
}
@@ -278,7 +277,7 @@ public class ModifyRequestDsml
public ModifyRequest remove( String attributeName, String... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
-
+
return this;
}
@@ -289,7 +288,7 @@ public class ModifyRequestDsml
public ModifyRequest remove( String attributeName, byte[]... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
-
+
return this;
}
@@ -300,7 +299,7 @@ public class ModifyRequestDsml
public ModifyRequest remove( Attribute attr )
{
getDecorated().remove( attr );
-
+
return this;
}
@@ -311,7 +310,7 @@ public class ModifyRequestDsml
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
-
+
return this;
}
@@ -322,7 +321,7 @@ public class ModifyRequestDsml
public ModifyRequest add( String attributeName, String... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
-
+
return this;
}
@@ -333,7 +332,7 @@ public class ModifyRequestDsml
public ModifyRequest add( String attributeName, byte[]... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
-
+
return this;
}
@@ -344,7 +343,7 @@ public class ModifyRequestDsml
public ModifyRequest add( Attribute attr )
{
getDecorated().add( attr );
-
+
return this;
}
@@ -355,7 +354,7 @@ public class ModifyRequestDsml
public ModifyRequest replace( String attributeName )
{
getDecorated().replace( attributeName );
-
+
return this;
}
@@ -366,7 +365,7 @@ public class ModifyRequestDsml
public ModifyRequest replace( String attributeName, String... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
-
+
return this;
}
@@ -377,7 +376,7 @@ public class ModifyRequestDsml
public ModifyRequest replace( String attributeName, byte[]... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
-
+
return this;
}
@@ -388,45 +387,45 @@ public class ModifyRequestDsml
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 );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Tue Jan 24 17:27:00 2012
@@ -61,7 +61,7 @@ import org.dom4j.QName;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchRequestDsml
+public class SearchRequestDsml
extends AbstractResultResponseRequestDsml<SearchRequest, SearchResultDone>
implements SearchRequest
{
@@ -73,8 +73,8 @@ public class SearchRequestDsml
/** The global filter. This is used while decoding a PDU */
private Filter topFilter;
-
-
+
+
/**
* Creates a new getDecoratedMessage() of SearchRequestDsml.
*/
@@ -94,8 +94,6 @@ public class SearchRequestDsml
{
super( codec, ldapMessage );
}
-
-
public Filter getCurrentFilter()
@@ -193,8 +191,6 @@ public class SearchRequestDsml
topFilter = localFilter;
}
}
-
-
/**
@@ -203,25 +199,26 @@ public class SearchRequestDsml
* @param filter The filter to be transformed
* @return An ExprNode
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings(
+ { "unchecked", "rawtypes" })
private ExprNode transform( Filter filter )
{
if ( filter != null )
{
// Transform OR, AND or NOT leaves
- if ( filter instanceof ConnectorFilter)
+ if ( filter instanceof ConnectorFilter )
{
BranchNode branch = null;
- if ( filter instanceof AndFilter)
+ if ( filter instanceof AndFilter )
{
branch = new AndNode();
}
- else if ( filter instanceof OrFilter)
+ else if ( filter instanceof OrFilter )
{
branch = new OrNode();
}
- else if ( filter instanceof NotFilter)
+ else if ( filter instanceof NotFilter )
{
branch = new NotNode();
}
@@ -333,7 +330,7 @@ public class SearchRequestDsml
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -456,7 +453,7 @@ public class SearchRequestDsml
{
Element newElement = element.addElement( "and" );
- List<ExprNode> filterList = ( (AndNode) filter ).getChildren();
+ List<ExprNode> filterList = ( ( AndNode ) filter ).getChildren();
for ( int i = 0; i < filterList.size(); i++ )
{
@@ -486,7 +483,7 @@ public class SearchRequestDsml
}
// SUBSTRING FILTER
- else if ( filter instanceof SubstringNode)
+ else if ( filter instanceof SubstringNode )
{
Element newElement = element.addElement( "substrings" );
@@ -640,7 +637,7 @@ public class SearchRequestDsml
public SearchRequest setBase( Dn baseDn )
{
getDecorated().setBase( baseDn );
-
+
return this;
}
@@ -660,7 +657,7 @@ public class SearchRequestDsml
public SearchRequest setScope( SearchScope scope )
{
getDecorated().setScope( scope );
-
+
return this;
}
@@ -680,7 +677,7 @@ public class SearchRequestDsml
public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases )
{
getDecorated().setDerefAliases( aliasDerefAliases );
-
+
return this;
}
@@ -700,7 +697,7 @@ public class SearchRequestDsml
public SearchRequest setSizeLimit( long entriesMax )
{
getDecorated().setSizeLimit( entriesMax );
-
+
return this;
}
@@ -720,7 +717,7 @@ public class SearchRequestDsml
public SearchRequest setTimeLimit( int secondsMax )
{
getDecorated().setTimeLimit( secondsMax );
-
+
return this;
}
@@ -740,7 +737,7 @@ public class SearchRequestDsml
public SearchRequest setTypesOnly( boolean typesOnly )
{
getDecorated().setTypesOnly( typesOnly );
-
+
return this;
}
@@ -760,7 +757,7 @@ public class SearchRequestDsml
public SearchRequest setFilter( ExprNode filter )
{
getDecorated().setFilter( filter );
-
+
return this;
}
@@ -771,7 +768,7 @@ public class SearchRequestDsml
public SearchRequest setFilter( String filter ) throws LdapException
{
getDecorated().setFilter( filter );
-
+
return this;
}
@@ -791,7 +788,7 @@ public class SearchRequestDsml
public SearchRequest addAttributes( String... attributes )
{
getDecorated().addAttributes( attributes );
-
+
return this;
}
@@ -802,7 +799,7 @@ public class SearchRequestDsml
public SearchRequest removeAttribute( String attribute )
{
getDecorated().removeAttribute( attribute );
-
+
return this;
}
@@ -812,33 +809,33 @@ public class SearchRequestDsml
*/
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/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SubstringFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SubstringFilter.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SubstringFilter.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SubstringFilter.java Tue Jan 24 17:27:00 2012
@@ -162,7 +162,7 @@ public class SubstringFilter extends Fil
if ( anySubstrings != null )
{
- for ( String any:anySubstrings )
+ for ( String any : anySubstrings )
{
sb.append( any ).append( '*' );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java Tue Jan 24 17:27:00 2012
@@ -26,6 +26,7 @@ import static org.junit.Assert.fail;
import org.xmlpull.v1.XmlPullParserException;
+
/**
* This class had to be used to create a Response TestCase
*
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java Tue Jan 24 17:27:00 2012
@@ -29,6 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.xmlpull.v1.XmlPullParserException;
+
/**
* This class had to be used to create a Request TestCase
*
@@ -38,25 +39,22 @@ public abstract class AbstractTest
{
/** The LDAP encoder decoder service */
private LdapApiService codec = LdapApiServiceFactory.getSingleton();
-
+
private Dsmlv2Grammar grammar = new Dsmlv2Grammar();
-
-
+
+
public Dsmlv2Parser newParser() throws Exception
{
return new Dsmlv2Parser( grammar );
}
-
-
+
+
public LdapApiService getCodec()
{
return codec;
}
-
-
-
-
-
+
+
/**
* Asserts that parsing throws a correct XmlPullParserException due to an incorrect file
*
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java Tue Jan 24 17:27:00 2012
@@ -56,32 +56,32 @@ import com.mycila.junit.concurrent.Concu
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith(ConcurrentSuite.class)
-@Suite.SuiteClasses({
- AbandonRequestTest.class,
- AddRequestTest.class,
- AddResponseTest.class,
- AuthRequestTest.class,
- AuthResponseTest.class,
- BatchRequestTest.class,
- BatchResponseTest.class,
- CompareRequestTest.class,
- CompareResponseTest.class,
- DelRequestTest.class,
- DelResponseTest.class,
- ErrorResponseTest.class,
- ExtendedRequestTest.class,
- ExtendedResponseTest.class,
- ModifyDNRequestTest.class,
- ModifyDNResponseTest.class,
- ModifyRequestTest.class,
- ModifyResponseTest.class,
- SearchRequestTest.class,
- SearchResponseTest.class,
- SearchResultDoneTest.class,
- SearchResultEntryTest.class,
- SearchResultReferenceTest.class
+@Suite.SuiteClasses(
+ {
+ AbandonRequestTest.class,
+ AddRequestTest.class,
+ AddResponseTest.class,
+ AuthRequestTest.class,
+ AuthResponseTest.class,
+ BatchRequestTest.class,
+ BatchResponseTest.class,
+ CompareRequestTest.class,
+ CompareResponseTest.class,
+ DelRequestTest.class,
+ DelResponseTest.class,
+ ErrorResponseTest.class,
+ ExtendedRequestTest.class,
+ ExtendedResponseTest.class,
+ ModifyDNRequestTest.class,
+ ModifyDNResponseTest.class,
+ ModifyRequestTest.class,
+ ModifyResponseTest.class,
+ SearchRequestTest.class,
+ SearchResponseTest.class,
+ SearchResultDoneTest.class,
+ SearchResultEntryTest.class,
+ SearchResultReferenceTest.class
})
-
public class AllTests
{
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Tue Jan 24 17:27:00 2012
@@ -147,17 +147,17 @@ public class AbandonRequestTest extends
fail( e.getMessage() );
}
- AbandonRequest abandonRequest = (AbandonRequest) parser.getBatchRequest().getCurrentRequest();
+ AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = abandonRequest.getControls();
assertEquals( 1, abandonRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.643" );
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString(( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -187,13 +187,13 @@ public class AbandonRequestTest extends
Map<String, Control> controls = abandonRequest.getControls();
assertEquals( 1, abandonRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.643" );
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -229,7 +229,7 @@ public class AbandonRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
+ assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
}
@@ -265,7 +265,7 @@ public class AbandonRequestTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -301,7 +301,7 @@ public class AbandonRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
+ assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Tue Jan 24 17:27:00 2012
@@ -55,7 +55,7 @@ import com.mycila.junit.concurrent.Concu
@Concurrency()
public class AddRequestTest extends AbstractTest
{
-
+
/**
* Test parsing of a request without the dn attribute
*/
@@ -188,13 +188,13 @@ public class AddRequestTest extends Abst
Map<String, Control> controls = addRequest.getControls();
assertEquals( 1, addRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.643" );
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -223,7 +223,7 @@ public class AddRequestTest extends Abst
Map<String, Control> controls = addRequest.getControls();
assertEquals( 1, addRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.643" );
assertNotNull( control );
@@ -257,13 +257,13 @@ public class AddRequestTest extends Abst
Map<String, Control> controls = addRequest.getControls();
assertEquals( 2, addRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.789" );
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -292,7 +292,7 @@ public class AddRequestTest extends Abst
Map<String, Control> controls = addRequest.getControls();
assertEquals( 3, addRequest.getControls().size() );
-
+
Control control = controls.get( "1.2.840.113556.1.4.456" );
assertNotNull( control );
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Tue Jan 24 17:27:00 2012
@@ -125,7 +125,7 @@ public class AddResponseTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -160,7 +160,7 @@ public class AddResponseTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
+ assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
}
@@ -194,7 +194,7 @@ public class AddResponseTest extends Abs
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -229,7 +229,7 @@ public class AddResponseTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
+ assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Tue Jan 24 17:27:00 2012
@@ -155,7 +155,7 @@ public class AuthRequestTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -190,7 +190,7 @@ public class AuthRequestTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -249,7 +249,7 @@ public class AuthRequestTest extends Abs
fail( e.getMessage() );
}
- BindRequest abandonRequest = (BindRequest) parser.getBatchRequest().getCurrentRequest();
+ BindRequest abandonRequest = ( BindRequest ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = abandonRequest.getControls();
assertEquals( 2, abandonRequest.getControls().size() );
@@ -259,7 +259,7 @@ public class AuthRequestTest extends Abs
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Tue Jan 24 17:27:00 2012
@@ -125,7 +125,7 @@ public class AuthResponseTest extends Ab
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -195,7 +195,7 @@ public class AuthResponseTest extends Ab
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -363,7 +363,7 @@ public class AuthResponseTest extends Ab
fail( e.getMessage() );
}
- BindResponse bindResponse = (BindResponse) parser.getBatchResponse().getCurrentResponse();
+ BindResponse bindResponse = ( BindResponse ) parser.getBatchResponse().getCurrentResponse();
LdapResult ldapResult = bindResponse.getLdapResult();
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java Tue Jan 24 17:27:00 2012
@@ -146,7 +146,7 @@ public class BatchRequestTest extends Ab
assertEquals( 1, batchRequest.getRequests().size() );
- if ( batchRequest.getCurrentRequest() instanceof BindRequest)
+ if ( batchRequest.getCurrentRequest() instanceof BindRequest )
{
assertTrue( true );
}
@@ -326,7 +326,7 @@ public class BatchRequestTest extends Ab
assertEquals( 1, batchRequest.getRequests().size() );
- if ( batchRequest.getCurrentRequest() instanceof ExtendedRequest)
+ if ( batchRequest.getCurrentRequest() instanceof ExtendedRequest )
{
assertTrue( true );
}
@@ -398,7 +398,7 @@ public class BatchRequestTest extends Ab
assertEquals( 1, batchRequest.getRequests().size() );
- if ( batchRequest.getCurrentRequest() instanceof ModifyRequest)
+ if ( batchRequest.getCurrentRequest() instanceof ModifyRequest )
{
assertTrue( true );
}
@@ -756,7 +756,7 @@ public class BatchRequestTest extends Ab
BatchRequestDsml batchRequest = parser.getBatchRequest();
- List<DsmlDecorator<? extends Request>> requests =
+ List<DsmlDecorator<? extends Request>> requests =
batchRequest.getRequests();
assertEquals( 2, requests.size() );
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java Tue Jan 24 17:27:00 2012
@@ -146,7 +146,7 @@ public class BatchResponseTest extends A
DsmlDecorator<? extends Response> response = batchResponse.getCurrentResponse();
- if ( response instanceof AddResponse)
+ if ( response instanceof AddResponse )
{
assertTrue( true );
}
@@ -678,7 +678,7 @@ public class BatchResponseTest extends A
DsmlDecorator<? extends Response> response = batchResponse.getCurrentResponse();
- if ( response instanceof ExtendedResponse)
+ if ( response instanceof ExtendedResponse )
{
assertTrue( true );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Tue Jan 24 17:27:00 2012
@@ -157,7 +157,7 @@ public class CompareRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -192,7 +192,7 @@ public class CompareRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -262,7 +262,7 @@ public class CompareRequestTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Tue Jan 24 17:27:00 2012
@@ -126,7 +126,7 @@ public class CompareResponseTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -196,7 +196,7 @@ public class CompareResponseTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -524,7 +524,7 @@ public class CompareResponseTest extends
fail( e.getMessage() );
}
- CompareResponse compareResponse = (CompareResponse) parser.getBatchResponse().getCurrentResponse();
+ CompareResponse compareResponse = ( CompareResponse ) parser.getBatchResponse().getCurrentResponse();
LdapResult ldapResult = compareResponse.getLdapResult();
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Tue Jan 24 17:27:00 2012
@@ -154,7 +154,7 @@ public class DelRequestTest extends Abst
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -189,7 +189,7 @@ public class DelRequestTest extends Abst
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -259,7 +259,7 @@ public class DelRequestTest extends Abst
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Tue Jan 24 17:27:00 2012
@@ -125,7 +125,7 @@ public class DelResponseTest extends Abs
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -194,7 +194,7 @@ public class DelResponseTest extends Abs
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -361,7 +361,7 @@ public class DelResponseTest extends Abs
fail( e.getMessage() );
}
- DeleteResponse delResponse = (DeleteResponse) parser.getBatchResponse().getCurrentResponse();
+ DeleteResponse delResponse = ( DeleteResponse ) parser.getBatchResponse().getCurrentResponse();
LdapResult ldapResult = delResponse.getLdapResult();
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Tue Jan 24 17:27:00 2012
@@ -72,8 +72,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
assertEquals( 456, extendedRequest.getMessageId() );
}
@@ -110,8 +110,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
@@ -121,7 +121,7 @@ public class ExtendedRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -146,8 +146,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
@@ -157,7 +157,7 @@ public class ExtendedRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -182,8 +182,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
@@ -218,8 +218,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 2, extendedRequest.getControls().size() );
@@ -229,7 +229,7 @@ public class ExtendedRequestTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -254,8 +254,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 3, extendedRequest.getControls().size() );
@@ -290,8 +290,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
assertEquals( "foobar", new String( extendedRequest.getRequestValue() ) );
}
@@ -318,8 +318,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
assertEquals( "DSMLv2.0 rocks!!", new String( extendedRequest.getRequestValue() ) );
}
@@ -376,8 +376,8 @@ public class ExtendedRequestTest extends
fail( e.getMessage() );
}
- ExtendedRequestDsml<?,?> extendedRequest =
- ( ExtendedRequestDsml<?,?> ) parser.getBatchRequest().getCurrentRequest();
+ ExtendedRequestDsml<?, ?> extendedRequest =
+ ( ExtendedRequestDsml<?, ?> ) parser.getBatchRequest().getCurrentRequest();
assertNull( extendedRequest.getRequestValue() );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Tue Jan 24 17:27:00 2012
@@ -129,7 +129,7 @@ public class ExtendedResponseTest extend
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -199,7 +199,7 @@ public class ExtendedResponseTest extend
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -308,7 +308,7 @@ public class ExtendedResponseTest extend
fail( e.getMessage() );
}
- ExtendedResponse extendedResponse = (ExtendedResponse) parser.getBatchResponse().getCurrentResponse();
+ ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
LdapResult ldapResult = extendedResponse.getLdapResult();
@@ -639,7 +639,7 @@ public class ExtendedResponseTest extend
ExtendedResponseDsml extendedResponse = ( ExtendedResponseDsml ) parser.getBatchResponse().getCurrentResponse();
- assertEquals( "This is a response", Strings.utf8ToString(extendedResponse.getResponseValue()) );
+ assertEquals( "This is a response", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
}
@@ -693,7 +693,7 @@ public class ExtendedResponseTest extend
ExtendedResponseDsml extendedResponse = ( ExtendedResponseDsml ) parser.getBatchResponse().getCurrentResponse();
- assertEquals( "", Strings.utf8ToString(extendedResponse.getResponseValue()) );
+ assertEquals( "", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
}
@@ -720,7 +720,7 @@ public class ExtendedResponseTest extend
ExtendedResponseDsml extendedResponse = ( ExtendedResponseDsml ) parser.getBatchResponse().getCurrentResponse();
- assertEquals( "This is a response", Strings.utf8ToString(extendedResponse.getResponseValue()) );
+ assertEquals( "This is a response", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
try
{
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Tue Jan 24 17:27:00 2012
@@ -119,7 +119,7 @@ public class ModifyDNRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -154,7 +154,7 @@ public class ModifyDNRequestTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -224,7 +224,7 @@ public class ModifyDNRequestTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -387,7 +387,7 @@ public class ModifyDNRequestTest extends
fail( e.getMessage() );
}
- ModifyDnRequest modifyDNRequest = (ModifyDnRequest) parser.getBatchRequest().getCurrentRequest();
+ ModifyDnRequest modifyDNRequest = ( ModifyDnRequest ) parser.getBatchRequest().getCurrentRequest();
assertFalse( modifyDNRequest.getDeleteOldRdn() );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Tue Jan 24 17:27:00 2012
@@ -126,7 +126,7 @@ public class ModifyDNResponseTest extend
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -196,7 +196,7 @@ public class ModifyDNResponseTest extend
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Tue Jan 24 17:27:00 2012
@@ -126,7 +126,7 @@ public class ModifyRequestTest extends A
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -161,7 +161,7 @@ public class ModifyRequestTest extends A
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -231,7 +231,7 @@ public class ModifyRequestTest extends A
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -610,7 +610,7 @@ public class ModifyRequestTest extends A
assertEquals( "directreport", attribute.getId() );
assertEquals( 2, attribute.size() );
-
+
assertTrue( attribute.contains( "CN=John Smith, DC=microsoft, DC=com" ) );
assertTrue( attribute.contains( "CN=Steve Jobs, DC=apple, DC=com" ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Tue Jan 24 17:27:00 2012
@@ -126,7 +126,7 @@ public class ModifyResponseTest extends
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -196,7 +196,7 @@ public class ModifyResponseTest extends
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Tue Jan 24 17:27:00 2012
@@ -171,7 +171,7 @@ public class SearchRequestTest extends A
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -206,7 +206,7 @@ public class SearchRequestTest extends A
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -276,7 +276,7 @@ public class SearchRequestTest extends A
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?> ) control ).getValue()) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -1284,7 +1284,7 @@ public class SearchRequestTest extends A
assertTrue( filter instanceof LessEqNode );
- LessEqNode<?> lessOrEqFilter = (LessEqNode<?>) filter;
+ LessEqNode<?> lessOrEqFilter = ( LessEqNode<?> ) filter;
assertEquals( "sn", lessOrEqFilter.getAttribute() );
@@ -1488,7 +1488,7 @@ public class SearchRequestTest extends A
assertTrue( filter instanceof EqualityNode );
- EqualityNode<?> equalityFilter = (EqualityNode<?>) filter;
+ EqualityNode<?> equalityFilter = ( EqualityNode<?> ) filter;
assertEquals( "sn", equalityFilter.getAttribute() );
@@ -1929,7 +1929,7 @@ public class SearchRequestTest extends A
assertTrue( filter instanceof SubstringNode );
- SubstringNode substringFilter = (SubstringNode) filter;
+ SubstringNode substringFilter = ( SubstringNode ) filter;
assertEquals( "sn", substringFilter.getAttribute() );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java Tue Jan 24 17:27:00 2012
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests for the Search Result Done Response parsing
*
@@ -64,7 +65,8 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated();
+ SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse()
+ .getDecorated();
assertEquals( 456, searchResponse.getMessageId() );
}
@@ -100,7 +102,8 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated();
+ SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse()
+ .getDecorated();
assertNotNull( searchResponse.getSearchResultDone() );
}
@@ -127,7 +130,8 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated();
+ SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse()
+ .getDecorated();
assertEquals( 1, searchResponse.getSearchResultEntryList().size() );
@@ -156,7 +160,8 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated();
+ SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse()
+ .getDecorated();
assertEquals( 0, searchResponse.getSearchResultEntryList().size() );
@@ -185,7 +190,7 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse )
+ SearchResponse searchResponse = ( SearchResponse )
parser.getBatchResponse().getCurrentResponse().getDecorated();
assertEquals( 1, searchResponse.getSearchResultReferenceList().size() );
@@ -215,7 +220,7 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse )
+ SearchResponse searchResponse = ( SearchResponse )
parser.getBatchResponse().getCurrentResponse().getDecorated();
assertEquals( 1, searchResponse.getSearchResultEntryList().size() );
@@ -247,7 +252,7 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse )
+ SearchResponse searchResponse = ( SearchResponse )
parser.getBatchResponse().getCurrentResponse().getDecorated();
assertEquals( 2, searchResponse.getSearchResultEntryList().size() );
@@ -277,7 +282,7 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse )
+ SearchResponse searchResponse = ( SearchResponse )
parser.getBatchResponse().getCurrentResponse().getDecorated();
assertEquals( 2, searchResponse.getSearchResultReferenceList().size() );
@@ -307,7 +312,8 @@ public class SearchResponseTest extends
fail( e.getMessage() );
}
- SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated();
+ SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse()
+ .getDecorated();
assertEquals( 2, searchResponse.getSearchResultEntryList().size() );