directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1746258 [3/9] - 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/ber/gr...
Date Tue, 31 May 2016 09:32:13 GMT
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractResultResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractResultResponse.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractResultResponse.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractResultResponse.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public abstract class AbstractResultResp
      * 
      * @return the LdapResult for this Response.
      */
+    @Override
     public LdapResult getLdapResult()
     {
         return ldapResult;
@@ -121,7 +122,7 @@ public abstract class AbstractResultResp
             return false;
         }
 
-        return ( ( ldapResult == null ) || ( resp.getLdapResult() == null ) || ldapResult.equals( resp.getLdapResult() ) );
+        return ( ldapResult == null ) || ( resp.getLdapResult() == null ) || ldapResult.equals( resp.getLdapResult() );
     }
 
 
@@ -130,6 +131,7 @@ public abstract class AbstractResultResp
      * 
      * @return An Response String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java Tue May 31 09:32:09 2016
@@ -69,23 +69,27 @@ public interface AddRequest extends Sing
     /**
      * {@inheritDoc}
      */
+    @Override
     AddRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     AddRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     AddRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     AddRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java Tue May 31 09:32:09 2016
@@ -132,6 +132,7 @@ public class AddRequestImpl extends Abst
      * 
      * @return the Dn of the added entry.
      */
