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 [2/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/BindRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BindRequestDsml.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/BindRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BindRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getType()
     {
         return getDecorated().getType();
@@ -74,6 +75,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Element toDsml( Element root )
     {
         Element element = super.toDsml( root );
@@ -105,6 +107,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return getDecorated().getResponseType();
@@ -114,6 +117,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isSimple()
     {
         return getDecorated().isSimple();
@@ -123,6 +127,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getSimple()
     {
         return getDecorated().getSimple();
@@ -132,6 +137,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setSimple( boolean isSimple )
     {
         getDecorated().setSimple( isSimple );
@@ -143,6 +149,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getCredentials()
     {
         return getDecorated().getCredentials();
@@ -152,6 +159,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setCredentials( String credentials )
     {
         getDecorated().setCredentials( credentials );
@@ -163,6 +171,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setCredentials( byte[] credentials )
     {
         getDecorated().setCredentials( credentials );
@@ -174,6 +183,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getName()
     {
         return getDecorated().getName();
@@ -183,6 +193,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setName( String name )
     {
         getDecorated().setName( name );
@@ -194,6 +205,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getDn()
     {
         return getDecorated().getDn();
@@ -203,6 +215,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setDn( Dn dn )
     {
         getDecorated().setDn( dn );
@@ -214,6 +227,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isVersion3()
     {
         return getDecorated().isVersion3();
@@ -223,6 +237,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getVersion3()
     {
         return getDecorated().getVersion3();
@@ -232,6 +247,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setVersion3( boolean isVersion3 )
     {
         getDecorated().setVersion3( isVersion3 );
@@ -243,6 +259,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getSaslMechanism()
     {
         return getDecorated().getSaslMechanism();
@@ -252,6 +269,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setSaslMechanism( String saslMechanism )
     {
         getDecorated().setSaslMechanism( saslMechanism );
@@ -263,6 +281,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -274,6 +293,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest addControl( Control control )
     {
         return ( BindRequest ) super.addControl( control );
@@ -283,6 +303,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest addAllControls( Control[] controls )
     {
         return ( BindRequest ) super.addAllControls( controls );
@@ -292,6 +313,7 @@ public class BindRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public BindRequest removeControl( Control control )
     {
         return ( BindRequest ) super.removeControl( control );

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.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/CompareRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -66,6 +66,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getType()
     {
         return getDecorated().getType();
@@ -75,6 +76,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Element toDsml( Element root )
     {
         Element element = super.toDsml( root );
@@ -107,6 +109,7 @@ public class CompareRequestDsml
      * 
      * @return Returns the entry.
      */
+    @Override
     public Dn getName()
     {
         return getDecorated().getName();
@@ -118,6 +121,7 @@ public class CompareRequestDsml
      * 
      * @param entry The entry to set.
      */
+    @Override
     public CompareRequest setName( Dn entry )
     {
         getDecorated().setName( entry );
@@ -169,6 +173,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return getDecorated().getResponseType();
@@ -178,6 +183,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAssertionValue( String value )
     {
         getDecorated().setAssertionValue( value );
@@ -189,6 +195,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAssertionValue( byte[] value )
     {
         getDecorated().setAssertionValue( value );
@@ -200,6 +207,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getAttributeId()
     {
         return getDecorated().getAttributeId();
@@ -209,6 +217,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setAttributeId( String attrId )
     {
         getDecorated().setAttributeId( attrId );
@@ -220,6 +229,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Value getAssertionValue()
     {
         return getDecorated().getAssertionValue();
@@ -229,6 +239,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -240,6 +251,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest addControl( Control control )
     {
         return ( CompareRequest ) super.addControl( control );
@@ -249,6 +261,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest addAllControls( Control[] controls )
     {
         return ( CompareRequest ) super.addAllControls( controls );
@@ -258,6 +271,7 @@ public class CompareRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public CompareRequest removeControl( Control control )
     {
         return ( CompareRequest ) super.removeControl( control );

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ConnectorFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ConnectorFilter.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/ConnectorFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ConnectorFilter.java Sat Dec 17 15:18:15 2016
@@ -49,7 +49,7 @@ public abstract class ConnectorFilter ex
 
         if ( filterSet == null )
         {
-            filterSet = new ArrayList<Filter>();
+            filterSet = new ArrayList<>();
         }
 
         filterSet.add( filter );
@@ -73,11 +73,12 @@ public abstract class ConnectorFilter ex
      * 
      * @return The composite filter string
      */
+    @Override
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
-        if ( ( filterSet != null ) && ( filterSet.size() != 0 ) )
+        if ( ( filterSet != null ) && !filterSet.isEmpty() )
         {
             for ( Filter filter : filterSet )
             {

Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/DelRequestDsml.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/DelRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/DelRequestDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getType()
     {
         return getDecorated().getType();
@@ -74,6 +75,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Element toDsml( Element root )
     {
         Element element = super.toDsml( root );
@@ -113,6 +115,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public MessageTypeEnum getResponseType()
     {
         return getDecorated().getResponseType();
@@ -122,6 +125,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public Dn getName()
     {
         return getDecorated().getName();
@@ -131,6 +135,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest setName( Dn name )
     {
         getDecorated().setName( name );
@@ -142,6 +147,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest setMessageId( int messageId )
     {
         super.setMessageId( messageId );
@@ -153,6 +159,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest addControl( Control control )
     {
         return ( DeleteRequest ) super.addControl( control );
@@ -162,6 +169,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest addAllControls( Control[] controls )
     {
         return ( DeleteRequest ) super.addAllControls( controls );
@@ -171,6 +179,7 @@ public class DelRequestDsml
     /**
      * {@inheritDoc}
      */
+    @Override
     public DeleteRequest removeControl( Control control )
     {
         return ( DeleteRequest ) super.removeControl( control );