You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/12/17 15:18:17 UTC
svn commit: r1774774 [4/10] - in /directory/shared/branches/shared-value: ./
asn1/ber/src/main/java/org/apache/directory/api/asn1/actions/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/
asn1/ber/src/main/java/org/apache/directory/api/asn1/be...
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -35,6 +35,9 @@ import org.dom4j.QName;
/**
* DSML Decorator for ExtendedRequest
*
+ * @param <Q> The extended request type
+ * @param <P> The extended response type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ExtendedRequestDsml<Q extends ExtendedRequest, P extends ExtendedResponse>
@@ -59,6 +62,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -68,6 +72,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
Element element = super.toDsml( root );
@@ -99,6 +104,7 @@ public class ExtendedRequestDsml<Q exten
*
* @return Returns the request name.
*/
+ @Override
public String getRequestName()
{
return getDecorated().getRequestName();
@@ -141,6 +147,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getResponseType()
{
return getDecorated().getResponseType();
@@ -150,6 +157,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest setRequestName( String oid )
{
getDecorated().setRequestName( oid );
@@ -161,6 +169,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -172,6 +181,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest addControl( Control control )
{
return ( ExtendedRequest ) super.addControl( control );
@@ -181,6 +191,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest addAllControls( Control[] controls )
{
return ( ExtendedRequest ) super.addAllControls( controls );
@@ -190,6 +201,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest removeControl( Control control )
{
return ( ExtendedRequest ) super.removeControl( control );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java Sat Dec 17 15:18:15 2016
@@ -134,10 +134,10 @@ public class ExtensibleMatchFilter exten
*
* @return An Extened Filter String
*/
+ @Override
public String toString()
{
-
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if ( type != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyDNRequestDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyDNRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -66,6 +66,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -75,6 +76,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
Element element = super.toDsml( root );
@@ -94,7 +96,7 @@ public class ModifyDNRequestDsml
}
// DeleteOldRDN
- element.addAttribute( "deleteoldrdn", ( request.getDeleteOldRdn() ? "true" : "false" ) );
+ element.addAttribute( "deleteoldrdn", request.getDeleteOldRdn() ? "true" : "false" );
// NewSuperior
if ( request.getNewRdn() != null )
@@ -111,6 +113,7 @@ public class ModifyDNRequestDsml
*
* @return Returns the name.
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -177,6 +180,7 @@ public class ModifyDNRequestDsml
*
* @return Returns the newSuperior.
*/
+ @Override
public Dn getNewSuperior()
{
return getDecorated().getNewSuperior();
@@ -188,6 +192,7 @@ public class ModifyDNRequestDsml
*
* @param newSuperior The newSuperior to set.
*/
+ @Override
public ModifyDnRequest setNewSuperior( Dn newSuperior )
{
getDecorated().setNewSuperior( newSuperior );
@@ -199,6 +204,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getResponseType()
{
return getDecorated().getResponseType();
@@ -208,6 +214,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -219,6 +226,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Rdn getNewRdn()
{
return getDecorated().getNewRdn();
@@ -228,6 +236,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setNewRdn( Rdn newRdn )
{
getDecorated().setNewRdn( newRdn );
@@ -239,6 +248,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public boolean getDeleteOldRdn()
{
return getDecorated().getDeleteOldRdn();
@@ -248,6 +258,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn )
{
getDecorated().setDeleteOldRdn( deleteOldRdn );
@@ -259,6 +270,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public boolean isMove()
{
return getDecorated().isMove();
@@ -268,6 +280,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -279,6 +292,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest addControl( Control control )
{
return ( ModifyDnRequest ) super.addControl( control );
@@ -288,6 +302,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest addAllControls( Control[] controls )
{
return ( ModifyDnRequest ) super.addAllControls( controls );
@@ -297,6 +312,7 @@ public class ModifyDNRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyDnRequest removeControl( Control control )
{
return ( ModifyDnRequest ) super.removeControl( control );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -143,6 +143,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
Element element = super.toDsml( root );
@@ -217,6 +218,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getResponseType()
{
return getDecorated().getResponseType();
@@ -226,6 +228,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Dn getName()
{
return getDecorated().getName();
@@ -235,6 +238,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest setName( Dn name )
{
getDecorated().setName( name );
@@ -246,6 +250,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Collection<Modification> getModifications()
{
return getDecorated().getModifications();
@@ -255,6 +260,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addModification( Modification mod )
{
getDecorated().addModification( mod );
@@ -266,6 +272,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest removeModification( Modification mod )
{
getDecorated().removeModification( mod );
@@ -277,6 +284,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( String attributeName, String... attributeValue )
{
getDecorated().remove( attributeName, attributeValue );
@@ -299,6 +307,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( Attribute attr )
{
getDecorated().remove( attr );
@@ -310,6 +319,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest remove( String attributeName )
{
getDecorated().remove( attributeName );
@@ -321,6 +331,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
{
getDecorated().addModification( attr, modOp );
@@ -332,6 +343,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest add( String attributeName, String... attributeValue )
{
getDecorated().add( attributeName, attributeValue );
@@ -354,6 +366,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest add( Attribute attr )
{
getDecorated().add( attr );
@@ -365,6 +378,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( String attributeName )
{
getDecorated().replace( attributeName );
@@ -376,6 +390,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( String attributeName, String... attributeValue )
{
getDecorated().replace( attributeName, attributeValue );
@@ -398,6 +413,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest replace( Attribute attr )
{
getDecorated().replace( attr );
@@ -409,6 +425,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -420,6 +437,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addControl( Control control )
{
return ( ModifyRequest ) super.addControl( control );
@@ -429,6 +447,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest addAllControls( Control[] controls )
{
return ( ModifyRequest ) super.addAllControls( controls );
@@ -438,6 +457,7 @@ public class ModifyRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ModifyRequest removeControl( Control control )
{
return ( ModifyRequest ) super.removeControl( control );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/NotFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/NotFilter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/NotFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/NotFilter.java Sat Dec 17 15:18:15 2016
@@ -37,6 +37,7 @@ public class NotFilter extends Connector
*
* @param filter The Filter to add
*/
+ @Override
public void addFilter( Filter filter ) throws DecoderException
{
if ( filterSet != null )
@@ -81,9 +82,10 @@ public class NotFilter extends Connector
*
* @return The NOT filter string
*/
+ @Override
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( '!' ).append( super.toString() );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/OrFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/OrFilter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/OrFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/OrFilter.java Sat Dec 17 15:18:15 2016
@@ -46,10 +46,11 @@ public class OrFilter extends ConnectorF
*
* @return The OR filter string
*/
+ @Override
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( '|' ).append( super.toString() );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/PresentFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/PresentFilter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/PresentFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/PresentFilter.java Sat Dec 17 15:18:15 2016
@@ -58,10 +58,10 @@ public class PresentFilter extends Filte
*
* @return The Present filter string
*/
+ @Override
public String toString()
{
-
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( attributeDescription ).append( "=*" );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -210,7 +210,7 @@ public class SearchRequestDsml
// Transform OR, AND or NOT leaves
if ( filter instanceof ConnectorFilter )
{
- BranchNode branch = null;
+ BranchNode branch;
if ( filter instanceof AndFilter )
{
@@ -305,7 +305,7 @@ public class SearchRequestDsml
if ( substrFilter.getAnySubstrings() != null )
{
- anyString = new ArrayList<String>();
+ anyString = new ArrayList<>();
for ( String any : substrFilter.getAnySubstrings() )
{
@@ -345,6 +345,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -354,6 +355,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
Element element = super.toDsml( root );
@@ -412,13 +414,13 @@ public class SearchRequestDsml
// SizeLimit
if ( request.getSizeLimit() != 0L )
{
- element.addAttribute( "sizeLimit", "" + request.getSizeLimit() );
+ element.addAttribute( "sizeLimit", Long.toString( request.getSizeLimit() ) );
}
// TimeLimit
if ( request.getTimeLimit() != 0 )
{
- element.addAttribute( "timeLimit", "" + request.getTimeLimit() );
+ element.addAttribute( "timeLimit", Integer.toString( request.getTimeLimit() ) );
}
// TypesOnly
@@ -434,7 +436,7 @@ public class SearchRequestDsml
// Attributes
List<String> attributes = request.getAttributes();
- if ( attributes.size() > 0 )
+ if ( !attributes.isEmpty() )
{
Element attributesElement = element.addElement( "attributes" );
@@ -527,7 +529,7 @@ public class SearchRequestDsml
// APPROXMATCH, EQUALITYMATCH, GREATEROREQUALS & LESSOREQUAL FILTERS
else if ( filter instanceof SimpleNode )
{
- Element newElement = null;
+ Element newElement;
if ( filter instanceof ApproximateNode )
{
@@ -624,6 +626,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum[] getResponseTypes()
{
return getDecorated().getResponseTypes();
@@ -633,6 +636,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public Dn getBase()
{
return getDecorated().getBase();
@@ -642,6 +646,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setBase( Dn baseDn )
{
getDecorated().setBase( baseDn );
@@ -653,6 +658,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchScope getScope()
{
return getDecorated().getScope();
@@ -662,6 +668,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setScope( SearchScope scope )
{
getDecorated().setScope( scope );
@@ -673,6 +680,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public AliasDerefMode getDerefAliases()
{
return getDecorated().getDerefAliases();
@@ -682,6 +690,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases )
{
getDecorated().setDerefAliases( aliasDerefAliases );
@@ -693,6 +702,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public long getSizeLimit()
{
return getDecorated().getSizeLimit();
@@ -702,6 +712,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setSizeLimit( long entriesMax )
{
getDecorated().setSizeLimit( entriesMax );
@@ -713,6 +724,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public int getTimeLimit()
{
return getDecorated().getTimeLimit();
@@ -722,6 +734,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setTimeLimit( int secondsMax )
{
getDecorated().setTimeLimit( secondsMax );
@@ -733,6 +746,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public boolean getTypesOnly()
{
return getDecorated().getTypesOnly();
@@ -742,6 +756,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setTypesOnly( boolean typesOnly )
{
getDecorated().setTypesOnly( typesOnly );
@@ -753,6 +768,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public ExprNode getFilter()
{
return getDecorated().getFilter();
@@ -762,6 +778,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setFilter( ExprNode filter )
{
getDecorated().setFilter( filter );
@@ -773,6 +790,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setFilter( String filter ) throws LdapException
{
getDecorated().setFilter( filter );
@@ -784,6 +802,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getAttributes()
{
return getDecorated().getAttributes();
@@ -793,6 +812,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addAttributes( String... attributes )
{
getDecorated().addAttributes( attributes );
@@ -804,6 +824,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest removeAttribute( String attribute )
{
getDecorated().removeAttribute( attribute );
@@ -815,6 +836,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest setMessageId( int messageId )
{
return ( SearchRequest ) super.setMessageId( messageId );
@@ -824,6 +846,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addControl( Control control )
{
return ( SearchRequest ) super.addControl( control );
@@ -833,6 +856,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest addAllControls( Control[] controls )
{
return ( SearchRequest ) super.addAllControls( controls );
@@ -842,6 +866,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest removeControl( Control control )
{
return ( SearchRequest ) super.removeControl( control );
@@ -851,6 +876,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public boolean isFollowReferrals()
{
return getDecorated().isFollowReferrals();
@@ -860,6 +886,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest followReferrals()
{
return getDecorated().followReferrals();
@@ -869,6 +896,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public boolean isIgnoreReferrals()
{
return getDecorated().isIgnoreReferrals();
@@ -878,6 +906,7 @@ public class SearchRequestDsml
/**
* {@inheritDoc}
*/
+ @Override
public SearchRequest ignoreReferrals()
{
return getDecorated().ignoreReferrals();
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SubstringFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SubstringFilter.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SubstringFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SubstringFilter.java Sat Dec 17 15:18:15 2016
@@ -49,7 +49,7 @@ public class SubstringFilter extends Fil
private String initialSubstrings;
/** The any filter. It's a list of LdapString */
- private List<String> anySubstrings = new ArrayList<String>( 1 );
+ private List<String> anySubstrings = new ArrayList<>( 1 );
/** The final filter */
private String finalSubstrings;
@@ -148,10 +148,10 @@ public class SubstringFilter extends Fil
*
* @return The substring filter string
*/
+ @Override
public String toString()
{
-
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if ( initialSubstrings != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -28,6 +28,8 @@ import org.apache.directory.api.ldap.mod
/**
* Base class for all DSML responses.
*
+ * @param <E> The response type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class AbstractResponseDsml<E extends Response>
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResultResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResultResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResultResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AbstractResultResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -23,12 +23,13 @@ package org.apache.directory.api.dsmlv2.
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.model.message.LdapResult;
import org.apache.directory.api.ldap.model.message.ResultResponse;
-import org.dom4j.Element;
/**
* Base class for all DSML responses.
*
+ * @param <E> The response result type
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class AbstractResultResponseDsml<E extends ResultResponse>
@@ -49,12 +50,7 @@ public abstract class AbstractResultResp
/**
* {@inheritDoc}
*/
- public abstract Element toDsml( Element root );
-
-
- /**
- * {@inheritDoc}
- */
+ @Override
public LdapResult getLdapResult()
{
return getDecorated().getLdapResult();
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AddResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AddResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AddResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/AddResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class AddResponseDsml extends Abs
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -74,9 +75,10 @@ public class AddResponseDsml extends Abs
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BatchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BatchResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BatchResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BatchResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -50,7 +50,7 @@ public class BatchResponseDsml
*/
public BatchResponseDsml()
{
- responses = new ArrayList<DsmlDecorator<? extends Response>>();
+ responses = new ArrayList<>();
}
@@ -154,7 +154,7 @@ public class BatchResponseDsml
// RequestID
if ( requestID != 0 )
{
- element.addAttribute( "requestID", "" + requestID );
+ element.addAttribute( "requestID", Integer.toString( requestID ) );
}
for ( DsmlDecorator<? extends Response> response : responses )
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BindResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BindResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BindResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/BindResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -59,6 +59,7 @@ public class BindResponseDsml extends Ab
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
Element element = root.addElement( "authResponse" );
@@ -73,6 +74,7 @@ public class BindResponseDsml extends Ab
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getServerSaslCreds()
{
return getDecorated().getServerSaslCreds();
@@ -82,6 +84,7 @@ public class BindResponseDsml extends Ab
/**
* {@inheritDoc}
*/
+ @Override
public void setServerSaslCreds( byte[] serverSaslCreds )
{
getDecorated().setServerSaslCreds( serverSaslCreds );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/CompareResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/CompareResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/CompareResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/CompareResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class CompareResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -74,9 +75,10 @@ public class CompareResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -97,6 +99,7 @@ public class CompareResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isTrue()
{
return getDecorated().isTrue();
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/DelResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/DelResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/DelResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/DelResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -66,6 +66,7 @@ public class DelResponseDsml extends Abs
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -75,9 +76,10 @@ public class DelResponseDsml extends Abs
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{