+    @Override
     public Dn getEntryDn()
     {
         return entry.getDn();
@@ -141,6 +142,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest setEntryDn( Dn dn )
     {
         entry.setDn( dn );
@@ -152,6 +154,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public Entry getEntry()
     {
         return entry;
@@ -161,6 +164,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest setEntry( Entry entry )
     {
         this.entry = entry;
@@ -172,6 +176,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -183,6 +188,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest addControl( Control control )
     {
         return ( AddRequest ) super.addControl( control );
@@ -192,6 +198,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest addAllControls( Control[] controls )
     {
         return ( AddRequest ) super.addAllControls( controls );
@@ -201,6 +208,7 @@ public class AddRequestImpl extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public AddRequest removeControl( Control control )
     {
         return ( AddRequest ) super.removeControl( control );
@@ -217,6 +225,7 @@ public class AddRequestImpl extends Abst
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.ADD_RESPONSE;
@@ -228,6 +237,7 @@ public class AddRequestImpl extends Abst
      * 
      * @return the result containing response for this request
      */
+    @Override
     public AddResponse getResultResponse()
     {
         if ( response == null )
@@ -251,6 +261,7 @@ public class AddRequestImpl extends Abst
      * @param obj the object to test for equality to this
      * @return true if the obj is equal to this AddRequest, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         // Short circuit
@@ -275,11 +286,11 @@ public class AddRequestImpl extends Abst
         // Check the entry
         if ( entry == null )
         {
-            return ( req.getEntry() == null );
+            return req.getEntry() == null;
         }
         else
         {
-            return ( entry.equals( req.getEntry() ) );
+            return entry.equals( req.getEntry() );
         }
     }
 
@@ -288,6 +299,7 @@ public class AddRequestImpl extends Abst
      * @see Object#hashCode()
      * @return the instance's hash code 
      */
+    @Override
     public int hashCode()
     {
         int hash = 37;
@@ -302,6 +314,7 @@ public class AddRequestImpl extends Abst
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class AddResponseImpl extends Abs
      * 
      * @return An AddResponse String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java Tue May 31 09:32:09 2016
@@ -97,19 +97,21 @@ public enum AliasDerefMode
         }
         else
         {
-            if ( property.trim().equalsIgnoreCase( "always" ) )
+            String trimmedProperty = property.trim();
+            
+            if ( "always".equalsIgnoreCase( trimmedProperty ) )
             {
                 return DEREF_ALWAYS;
             }
-            else if ( property.trim().equalsIgnoreCase( "never" ) )
+            else if ( "never".equalsIgnoreCase( trimmedProperty ) )
             {
                 return NEVER_DEREF_ALIASES;
             }
-            else if ( property.trim().equalsIgnoreCase( "finding" ) )
+            else if ( "finding".equalsIgnoreCase( trimmedProperty ) )
             {
                 return DEREF_FINDING_BASE_OBJ;
             }
-            else if ( property.trim().equalsIgnoreCase( "searching" ) )
+            else if ( "searching".equalsIgnoreCase( trimmedProperty ) )
             {
                 return DEREF_IN_SEARCHING;
             }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java Tue May 31 09:32:09 2016
@@ -204,23 +204,27 @@ public interface BindRequest extends Sin
     /**
      * {@inheritDoc}
      */
+    @Override
     BindRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     BindRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     BindRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     BindRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java Tue May 31 09:32:09 2016
@@ -25,8 +25,6 @@ import java.util.Arrays;
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.util.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -37,10 +35,6 @@ import org.slf4j.LoggerFactory;
  */
 public class BindRequestImpl extends AbstractAbandonableRequest implements BindRequest
 {
-
-    /** A logger */
-    private static final Logger LOG = LoggerFactory.getLogger( BindRequestImpl.class );
-
     /**
      * Distinguished name identifying the name of the authenticating subject -
      * defaults to the empty string
@@ -92,6 +86,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isSimple()
     {
         return isSimple;
@@ -101,6 +96,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getSimple()
     {
         return isSimple;
@@ -110,6 +106,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setSimple( boolean simple )
     {
         this.isSimple = simple;
@@ -121,6 +118,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCredentials()
     {
         return credentials;
@@ -130,6 +128,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setCredentials( String credentials )
     {
         return setCredentials( Strings.getBytesUtf8( credentials ) );
@@ -139,6 +138,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setCredentials( byte[] credentials )
     {
         if ( credentials != null )
@@ -173,6 +173,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSaslMechanism()
     {
         return mechanism;
@@ -182,6 +183,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setSaslMechanism( String saslMechanism )
     {
         this.isSimple = false;
@@ -194,6 +196,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getName()
     {
         return name;
@@ -203,7 +206,8 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
-    public BindRequest setName( String name )
+    @Override
+public BindRequest setName( String name )
     {
         this.name = name;
 
@@ -214,6 +218,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getDn()
     {
         return dn;
@@ -223,6 +228,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setDn( Dn dn )
     {
         this.dn = dn;
@@ -235,6 +241,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isVersion3()
     {
         return isVersion3;
@@ -244,6 +251,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getVersion3()
     {
         return isVersion3;
@@ -253,6 +261,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setVersion3( boolean version3 )
     {
         this.isVersion3 = version3;
@@ -264,6 +273,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -275,6 +285,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest addControl( Control control )
     {
         return ( BindRequest ) super.addControl( control );
@@ -284,6 +295,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest addAllControls( Control[] controls )
     {
         return ( BindRequest ) super.addAllControls( controls );
@@ -293,6 +305,7 @@ public class BindRequestImpl extends Abs
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest removeControl( Control control )
     {
         return ( BindRequest ) super.removeControl( control );
@@ -308,6 +321,7 @@ public class BindRequestImpl extends Abs
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.BIND_RESPONSE;
@@ -319,6 +333,7 @@ public class BindRequestImpl extends Abs
      * 
      * @return the result containing response for this request
      */
+    @Override
     public BindResponse getResultResponse()
     {
         if ( response == null )
@@ -334,6 +349,7 @@ public class BindRequestImpl extends Abs
      * RFC 2251/4511 [Section 4.11]: Abandon, Bind, Unbind, and StartTLS operations
      * cannot be abandoned.
      */
+    @Override
     public void abandon()
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_04185 ) );
@@ -445,9 +461,10 @@ public class BindRequestImpl extends Abs
      * 
      * @return A BindRequest String
      */
+    @Override
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append( "    BindRequest\n" );
         sb.append( "        Version : '" ).append( isVersion3 ? "3" : "2" ).append( "'\n" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java Tue May 31 09:32:09 2016
@@ -72,6 +72,7 @@ public class BindResponseImpl extends Ab
      * 
      * @return the sasl mech. specific credentials or null of auth. is simple
      */
+    @Override
     public byte[] getServerSaslCreds()
     {
         if ( serverSaslCreds == null )
@@ -93,6 +94,7 @@ public class BindResponseImpl extends Ab
      * @param serverSaslCreds
      *            the sasl auth. mech. specific credentials
      */
+    @Override
     public void setServerSaslCreds( byte[] serverSaslCreds )
     {
         if ( serverSaslCreds != null )
@@ -132,6 +134,7 @@ public class BindResponseImpl extends Ab
      *            the object to test for equality with this BindResponse
      * @return true if obj equals this BindResponse false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         // quickly return true if obj is this one
@@ -174,6 +177,7 @@ public class BindResponseImpl extends Ab
      * 
      * @return A BindResponse String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java Tue May 31 09:32:09 2016
@@ -97,23 +97,27 @@ public interface CompareRequest extends
     /**
      * {@inheritDoc}
      */
+    @Override
     CompareRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     CompareRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     CompareRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     CompareRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java Tue May 31 09:32:09 2016
@@ -70,6 +70,7 @@ public class CompareRequestImpl extends
      * 
      * @return the Dn of the compared entry.
      */
+    @Override
     public Dn getName()
     {
         return name;
@@ -79,6 +80,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setName( Dn name )
     {
         this.name = name;
@@ -92,7 +94,8 @@ public class CompareRequestImpl extends
      * 
      * @return the attribute value to used in comparison.
      */
-    public Value getAssertionValue()
+    @Override
+public Value getAssertionValue()
     {
         return attrVal;
     }
@@ -101,6 +104,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAssertionValue( String value )
     {
         this.attrVal = new Value( value );
@@ -112,6 +116,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAssertionValue( byte[] value )
     {
         if ( value != null )
@@ -132,6 +137,7 @@ public class CompareRequestImpl extends
      * 
      * @return the attribute id used in comparison.
      */
+    @Override
     public String getAttributeId()
     {
         return attrId;
@@ -141,6 +147,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAttributeId( String attributeId )
     {
         this.attrId = attributeId;
@@ -152,6 +159,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -163,6 +171,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest addControl( Control control )
     {
         return ( CompareRequest ) super.addControl( control );
@@ -172,6 +181,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest addAllControls( Control[] controls )
     {
         return ( CompareRequest ) super.addAllControls( controls );
@@ -181,6 +191,7 @@ public class CompareRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest removeControl( Control control )
     {
         return ( CompareRequest ) super.removeControl( control );
@@ -197,6 +208,7 @@ public class CompareRequestImpl extends
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.COMPARE_RESPONSE;
@@ -208,6 +220,7 @@ public class CompareRequestImpl extends
      * 
      * @return the result containing response for this request
      */
+    @Override
     public CompareResponse getResultResponse()
     {
         if ( response == null )
@@ -255,6 +268,7 @@ public class CompareRequestImpl extends
      * @param obj the obj to compare with this CompareRequest
      * @return true if the obj is equal to this request, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -270,36 +284,51 @@ public class CompareRequestImpl extends
         CompareRequest req = ( CompareRequest ) obj;
         Dn reqName = req.getName();
 
-        if ( ( name != null ) && ( reqName == null ) )
-        {
-            return false;
-        }
-
-        if ( ( name == null ) && ( reqName != null ) )
+        if ( name == null )
         {
-            return false;
+            if ( reqName != null )
+            {
+                return false;
+            }
         }
-
-        if ( ( name != null ) && ( reqName != null ) && !name.equals( req.getName() ) )
+        else
         {
-            return false;
+            if ( reqName == null )
+            {
+                return false;
+            }
+            else
+            {
+                if ( !name.equals( reqName ) )
+                {
+                    return false;
+                }
+            }
         }
 
         String reqId = req.getAttributeId();
 
-        if ( ( attrId != null ) && ( reqId == null ) )
+        if ( attrId == null )
         {
-            return false;
-        }
-
-        if ( ( attrId == null ) && ( reqId != null ) )
-        {
-            return false;
+            if ( reqId != null )
+            {
+                return false;
+            }
         }
-
-        if ( ( attrId != null ) && ( reqId != null ) && !attrId.equals( reqId ) )
+        else
         {
-            return false;
+            if ( reqId == null )
+            {
+                return false;
+            }
+            else
+            {
+                if ( !attrId.equals( reqId ) )
+                {
+                    return false;
+                }
+            }
+                
         }
 
         Value reqVal = req.getAssertionValue();
@@ -327,6 +356,7 @@ public class CompareRequestImpl extends
      * 
      * @return A Compare Request String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java Tue May 31 09:32:09 2016
@@ -53,6 +53,7 @@ public class CompareResponseImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isTrue()
     {
         return ldapResult.getResultCode() == ResultCodeEnum.COMPARE_TRUE;
@@ -64,6 +65,7 @@ public class CompareResponseImpl extends
      * 
      * @return An CompareResponse String
      */
+    @Override
     public String toString()
     {
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java Tue May 31 09:32:09 2016
@@ -53,23 +53,27 @@ public interface DeleteRequest extends S
     /**
      * {@inheritDoc}
      */
+    @Override
     DeleteRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     DeleteRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     DeleteRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     DeleteRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java Tue May 31 09:32:09 2016
@@ -62,6 +62,7 @@ public class DeleteRequestImpl extends A
      * 
      * @return the Dn of the leaf entry to delete.
      */
+    @Override
     public Dn getName()
     {
         return name;
@@ -71,6 +72,7 @@ public class DeleteRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest setName( Dn name )
     {
         this.name = name;
@@ -82,6 +84,7 @@ public class DeleteRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -93,6 +96,7 @@ public class DeleteRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest addControl( Control control )
     {
         return ( DeleteRequest ) super.addControl( control );
@@ -102,6 +106,7 @@ public class DeleteRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest addAllControls( Control[] controls )
     {
         return ( DeleteRequest ) super.addAllControls( controls );
@@ -111,6 +116,7 @@ public class DeleteRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest removeControl( Control control )
     {
         return ( DeleteRequest ) super.removeControl( control );
@@ -127,6 +133,7 @@ public class DeleteRequestImpl extends A
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.DEL_RESPONSE;
@@ -138,6 +145,7 @@ public class DeleteRequestImpl extends A
      * 
      * @return the result containing response for this request
      */
+    @Override
     public DeleteResponse getResultResponse()
     {
         if ( response == null )
@@ -178,6 +186,7 @@ public class DeleteRequestImpl extends A
      * @param obj the object to test for equality to this
      * @return true if the obj is equal to this DeleteRequest, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( this == obj )
@@ -216,6 +225,7 @@ public class DeleteRequestImpl extends A
      * 
      * @return A DelRequest String
      */
+    @Override
     public String toString()
     {
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class DeleteResponseImpl extends
      * 
      * @return A DelResponse String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java Tue May 31 09:32:09 2016
@@ -75,23 +75,27 @@ public interface ExtendedRequest extends
     /**
      * {@inheritDoc}
      */
+    @Override
     ExtendedRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ExtendedRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ExtendedRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ExtendedRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public class ExtendedRequestImpl extends
      * 
      * @return the dotted-decimal representation as a String of the OID
      */
+    @Override
     public String getRequestName()
     {
         return oid;
@@ -67,6 +68,7 @@ public class ExtendedRequestImpl extends
      * 
      * @param newOid the dotted-decimal representation as a String of the OID
      */
+    @Override
     public ExtendedRequest setRequestName( String newOid )
     {
         this.oid = newOid;
@@ -78,6 +80,7 @@ public class ExtendedRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExtendedRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -89,6 +92,7 @@ public class ExtendedRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExtendedRequest addControl( Control control )
     {
         return ( ExtendedRequest ) super.addControl( control );
@@ -98,6 +102,7 @@ public class ExtendedRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExtendedRequest addAllControls( Control[] controls )
     {
         return ( ExtendedRequest ) super.addAllControls( controls );
@@ -107,6 +112,7 @@ public class ExtendedRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExtendedRequest removeControl( Control control )
     {
         return ( ExtendedRequest ) super.removeControl( control );
@@ -123,6 +129,7 @@ public class ExtendedRequestImpl extends
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.EXTENDED_RESPONSE;
@@ -148,6 +155,7 @@ public class ExtendedRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExtendedResponse getResultResponse()
     {
         return getExtendedResponse();
@@ -177,6 +185,7 @@ public class ExtendedRequestImpl extends
      * @param obj the object to be checked for equality
      * @return true if the obj equals this ExtendedRequest, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -220,9 +229,10 @@ public class ExtendedRequestImpl extends
      * 
      * @return an Extended Request String
      */
+    @Override
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append( "    Extended request\n" );
         sb.append( "        Request name : '" ).append( oid ).append( "'\n" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImpl.java Tue May 31 09:32:09 2016
@@ -79,9 +79,10 @@ public class ExtendedResponseImpl extend
      * 
      * @return the responseName of the extended response
      */
+    @Override
     public String getResponseName()
     {
-        return ( ( responseName == null ) ? "" : responseName );
+        return ( responseName == null ) ? "" : responseName;
     }
 
 
@@ -91,6 +92,7 @@ public class ExtendedResponseImpl extend
      * 
      * @param responseName the OID of the extended response type.
      */
+    @Override
     public void setResponseName( String responseName )
     {
         this.responseName = responseName;
@@ -123,6 +125,7 @@ public class ExtendedResponseImpl extend
      *            the object to be checked for equality
      * @return true if the obj equals this ExtendedRequest, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -167,6 +170,7 @@ public class ExtendedResponseImpl extend
      * 
      * @return An ExtendedResponse String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/IntermediateResponseImpl.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public class IntermediateResponseImpl ex
      * 
      * @return the response value
      */
+    @Override
     public byte[] getResponseValue()
     {
         if ( responseValue == null )
@@ -74,6 +75,7 @@ public class IntermediateResponseImpl ex
      * 
      * @param value the response value.
      */
+    @Override
     public void setResponseValue( byte[] value )
     {
         if ( value != null )
@@ -94,9 +96,10 @@ public class IntermediateResponseImpl ex
      * 
      * @return the OID of the Intermediate response type.
      */
+    @Override
     public String getResponseName()
     {
-        return ( ( responseName == null ) ? "" : responseName );
+        return ( responseName == null ) ? "" : responseName;
     }
 
 
@@ -106,6 +109,7 @@ public class IntermediateResponseImpl ex
      * 
      * @param oid the OID of the Intermediate response type.
      */
+    @Override
     public void setResponseName( String oid )
     {
         this.responseName = oid;
@@ -139,6 +143,7 @@ public class IntermediateResponseImpl ex
      * @param obj the object to be checked for equality
      * @return true if the obj equals this IntemediateResponse, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -184,8 +189,8 @@ public class IntermediateResponseImpl ex
             return false;
         }
 
-        return ( ( responseValue == null ) || ( resp.getResponseValue() == null )
-        || Arrays.equals( responseValue, resp.getResponseValue() ) );
+        return ( responseValue == null ) || ( resp.getResponseValue() == null )
+        || Arrays.equals( responseValue, resp.getResponseValue() );
     }
 
 
@@ -194,6 +199,7 @@ public class IntermediateResponseImpl ex
      * 
      * @return An IntermediateResponse String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/LdapResultImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/LdapResultImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/LdapResultImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/LdapResultImpl.java Tue May 31 09:32:09 2016
@@ -53,6 +53,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getDiagnosticMessage()
     {
         return diagnosticMessage;
@@ -62,6 +63,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDiagnosticMessage( String diagnosticMessage )
     {
         this.diagnosticMessage = diagnosticMessage;
@@ -72,6 +74,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getMatchedDn()
     {
         return matchedDn;
@@ -81,6 +84,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setMatchedDn( Dn matchedDn )
     {
         this.matchedDn = matchedDn;
@@ -91,6 +95,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public ResultCodeEnum getResultCode()
     {
         return resultCode;
@@ -100,6 +105,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setResultCode( ResultCodeEnum resultCode )
     {
         this.resultCode = resultCode;
@@ -111,6 +117,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public Referral getReferral()
     {
         return referral;
@@ -120,6 +127,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isReferral()
     {
         return referral != null;
@@ -129,6 +137,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setReferral( Referral referral )
     {
         this.referral = referral;
@@ -139,6 +148,7 @@ public class LdapResultImpl implements L
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isDefaultSuccess()
     {
         return isDefaultSuccess;
@@ -149,6 +159,7 @@ public class LdapResultImpl implements L
      * @see Object#hashCode()
      * @return the instance's hash code 
      */
+    @Override
     public int hashCode()
     {
         int hash = 37;
@@ -178,6 +189,7 @@ public class LdapResultImpl implements L
      * @param obj The object to compare with
      * @return <code>true</code> if both objects are equals
      */
+    @Override
     public boolean equals( Object obj )
     {
         // quickly return true if this is the obj
@@ -256,6 +268,7 @@ public class LdapResultImpl implements L
      * 
      * @return A LdapResult String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java Tue May 31 09:32:09 2016
@@ -165,23 +165,27 @@ public interface ModifyDnRequest extends
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyDnRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyDnRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyDnRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
-    ModifyDnRequest removeControl( Control control );
+    @Override
+ModifyDnRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java Tue May 31 09:32:09 2016
@@ -69,6 +69,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getDeleteOldRdn()
     {
         return deleteOldRdn;
@@ -78,6 +79,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest setDeleteOldRdn( boolean deleteOldRdn )
     {
         this.deleteOldRdn = deleteOldRdn;
@@ -89,6 +91,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isMove()
     {
         return newSuperior != null;
@@ -98,6 +101,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getName()
     {
         return name;
@@ -107,6 +111,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest setName( Dn name )
     {
         this.name = name;
@@ -118,6 +123,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public Rdn getNewRdn()
     {
         return newRdn;
@@ -127,6 +133,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest setNewRdn( Rdn newRdn )
     {
         this.newRdn = newRdn;
@@ -138,6 +145,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getNewSuperior()
     {
         return newSuperior;
@@ -147,6 +155,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest setNewSuperior( Dn newSuperior )
     {
         this.newSuperior = newSuperior;
@@ -158,6 +167,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -169,6 +179,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest addControl( Control control )
     {
         return ( ModifyDnRequest ) super.addControl( control );
@@ -178,6 +189,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest addAllControls( Control[] controls )
     {
         return ( ModifyDnRequest ) super.addAllControls( controls );
@@ -187,6 +199,7 @@ public class ModifyDnRequestImpl extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyDnRequest removeControl( Control control )
     {
         return ( ModifyDnRequest ) super.removeControl( control );
@@ -203,6 +216,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.MODIFYDN_RESPONSE;
@@ -214,6 +228,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the result containing response for this request
      */
+    @Override
     public ModifyDnResponse getResultResponse()
     {
         if ( response == null )
@@ -259,6 +274,7 @@ public class ModifyDnRequestImpl extends
      * @param obj the object to compare with this stub
      * @return true if the obj is equal to this stub, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -318,8 +334,8 @@ public class ModifyDnRequestImpl extends
             return false;
         }
 
-        return ( ( newSuperior == null ) || ( req.getNewSuperior() == null ) || newSuperior.equals( req
-            .getNewSuperior() ) );
+        return ( newSuperior == null ) || ( req.getNewSuperior() == null ) || newSuperior.equals( req
+            .getNewSuperior() );
     }
 
 
@@ -328,6 +344,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return A ModifyDNRequest String
      */
+    @Override
     public String toString()
     {
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ModifyDnResponseImpl extend
      * 
      * @return A ModifyDNResponse String
      */
+    @Override
     public String toString()
     {
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java Tue May 31 09:32:09 2016
@@ -254,23 +254,27 @@ public interface ModifyRequest extends S
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     ModifyRequest removeControl( Control control );
 }

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java Tue May 31 09:32:09 2016
@@ -48,7 +48,7 @@ public class ModifyRequestImpl extends A
     private Dn name;
 
     /** Sequence of modifications or PDU's <b>modification</b> sequence field */
-    private List<Modification> mods = new ArrayList<Modification>();
+    private List<Modification> mods = new ArrayList<>();
 
     /** The associated response */
     private ModifyResponse response;
@@ -73,6 +73,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public Collection<Modification> getModifications()
     {
         return Collections.unmodifiableCollection( mods );
@@ -82,6 +83,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getName()
     {
         return name;
@@ -91,6 +93,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest setName( Dn name )
     {
         this.name = name;
@@ -102,6 +105,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest addModification( Modification mod )
     {
         mods.add( mod );
@@ -127,6 +131,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest addModification( Attribute attr, ModificationOperation modOp )
     {
         mods.add( new DefaultModification( modOp, attr ) );
@@ -138,6 +143,7 @@ public class ModifyRequestImpl extends A
     /**
      *{@inheritDoc}
      */
+    @Override
     public ModifyRequest add( String attributeName, String... attributeValue )
     {
         addModification( ModificationOperation.ADD_ATTRIBUTE, attributeName, attributeValue );
@@ -160,6 +166,7 @@ public class ModifyRequestImpl extends A
     /**
      *{@inheritDoc}
      */
+    @Override
     public ModifyRequest add( Attribute attr )
     {
         addModification( attr, ModificationOperation.ADD_ATTRIBUTE );
@@ -171,6 +178,7 @@ public class ModifyRequestImpl extends A
     /**
      * @see #replace(String, String...)
      */
+    @Override
     public ModifyRequest replace( String attributeName )
     {
         addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, StringConstants.EMPTY_STRINGS );
@@ -182,6 +190,7 @@ public class ModifyRequestImpl extends A
     /**
      *{@inheritDoc}
      */
+    @Override
     public ModifyRequest replace( String attributeName, String... attributeValue )
     {
         addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, attributeValue );
@@ -204,6 +213,7 @@ public class ModifyRequestImpl extends A
     /**
      *{@inheritDoc}
      */
+    @Override
     public ModifyRequest replace( Attribute attr )
     {
         addModification( attr, ModificationOperation.REPLACE_ATTRIBUTE );
@@ -215,6 +225,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest removeModification( Modification mod )
     {
         mods.remove( mod );
@@ -226,6 +237,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest remove( String attributeName, String... attributeValue )
     {
         addModification( ModificationOperation.REMOVE_ATTRIBUTE, attributeName, attributeValue );
@@ -248,6 +260,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest remove( Attribute attr )
     {
         addModification( attr, ModificationOperation.REMOVE_ATTRIBUTE );
@@ -259,6 +272,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest remove( String attributerName )
     {
         addModification( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attributerName ) );
@@ -270,6 +284,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -281,6 +296,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest addControl( Control control )
     {
         return ( ModifyRequest ) super.addControl( control );
@@ -290,6 +306,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest addAllControls( Control[] controls )
     {
         return ( ModifyRequest ) super.addAllControls( controls );
@@ -299,6 +316,7 @@ public class ModifyRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ModifyRequest removeControl( Control control )
     {
         return ( ModifyRequest ) super.removeControl( control );
@@ -315,6 +333,7 @@ public class ModifyRequestImpl extends A
      * 
      * @return the message type of the response.
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return MessageTypeEnum.MODIFY_RESPONSE;
@@ -326,6 +345,7 @@ public class ModifyRequestImpl extends A
      * 
      * @return the result containing response for this request
      */
+    @Override
     public ModifyResponse getResultResponse()
     {
         if ( response == null )
@@ -367,6 +387,7 @@ public class ModifyRequestImpl extends A
      *            the object to compare this ModifyRequest to
      * @return true if obj equals this ModifyRequest, false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -431,10 +452,11 @@ public class ModifyRequestImpl extends A
      * 
      * @return A ModifyRequest String
      */
+    @Override
     public String toString()
     {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append( "    Modify Request\n" );
         sb.append( "        Object : '" ).append( name ).append( "'\n" );

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java Tue May 31 09:32:09 2016
@@ -54,6 +54,7 @@ public class ModifyResponseImpl extends
      * 
      * @return A ModifyResponse String
      */
+    @Override
     public String toString()
     {
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ReferralImpl.java Tue May 31 09:32:09 2016
@@ -39,10 +39,10 @@ public class ReferralImpl implements Ref
     static final long serialVersionUID = 2638820668325359096L;
 
     /** Sequence of LDAPUrls composing this Referral */
-    private final List<String> urls = new ArrayList<String>();
+    private final List<String> urls = new ArrayList<>();
 
     /** The encoded LdapURL */
-    private final List<byte[]> urlsBytes = new ArrayList<byte[]>();
+    private final List<byte[]> urlsBytes = new ArrayList<>();
 
     /** The length of the referral */
     private int referralLength;
@@ -54,6 +54,7 @@ public class ReferralImpl implements Ref
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getReferralLength()
     {
         return referralLength;
@@ -63,6 +64,7 @@ public class ReferralImpl implements Ref
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setReferralLength( int referralLength )
     {
         this.referralLength = referralLength;
@@ -74,6 +76,7 @@ public class ReferralImpl implements Ref
      * 
      * @return the alternative url objects.
      */
+    @Override
     public Collection<String> getLdapUrls()
     {
         return Collections.unmodifiableCollection( urls );
@@ -83,6 +86,7 @@ public class ReferralImpl implements Ref
     /**
      * {@inheritDoc}
      */
+    @Override
     public Collection<byte[]> getLdapUrlsBytes()
     {
         return urlsBytes;
@@ -94,6 +98,7 @@ public class ReferralImpl implements Ref
      * 
      * @param url the LDAPv3 URL to add
      */
+    @Override
     public void addLdapUrl( String url )
     {
         urls.add( url );
@@ -103,6 +108,7 @@ public class ReferralImpl implements Ref
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addLdapUrlBytes( byte[] urlBytes )
     {
         urlsBytes.add( urlBytes );
@@ -115,6 +121,7 @@ public class ReferralImpl implements Ref
      * @param url
      *            the LDAPv3 URL to remove
      */
+    @Override
     public void removeLdapUrl( String url )
     {
         urls.remove( url );
@@ -125,6 +132,7 @@ public class ReferralImpl implements Ref
      * @see Object#hashCode()
      * @return the instance's hash code 
      */
+    @Override
     public int hashCode()
     {
         int hash = 37;
@@ -150,6 +158,7 @@ public class ReferralImpl implements Ref
      *            the object to compare this ReferralImpl to
      * @return true if both implementations contain exactly the same URLs
      */
+    @Override
     public boolean equals( Object obj )
     {
         // just in case for speed return true if obj is this object
@@ -192,11 +201,12 @@ public class ReferralImpl implements Ref
      * 
      * @return A Referral String
      */
+    @Override
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
-        if ( ( urls != null ) && ( urls.size() != 0 ) )
+        if ( ( urls != null ) && !urls.isEmpty() )
         {
             sb.append( "            Referrals :\n" );
 

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultCodeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultCodeEnum.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultCodeEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultCodeEnum.java Tue May 31 09:32:09 2016
@@ -751,7 +751,7 @@ public enum ResultCodeEnum
         return message;
     }
 
-    private static final Set<ResultCodeEnum> EMPTY_RESULT_CODE_SET = new HashSet<ResultCodeEnum>();
+    private static final Set<ResultCodeEnum> EMPTY_RESULT_CODE_SET = new HashSet<>();
 
     // ------------------------------------------------------------------------
     // Error Codes Grouped Into Categories & Static Accessors
@@ -775,7 +775,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.SUCCESS );
         set.add( ResultCodeEnum.COMPARE_TRUE );
         set.add( ResultCodeEnum.COMPARE_FALSE );
@@ -813,7 +813,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -866,7 +866,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -926,7 +926,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -988,7 +988,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -1043,7 +1043,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -1097,7 +1097,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.OTHER );
         set.add( ResultCodeEnum.SUCCESS );
@@ -1154,7 +1154,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.OPERATIONS_ERROR );
         set.add( ResultCodeEnum.PROTOCOL_ERROR );
         set.add( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -1229,7 +1229,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.SUCCESS );
         set.add( ResultCodeEnum.OPERATIONS_ERROR );
         set.add( ResultCodeEnum.PROTOCOL_ERROR );
@@ -1409,7 +1409,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.OPERATIONS_ERROR );
         set.add( ResultCodeEnum.ALIAS_PROBLEM );
         set.add( ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM );
@@ -1434,7 +1434,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
         set.add( ResultCodeEnum.STRONG_AUTH_REQUIRED );
         set.add( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
@@ -1454,7 +1454,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.BUSY );
         set.add( ResultCodeEnum.UNAVAILABLE );
         SERVICE_UNAVAILABLE_CODES = Collections.unmodifiableSet( set );
@@ -1472,7 +1472,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.CONSTRAINT_VIOLATION );
         set.add( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
         INVALID_ATTRIBUTE_VALUE_EXCEPTION_CODES = Collections.unmodifiableSet( set );
@@ -1490,7 +1490,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.PARTIAL_RESULTS );
         set.add( ResultCodeEnum.REFERRAL );
         PARTIAL_RESULTS_EXCEPTION_CODES = Collections.unmodifiableSet( set );
@@ -1508,7 +1508,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.REFERRAL );
         set.add( ResultCodeEnum.ADMIN_LIMIT_EXCEEDED );
         LIMIT_EXCEEDED_EXCEPTION_CODES = Collections.unmodifiableSet( set );
@@ -1527,7 +1527,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
         set.add( ResultCodeEnum.UNWILLING_TO_PERFORM );
         OPERATION_NOT_SUPPORTED_EXCEPTION_CODES = Collections.unmodifiableSet( set );
@@ -1545,7 +1545,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.INVALID_DN_SYNTAX );
         set.add( ResultCodeEnum.NAMING_VIOLATION );
         INVALID_NAME_EXCEPTION_CODES = Collections.unmodifiableSet( set );
@@ -1564,7 +1564,7 @@ public enum ResultCodeEnum
 
     static
     {
-        Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> set = new HashSet<>();
         set.add( ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         set.add( ResultCodeEnum.NOT_ALLOWED_ON_RDN );
         set.add( ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
@@ -1600,7 +1600,7 @@ public enum ResultCodeEnum
 
         if ( type == null )
         {
-            Set<ResultCodeEnum> tmp = new HashSet<ResultCodeEnum>();
+            Set<ResultCodeEnum> tmp = new HashSet<>();
             tmp.addAll( set );
             tmp.removeAll( NON_ERRONEOUS_CODES );
 
@@ -1612,7 +1612,7 @@ public enum ResultCodeEnum
             return tmp.iterator().next();
         }
 
-        Set<ResultCodeEnum> candidates = EMPTY_RESULT_CODE_SET;
+        Set<ResultCodeEnum> candidates;
 
         switch ( type )
         {
@@ -1718,10 +1718,10 @@ public enum ResultCodeEnum
     {
         if ( s1.isEmpty() || s2.isEmpty() )
         {
-            return new HashSet<ResultCodeEnum>();
+            return new HashSet<>();
         }
 
-        Set<ResultCodeEnum> intersection = new HashSet<ResultCodeEnum>();
+        Set<ResultCodeEnum> intersection = new HashSet<>();
 
         if ( s1.size() <= s2.size() )
         {

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchParams.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchParams.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchParams.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchParams.java Tue May 31 09:32:09 2016
@@ -76,9 +76,9 @@ public class SearchParams
      */
     public SearchParams()
     {
-        returningAttributes = new HashSet<AttributeTypeOptions>();
-        returningAttributesStr = new HashSet<String>();
-        controls = new HashSet<Control>();
+        returningAttributes = new HashSet<>();
+        returningAttributesStr = new HashSet<>();
+        controls = new HashSet<>();
     }
 
 
@@ -303,6 +303,7 @@ public class SearchParams
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
@@ -312,7 +313,7 @@ public class SearchParams
         sb.append( "    Alias dereferencing : " ).append( aliasDerefMode ).append( "\n" );
         sb.append( "    types only : " ).append( typesOnly ).append( "\n" );
 
-        if ( returningAttributesStr.size() != 0 )
+        if ( !returningAttributesStr.isEmpty() )
         {
             sb.append( "    returning attributes : " ).append( Strings.setToString( returningAttributesStr ) )
                 .append( "\n" );
@@ -336,7 +337,7 @@ public class SearchParams
             sb.append( "    no sizeLimit\n" );
         }
 
-        if ( controls.size() != 0 )
+        if ( !controls.isEmpty() )
         {
             for ( Control control : controls )
             {

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java Tue May 31 09:32:09 2016
@@ -58,6 +58,7 @@ public interface SearchRequest extends M
      * @return the RESPONSE_TYPES array
      * @see #RESPONSE_TYPES
      */
+    @Override
     MessageTypeEnum[] getResponseTypes();
 
 
@@ -251,24 +252,28 @@ public interface SearchRequest extends M
     /**
      * {@inheritDoc}
      */
+    @Override
     SearchRequest setMessageId( int messageId );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     SearchRequest addControl( Control control );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     SearchRequest addAllControls( Control[] controls );
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     SearchRequest removeControl( Control control );
     
     

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java Tue May 31 09:32:09 2016
@@ -94,6 +94,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getAttributes()
     {
         return Collections.unmodifiableList( attributes );
@@ -105,6 +106,7 @@ public class SearchRequestImpl extends A
      * 
      * @return the search base
      */
+    @Override
     public Dn getBase()
     {
         return baseDn;
@@ -114,6 +116,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setBase( Dn base )
     {
         baseDn = base;
@@ -125,6 +128,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public AliasDerefMode getDerefAliases()
     {
         return aliasDerefMode;
@@ -134,6 +138,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setDerefAliases( AliasDerefMode aliasDerefAliases )
     {
         this.aliasDerefMode = aliasDerefAliases;
@@ -145,6 +150,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public ExprNode getFilter()
     {
         return filterNode;
@@ -154,6 +160,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setFilter( ExprNode filter )
     {
         this.filterNode = filter;
@@ -164,6 +171,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setFilter( String filter ) throws LdapException
     {
         try
@@ -183,15 +191,17 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum[] getResponseTypes()
     {
-        return RESPONSE_TYPES.clone();
+        return RESPONSE_TYPES;
     }
 
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchScope getScope()
     {
         return scope;
@@ -201,6 +211,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setScope( SearchScope scope )
     {
         this.scope = scope;
@@ -212,6 +223,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public long getSizeLimit()
     {
         return sizeLimit;
@@ -221,6 +233,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setSizeLimit( long entriesMax )
     {
         sizeLimit = entriesMax;
@@ -232,6 +245,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getTimeLimit()
     {
         return timeLimit;
@@ -241,6 +255,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setTimeLimit( int secondsMax )
     {
         timeLimit = secondsMax;
@@ -252,6 +267,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getTypesOnly()
     {
         return typesOnly;
@@ -261,6 +277,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setTypesOnly( boolean typesOnly )
     {
         this.typesOnly = typesOnly;
@@ -272,6 +289,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest addAttributes( String... attributesToAdd )
     {
         this.attributes.addAll( Arrays.asList( attributesToAdd ) );
@@ -283,6 +301,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest removeAttribute( String attribute )
     {
         attributes.remove( attribute );
@@ -294,6 +313,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchResultDone getResultResponse()
     {
         if ( response == null )
@@ -308,6 +328,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -319,6 +340,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest addControl( Control control )
     {
         return ( SearchRequest ) super.addControl( control );
@@ -328,6 +350,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest addAllControls( Control[] controls )
     {
         return ( SearchRequest ) super.addAllControls( controls );
@@ -337,6 +360,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest removeControl( Control control )
     {
         return ( SearchRequest ) super.removeControl( control );
@@ -397,6 +421,7 @@ public class SearchRequestImpl extends A
      * @return true if the obj is a SearchRequest and equals this SearchRequest,
      *         false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj == this )
@@ -441,12 +466,12 @@ public class SearchRequestImpl extends A
             return false;
         }
 
-        if ( req.getAttributes() == null && attributes != null && attributes.size() > 0 )
+        if ( req.getAttributes() == null && attributes != null && !attributes.isEmpty() )
         {
             return false;
         }
 
-        if ( req.getAttributes() != null && attributes == null && req.getAttributes().size() > 0 )
+        if ( req.getAttributes() != null && attributes == null && !req.getAttributes().isEmpty() )
         {
             return false;
         }
@@ -482,6 +507,7 @@ public class SearchRequestImpl extends A
      * Return a string the represent a SearchRequest
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
@@ -604,6 +630,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isFollowReferrals()
     {
         return referralHandling == ReferralsPolicyEnum.FOLLOW;
@@ -613,6 +640,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest followReferrals()
     {
         referralHandling = ReferralsPolicyEnum.FOLLOW;
@@ -624,6 +652,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isIgnoreReferrals()
     {
         return referralHandling == ReferralsPolicyEnum.IGNORE;
@@ -633,6 +662,7 @@ public class SearchRequestImpl extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public SearchRequest ignoreReferrals()
     {
         referralHandling = ReferralsPolicyEnum.IGNORE;

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java Tue May 31 09:32:09 2016
@@ -74,6 +74,7 @@ public class SearchResultDoneImpl extend
      *            the object to be tested for equality
      * @return true if obj is equivalent to this SearchResponseDone impl
      */
+    @Override
     public boolean equals( Object obj )
     {
         // quickly return if the obj is this object
@@ -98,6 +99,7 @@ public class SearchResultDoneImpl extend
      * 
      * @return A SearchResultDone String
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();

Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java Tue May 31 09:32:09 2016
@@ -69,6 +69,7 @@ public class SearchResultEntryImpl exten
      * 
      * @return the entry
      */
+    @Override
     public Entry getEntry()
     {
         return entry;
@@ -80,6 +81,7 @@ public class SearchResultEntryImpl exten
      * 
      * @param entry the entry
      */
+    @Override
     public void setEntry( Entry entry )
     {
         this.entry = entry;
@@ -91,9 +93,10 @@ public class SearchResultEntryImpl exten
      * 
      * @return the Dn of the entry returned.
      */
+    @Override
     public Dn getObjectName()
     {
-        return ( entry == null ? null : entry.getDn() );
+        return entry == null ? null : entry.getDn();
     }
 
 
@@ -102,6 +105,7 @@ public class SearchResultEntryImpl exten
      * 
      * @param objectName the Dn of the entry returned.
      */
+    @Override
     public void setObjectName( Dn objectName )
     {
         if ( entry != null )
@@ -136,6 +140,7 @@ public class SearchResultEntryImpl exten
      *            the object to test for equality with this message
      * @return true if the obj is equal false otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( this == obj )
@@ -162,6 +167,7 @@ public class SearchResultEntryImpl exten
     /**
      * Return a string representation of a SearchResultEntry request
      */
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder();




Mime
View raw message