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/11/26 23:26:45 UTC
svn commit: r1771520 [2/2] - in
/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras:
./ controls/ad_impl/ controls/changeNotifications_impl/
controls/permissiveModify_impl/ controls/ppolicy_impl/ controls/syncre...
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class CertGenerationContainer ext
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java Sat Nov 26 23:26:44 2016
@@ -51,6 +51,7 @@ public class CertGenerationFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return CertGenerationRequest.EXTENSION_OID;
@@ -60,6 +61,7 @@ public class CertGenerationFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public CertGenerationResponse newResponse( byte[] encodedValue ) throws DecoderException
{
CertGenerationResponseDecorator response = new CertGenerationResponseDecorator( codec,
@@ -73,6 +75,7 @@ public class CertGenerationFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public CertGenerationRequest newRequest( byte[] value )
{
CertGenerationRequestDecorator req = new CertGenerationRequestDecorator( codec, new CertGenerationRequestImpl() );
@@ -84,6 +87,7 @@ public class CertGenerationFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public CertGenerationRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof CertGenerationRequestDecorator )
@@ -98,6 +102,7 @@ public class CertGenerationFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public CertGenerationResponseDecorator decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof CertGenerationResponseDecorator )
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java Sat Nov 26 23:26:44 2016
@@ -135,6 +135,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public String getTargetDN()
{
return getDecorated().getTargetDN();
@@ -144,6 +145,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public void setTargetDN( String targetDN )
{
getDecorated().setTargetDN( targetDN );
@@ -153,6 +155,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public String getIssuerDN()
{
return getDecorated().getIssuerDN();
@@ -162,6 +165,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public void setIssuerDN( String issuerDN )
{
getDecorated().setIssuerDN( issuerDN );
@@ -171,6 +175,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public String getSubjectDN()
{
return getDecorated().getSubjectDN();
@@ -180,6 +185,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public void setSubjectDN( String subjectDN )
{
getDecorated().setSubjectDN( subjectDN );
@@ -189,6 +195,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public String getKeyAlgorithm()
{
return getDecorated().getKeyAlgorithm();
@@ -198,6 +205,7 @@ public class CertGenerationRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public void setKeyAlgorithm( String keyAlgorithm )
{
getDecorated().setKeyAlgorithm( keyAlgorithm );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -57,25 +56,13 @@ public enum CertGenerationStatesEnum imp
/** terminal state */
LAST_CERT_GENERATION_STATE;
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<CertGenerationContainer> grammar )
- {
- return "CERT_GENERATION_GRAMMER";
- }
-
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "CERT_GENERATION_GRAMMER";
}
@@ -89,13 +76,14 @@ public enum CertGenerationStatesEnum imp
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "CERT_GENERATION_END_STATE" : this.name() );
+ return ( state == END_STATE.ordinal() ) ? "CERT_GENERATION_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -105,6 +93,7 @@ public enum CertGenerationStatesEnum imp
/**
* {@inheritDoc}
*/
+ @Override
public CertGenerationStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class GracefulDisconnectContainer
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java Sat Nov 26 23:26:44 2016
@@ -50,6 +50,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequestDecorator<ExtendedRequest> decorate(
ExtendedRequest modelRequest )
{
@@ -61,6 +62,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedResponse decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof GracefulDisconnectResponseDecorator )
@@ -75,6 +77,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return GracefulDisconnectResponse.EXTENSION_OID;
@@ -84,6 +87,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest newRequest( byte[] value )
{
// Nothing to do (there's no request associated to GracefulDisconnectResponse)
@@ -94,6 +98,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ @Override
public GracefulDisconnectResponse newResponse( byte[] encodedValue ) throws DecoderException
{
GracefulDisconnectResponseDecorator req = new GracefulDisconnectResponseDecorator( codec,
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java Sat Nov 26 23:26:44 2016
@@ -82,6 +82,7 @@ public class GracefulDisconnectResponseD
*
* @return the response specific encoded response values.
*/
+ @Override
public byte[] getResponseValue()
{
if ( responseValue == null )
@@ -106,6 +107,7 @@ public class GracefulDisconnectResponseD
*
* @param responseValue the response specific encoded response values.
*/
+ @Override
public void setResponseValue( byte[] responseValue )
{
GracefulDisconnectDecoder decoder = new GracefulDisconnectDecoder();
@@ -133,6 +135,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public int getDelay()
{
return gracefulDisconnectResponse.getDelay();
@@ -142,6 +145,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public void setDelay( int delay )
{
gracefulDisconnectResponse.setDelay( delay );
@@ -151,6 +155,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public int getTimeOffline()
{
return gracefulDisconnectResponse.getTimeOffline();
@@ -160,6 +165,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public void setTimeOffline( int timeOffline )
{
gracefulDisconnectResponse.setTimeOffline( timeOffline );
@@ -169,6 +175,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public Referral getReplicatedContexts()
{
return gracefulDisconnectResponse.getReplicatedContexts();
@@ -178,6 +185,7 @@ public class GracefulDisconnectResponseD
/**
* {@inheritDoc}
*/
+ @Override
public void addReplicatedContexts( String replicatedContext )
{
gracefulDisconnectResponse.getReplicatedContexts().addLdapUrl( replicatedContext );
@@ -211,11 +219,11 @@ public class GracefulDisconnectResponseD
}
if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null )
- && ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
+ && ( !gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().isEmpty() ) )
{
replicatedContextsLength = 0;
- ldapUrlBytes = new ArrayList<byte[]>( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() );
+ ldapUrlBytes = new ArrayList<>( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() );
// We may have more than one reference.
for ( String replicatedContext : gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls() )
@@ -262,7 +270,7 @@ public class GracefulDisconnectResponseD
}
if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null )
- && ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
+ && ( !gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().isEmpty() ) )
{
bb.put( UniversalTag.SEQUENCE.getValue() );
bb.put( TLV.getBytes( replicatedContextsLength ) );
@@ -281,15 +289,17 @@ public class GracefulDisconnectResponseD
/**
* Return a string representation of the graceful disconnect
*/
+ @Override
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "Graceful Disconnect extended operation" );
sb.append( " TimeOffline : " ).append( gracefulDisconnectResponse.getTimeOffline() ).append( '\n' );
sb.append( " Delay : " ).append( gracefulDisconnectResponse.getDelay() ).append( '\n' );
- if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null ) && ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
+ if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null )
+ && ( !gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().isEmpty() ) )
{
sb.append( " Replicated contexts :" );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -65,22 +64,9 @@ public enum GracefulDisconnectStatesEnum
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
- {
- return "GRACEFUL_DISCONNECT_GRAMMAR";
- }
-
-
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<GracefulDisconnectContainer> grammar )
+ public String getGrammarName()
{
return "GRACEFUL_DISCONNECT_GRAMMAR";
}
@@ -94,13 +80,14 @@ public enum GracefulDisconnectStatesEnum
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "GRACEFUL_DISCONNECT_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "GRACEFUL_DISCONNECT_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -110,6 +97,7 @@ public enum GracefulDisconnectStatesEnum
/**
* {@inheritDoc}
*/
+ @Override
public GracefulDisconnectStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class GracefulShutdownContainer e
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java Sat Nov 26 23:26:44 2016
@@ -51,6 +51,7 @@ public class GracefulShutdownFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return GracefulShutdownRequest.EXTENSION_OID;
@@ -60,6 +61,7 @@ public class GracefulShutdownFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public GracefulShutdownResponse newResponse( byte[] encodedValue ) throws DecoderException
{
GracefulShutdownResponseDecorator response = new GracefulShutdownResponseDecorator(
@@ -72,6 +74,7 @@ public class GracefulShutdownFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public GracefulShutdownRequest newRequest( byte[] value )
{
GracefulShutdownRequestDecorator req = new GracefulShutdownRequestDecorator( codec,
@@ -84,6 +87,7 @@ public class GracefulShutdownFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedRequest decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof GracefulShutdownRequestDecorator )
@@ -98,6 +102,7 @@ public class GracefulShutdownFactory imp
/**
* {@inheritDoc}
*/
+ @Override
public ExtendedResponse decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof GracefulShutdownResponseDecorator )
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownGrammar.java Sat Nov 26 23:26:44 2016
@@ -203,7 +203,7 @@ public final class GracefulShutdownGramm
{
public void action( GracefulShutdownContainer container ) throws DecoderException
{
- GracefulShutdownContainer gracefulShutdownContainer = ( GracefulShutdownContainer ) container;
+ GracefulShutdownContainer gracefulShutdownContainer = container;
BerValue value = gracefulShutdownContainer.getCurrentTLV().getValue();
try
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java Sat Nov 26 23:26:44 2016
@@ -68,6 +68,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public void setRequestValue( byte[] requestValue )
{
GracefulShutdownDecoder decoder = new GracefulShutdownDecoder();
@@ -97,6 +98,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getRequestValue()
{
if ( requestValue == null )
@@ -119,6 +121,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public int getDelay()
{
return getDecorated().getDelay();
@@ -128,6 +131,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public void setDelay( int delay )
{
getDecorated().setDelay( delay );
@@ -137,6 +141,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public int getTimeOffline()
{
return getDecorated().getTimeOffline();
@@ -146,6 +151,7 @@ public class GracefulShutdownRequestDeco
/**
* {@inheritDoc}
*/
+ @Override
public void setTimeOffline( int timeOffline )
{
getDecorated().setTimeOffline( timeOffline );
@@ -214,9 +220,10 @@ public class GracefulShutdownRequestDeco
/**
* Return a string representation of the graceful shutdown
*/
+ @Override
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "Graceful Shutdown extended operation" );
sb.append( " TimeOffline : " ).append( gracefulShutdownRequest.getTimeOffline() ).append( '\n' );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -60,22 +59,9 @@ public enum GracefulShutdownStatesEnum i
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
- {
- return "GRACEFUL_SHUTDOWN_GRAMMAR";
- }
-
-
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<GracefulShutdownContainer> grammar )
+ public String getGrammarName()
{
return "GRACEFUL_SHUTDOWN_GRAMMAR";
}
@@ -89,13 +75,14 @@ public enum GracefulShutdownStatesEnum i
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "GRACEFUL_SHUTDOWN_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "GRACEFUL_SHUTDOWN_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -105,6 +92,7 @@ public enum GracefulShutdownStatesEnum i
/**
* {@inheritDoc}
*/
+ @Override
public GracefulShutdownStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java Sat Nov 26 23:26:44 2016
@@ -60,6 +60,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return PasswordModifyRequest.EXTENSION_OID;
@@ -69,6 +70,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public PasswordModifyResponse newResponse( byte[] encodedValue ) throws DecoderException
{
PasswordModifyResponseDecorator response = new PasswordModifyResponseDecorator( codec,
@@ -81,6 +83,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public PasswordModifyRequest newRequest( byte[] value )
{
PasswordModifyRequestDecorator req = new PasswordModifyRequestDecorator( codec, new PasswordModifyRequestImpl() );
@@ -97,6 +100,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
+ @Override
public PasswordModifyRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof PasswordModifyRequestDecorator )
@@ -111,7 +115,8 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
- public PasswordModifyResponseDecorator decorate( ExtendedResponse decoratedResponse )
+ @Override
+public PasswordModifyResponseDecorator decorate( ExtendedResponse decoratedResponse )
{
if ( decoratedResponse instanceof PasswordModifyResponseDecorator )
{
@@ -133,7 +138,7 @@ public class PasswordModifyFactory imple
byte[] value = response.getResponseValue();
PasswordModifyResponseContainer container = new PasswordModifyResponseContainer();
- PasswordModifyResponse pwdModifyResponse = null;
+ PasswordModifyResponse pwdModifyResponse;
if ( value != null )
{
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class PasswordModifyRequestContai
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java Sat Nov 26 23:26:44 2016
@@ -130,6 +130,7 @@ public class PasswordModifyRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getUserIdentity()
{
return passwordModifyRequest.getUserIdentity();
@@ -139,6 +140,7 @@ public class PasswordModifyRequestDecora
/**
* @param userIdentity the userIdentity to set
*/
+ @Override
public void setUserIdentity( byte[] userIdentity )
{
passwordModifyRequest.setUserIdentity( userIdentity );
@@ -148,6 +150,7 @@ public class PasswordModifyRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getOldPassword()
{
return passwordModifyRequest.getOldPassword();
@@ -157,6 +160,7 @@ public class PasswordModifyRequestDecora
/**
* @param oldPassword the oldPassword to set
*/
+ @Override
public void setOldPassword( byte[] oldPassword )
{
passwordModifyRequest.setOldPassword( oldPassword );
@@ -166,6 +170,7 @@ public class PasswordModifyRequestDecora
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getNewPassword()
{
return passwordModifyRequest.getNewPassword();
@@ -175,6 +180,7 @@ public class PasswordModifyRequestDecora
/**
* @param newPassword the newPassword to set
*/
+ @Override
public void setNewPassword( byte[] newPassword )
{
passwordModifyRequest.setNewPassword( newPassword );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java Sat Nov 26 23:26:44 2016
@@ -129,8 +129,7 @@ public class PasswordModifyRequestGramma
userIdentity = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setUserIdentity( userIdentity );
+ container.getPwdModifyRequest().setUserIdentity( userIdentity );
// We may have nothing left
container.setGrammarEndAllowed( true );
@@ -170,8 +169,7 @@ public class PasswordModifyRequestGramma
oldPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setOldPassword( oldPassword );
+ container.getPwdModifyRequest().setOldPassword( oldPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
@@ -212,8 +210,7 @@ public class PasswordModifyRequestGramma
newPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setNewPassword( newPassword );
+ container.getPwdModifyRequest().setNewPassword( newPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
@@ -253,8 +250,7 @@ public class PasswordModifyRequestGramma
oldPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setOldPassword( oldPassword );
+ container.getPwdModifyRequest().setOldPassword( oldPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
@@ -294,8 +290,7 @@ public class PasswordModifyRequestGramma
newPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setNewPassword( newPassword );
+ container.getPwdModifyRequest().setNewPassword( newPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
@@ -335,8 +330,7 @@ public class PasswordModifyRequestGramma
newPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyRequestDecorator ) container.getPwdModifyRequest() )
- .setNewPassword( newPassword );
+ container.getPwdModifyRequest().setNewPassword( newPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -54,25 +53,13 @@ public enum PasswordModifyRequestStatesE
/** Last state */
LAST_PASSWORD_MODIFY_REQUEST_STATE;
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<PasswordModifyRequestContainer> grammar )
- {
- return "PASSWORD_MODIFY_REQUEST_GRAMMER";
- }
-
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "PASSWORD_MODIFY_REQUEST_GRAMMER";
}
@@ -86,13 +73,14 @@ public enum PasswordModifyRequestStatesE
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "PASSWORD_MODIFY_REQUEST_GRAMMER" : this.name() );
+ return ( state == END_STATE.ordinal() ) ? "PASSWORD_MODIFY_REQUEST_GRAMMER" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -102,6 +90,7 @@ public enum PasswordModifyRequestStatesE
/**
* {@inheritDoc}
*/
+ @Override
public PasswordModifyRequestStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class PasswordModifyResponseConta
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java Sat Nov 26 23:26:44 2016
@@ -121,6 +121,7 @@ public class PasswordModifyResponseDecor
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getGenPassword()
{
return getDecorated().getGenPassword();
@@ -140,6 +141,7 @@ public class PasswordModifyResponseDecor
* Overload the parent's getResponseName method, as the pwdModify response should not
* contain the responseName.
*/
+ @Override
public String getResponseName()
{
return null;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java Sat Nov 26 23:26:44 2016
@@ -127,8 +127,7 @@ public class PasswordModifyResponseGramm
genPassword = Strings.EMPTY_BYTES;
}
- ( ( PasswordModifyResponseDecorator ) container.getPwdModifyResponse() )
- .setGenPassword( genPassword );
+ container.getPwdModifyResponse().setGenPassword( genPassword );
// We may have nothing left
container.setGrammarEndAllowed( true );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -48,25 +47,13 @@ public enum PasswordModifyResponseStates
/** Last state */
LAST_PASSWORD_MODIFY_RESPONSE_STATE;
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<PasswordModifyResponseContainer> grammar )
- {
- return "PASSWORD_MODIFY_RESPONSE_GRAMMER";
- }
-
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "PASSWORD_MODIFY_RESPONSE_GRAMMER";
}
@@ -80,13 +67,14 @@ public enum PasswordModifyResponseStates
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "PASSWORD_MODIFY_RESPONSE_GRAMMER" : this.name() );
+ return ( state == END_STATE.ordinal() ) ? "PASSWORD_MODIFY_RESPONSE_GRAMMER" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -96,6 +84,7 @@ public enum PasswordModifyResponseStates
/**
* {@inheritDoc}
*/
+ @Override
public PasswordModifyResponseStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/startTls/StartTlsFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/startTls/StartTlsFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/startTls/StartTlsFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/startTls/StartTlsFactory.java Sat Nov 26 23:26:44 2016
@@ -52,6 +52,7 @@ public class StartTlsFactory implements
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return StartTlsRequest.EXTENSION_OID;
@@ -61,6 +62,7 @@ public class StartTlsFactory implements
/**
* {@inheritDoc}
*/
+ @Override
public StartTlsResponse newResponse( byte[] encodedValue ) throws DecoderException
{
StartTlsResponseDecorator response = new StartTlsResponseDecorator( codec,
@@ -73,6 +75,7 @@ public class StartTlsFactory implements
/**
* {@inheritDoc}
*/
+ @Override
public StartTlsRequest newRequest( byte[] value )
{
StartTlsRequestDecorator req = new StartTlsRequestDecorator( codec, new StartTlsRequestImpl() );
@@ -89,6 +92,7 @@ public class StartTlsFactory implements
/**
* {@inheritDoc}
*/
+ @Override
public StartTlsRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof StartTlsRequestDecorator )
@@ -103,6 +107,7 @@ public class StartTlsFactory implements
/**
* {@inheritDoc}
*/
+ @Override
public StartTlsResponseDecorator decorate( ExtendedResponse decoratedResponse )
{
if ( decoratedResponse instanceof StartTlsResponseDecorator )
@@ -124,8 +129,6 @@ public class StartTlsFactory implements
startTlsResponse.getLdapResult().setResultCode( response.getLdapResult().getResultCode() );
startTlsResponse.getLdapResult().setDiagnosticMessage( response.getLdapResult().getDiagnosticMessage() );
- StartTlsResponseDecorator decorated = new StartTlsResponseDecorator( codec, new StartTlsResponseImpl() );
-
- return decorated;
+ return new StartTlsResponseDecorator( codec, new StartTlsResponseImpl() );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureContainer.java Sat Nov 26 23:26:44 2016
@@ -75,6 +75,7 @@ public class StoredProcedureContainer ex
/**
* {@inheritDoc}
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java Sat Nov 26 23:26:44 2016
@@ -55,6 +55,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return StoredProcedureRequest.EXTENSION_OID;
@@ -64,6 +65,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
+ @Override
public StoredProcedureResponse newResponse( byte[] encodedValue ) throws DecoderException
{
StoredProcedureResponseDecorator response = new StoredProcedureResponseDecorator( codec,
@@ -76,6 +78,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
+ @Override
public StoredProcedureRequest newRequest( byte[] value )
{
StoredProcedureRequestDecorator req = new StoredProcedureRequestDecorator( codec );
@@ -91,6 +94,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
+ @Override
public StoredProcedureRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof StoredProcedureRequestDecorator )
@@ -105,6 +109,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
+ @Override
public StoredProcedureResponseDecorator decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof StoredProcedureResponseDecorator )
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java Sat Nov 26 23:26:44 2016
@@ -242,7 +242,7 @@ public final class StoredProcedureGramma
{
public void action( StoredProcedureContainer container ) throws DecoderException
{
- StoredProcedureContainer storedProcedureContainer = ( StoredProcedureContainer ) container;
+ StoredProcedureContainer storedProcedureContainer = container;
TLV tlv = storedProcedureContainer.getCurrentTLV();
StoredProcedureRequestDecorator storedProcedure = storedProcedureContainer.getStoredProcedure();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java Sat Nov 26 23:26:44 2016
@@ -61,12 +61,6 @@ public class StoredProcedureRequestDecor
/** The list of all parameter lengths */
private List<Integer> parameterLength;
- /** The list of all parameter type lengths */
- private List<Integer> paramTypeLength;
-
- /** The list of all parameter value lengths */
- private List<Integer> paramValueLength;
-
public StoredProcedureRequestDecorator( LdapApiService codec )
{
@@ -140,15 +134,13 @@ public class StoredProcedureRequestDecor
// Compute parameters length value
if ( getDecorated().getParameters() != null )
{
- parameterLength = new LinkedList<Integer>();
- paramTypeLength = new LinkedList<Integer>();
- paramValueLength = new LinkedList<Integer>();
+ parameterLength = new LinkedList<>();
for ( StoredProcedureParameter spParam : getDecorated().getParameters() )
{
- int localParameterLength = 0;
- int localParamTypeLength = 0;
- int localParamValueLength = 0;
+ int localParameterLength;
+ int localParamTypeLength;
+ int localParamValueLength;
localParamTypeLength = 1 + TLV.getNbBytes( spParam.getType().length ) + spParam.getType().length;
localParamValueLength = 1 + TLV.getNbBytes( spParam.getValue().length ) + spParam.getValue().length;
@@ -158,8 +150,6 @@ public class StoredProcedureRequestDecor
parametersLength += 1 + TLV.getNbBytes( localParameterLength ) + localParameterLength;
parameterLength.add( localParameterLength );
- paramTypeLength.add( localParamTypeLength );
- paramValueLength.add( localParamValueLength );
}
}
@@ -198,7 +188,7 @@ public class StoredProcedureRequestDecor
bb.put( TLV.getBytes( parametersLength ) );
// The parameters list
- if ( ( getDecorated().getParameters() != null ) && ( getDecorated().getParameters().size() != 0 ) )
+ if ( ( getDecorated().getParameters() != null ) && ( !getDecorated().getParameters().isEmpty() ) )
{
int parameterNumber = 0;
@@ -215,7 +205,7 @@ public class StoredProcedureRequestDecor
// The parameter value
BerValue.encode( bb, spParam.getValue() );
- // Go to the next parameter;
+ // Go to the next parameter
parameterNumber++;
}
}
@@ -234,16 +224,16 @@ public class StoredProcedureRequestDecor
*
* @return The StoredProcedure string
*/
+ @Override
public String toString()
{
-
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( " StoredProcedure\n" );
sb.append( " Language : '" ).append( getDecorated().getLanguage() ).append( "'\n" );
sb.append( " Procedure\n" ).append( getDecorated().getProcedureSpecification() ).append( "'\n" );
- if ( ( getDecorated().getParameters() == null ) || ( getDecorated().getParameters().size() == 0 ) )
+ if ( ( getDecorated().getParameters() == null ) || ( !getDecorated().getParameters().isEmpty() ) )
{
sb.append( " No parameters\n" );
}
@@ -266,6 +256,7 @@ public class StoredProcedureRequestDecor
}
+ @Override
public void setProcedure( byte[] procedure )
{
getDecorated().setProcedure( procedure );
@@ -275,6 +266,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public void setRequestValue( byte[] payload )
{
StoredProcedureDecoder decoder = new StoredProcedureDecoder();
@@ -297,6 +289,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getRequestValue()
{
if ( requestValue == null )
@@ -319,6 +312,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public String getLanguage()
{
return getDecorated().getLanguage();
@@ -328,6 +322,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public void setLanguage( String language )
{
getDecorated().setLanguage( language );
@@ -337,6 +332,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public String getProcedureSpecification()
{
return getDecorated().getProcedureSpecification();
@@ -346,6 +342,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return getDecorated().size();
@@ -355,6 +352,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public Object getParameterType( int index )
{
return getDecorated().getParameterType( index );
@@ -365,6 +363,7 @@ public class StoredProcedureRequestDecor
* {@inheritDoc}
*/
+ @Override
public Class<?> getJavaParameterType( int index )
{
return getDecorated().getJavaParameterType( index );
@@ -375,6 +374,7 @@ public class StoredProcedureRequestDecor
* {@inheritDoc}
*/
+ @Override
public Object getParameterValue( int index )
{
return getDecorated().getParameterValue( index );
@@ -384,6 +384,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public Object getJavaParameterValue( int index )
{
return getDecorated().getJavaParameterValue( index );
@@ -393,6 +394,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public void addParameter( Object type, Object value )
{
getDecorated().addParameter( type, value );
@@ -402,6 +404,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getProcedure()
{
return getDecorated().getProcedure();
@@ -411,6 +414,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public List<StoredProcedureParameter> getParameters()
{
return getDecorated().getParameters();
@@ -420,6 +424,7 @@ public class StoredProcedureRequestDecor
/**
* {@inheritDoc}
*/
+ @Override
public void addParameter( StoredProcedureParameter parameter )
{
getDecorated().addParameter( parameter );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -21,7 +21,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -75,21 +74,10 @@ public enum StoredProcedureStatesEnum im
/**
* Get the grammar name
- * @param grammar The grammar code
+ *
* @return The grammar name
*/
- public String getGrammarName( int grammar )
- {
- return "STORED_PROCEDURE_GRAMMAR";
- }
-
-
- /**
- * Get the grammar name
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<StoredProcedureContainer> grammar )
+ public String getGrammarName()
{
return "STORED_PROCEDURE_GRAMMAR";
}
@@ -103,13 +91,14 @@ public enum StoredProcedureStatesEnum im
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "STORED_PROCEDURE_END_STATE" : name() );
+ return ( state == END_STATE.ordinal() ) ? "STORED_PROCEDURE_END_STATE" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -119,6 +108,7 @@ public enum StoredProcedureStatesEnum im
/**
* {@inheritDoc}
*/
+ @Override
public StoredProcedureStatesEnum getStartState()
{
return START_STATE;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIFactory.java Sat Nov 26 23:26:44 2016
@@ -58,6 +58,7 @@ public class WhoAmIFactory implements Ex
/**
* {@inheritDoc}
*/
+ @Override
public String getOid()
{
return WhoAmIRequest.EXTENSION_OID;
@@ -67,6 +68,7 @@ public class WhoAmIFactory implements Ex
/**
* {@inheritDoc}
*/
+ @Override
public WhoAmIResponse newResponse( byte[] encodedValue ) throws DecoderException
{
WhoAmIResponseDecorator response = new WhoAmIResponseDecorator( codec,
@@ -79,6 +81,7 @@ public class WhoAmIFactory implements Ex
/**
* {@inheritDoc}
*/
+ @Override
public WhoAmIRequest newRequest( byte[] value )
{
WhoAmIRequestDecorator req = new WhoAmIRequestDecorator( codec, new WhoAmIRequestImpl() );
@@ -95,6 +98,7 @@ public class WhoAmIFactory implements Ex
/**
* {@inheritDoc}
*/
+ @Override
public WhoAmIRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof WhoAmIRequestDecorator )
@@ -109,6 +113,7 @@ public class WhoAmIFactory implements Ex
/**
* {@inheritDoc}
*/
+ @Override
public WhoAmIResponseDecorator decorate( ExtendedResponse decoratedResponse )
{
if ( decoratedResponse instanceof WhoAmIResponseDecorator )
@@ -159,8 +164,6 @@ public class WhoAmIFactory implements Ex
stackTrace );
}
- WhoAmIResponseDecorator decorated = new WhoAmIResponseDecorator( codec, whoAmIResponse );
-
- return decorated;
+ return new WhoAmIResponseDecorator( codec, whoAmIResponse );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseContainer.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseContainer.java Sat Nov 26 23:26:44 2016
@@ -70,6 +70,7 @@ public class WhoAmIResponseContainer ext
/**
* Clean the container for the next decoding.
*/
+ @Override
public void clean()
{
super.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java Sat Nov 26 23:26:44 2016
@@ -114,6 +114,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public byte[] getAuthzId()
{
return getDecorated().getAuthzId();
@@ -123,6 +124,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public void setAuthzId( byte[] authzId )
{
( ( WhoAmIResponseImpl ) getDecorated() ).setAuthzId( authzId );
@@ -150,6 +152,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public boolean isDnAuthzId()
{
return whoAmIResponse.isDnAuthzId();
@@ -159,6 +162,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public boolean isUserAuthzId()
{
return whoAmIResponse.isUserAuthzId();
@@ -168,6 +172,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public String getAuthzIdString()
{
return whoAmIResponse.getAuthzIdString();
@@ -177,6 +182,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public String getUserId()
{
return whoAmIResponse.getUserId();
@@ -186,6 +192,7 @@ public class WhoAmIResponseDecorator ext
/**
* {@inheritDoc}
*/
+ @Override
public Dn getDn()
{
return whoAmIResponse.getDn();
@@ -196,6 +203,7 @@ public class WhoAmIResponseDecorator ext
* Overload the parent's getResponseName method, as the WhoAmI response should not
* contain the responseName.
*/
+ @Override
public String getResponseName()
{
return null;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseStatesEnum.java?rev=1771520&r1=1771519&r2=1771520&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseStatesEnum.java Sat Nov 26 23:26:44 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.whoAmI;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -45,25 +44,13 @@ public enum WhoAmIResponseStatesEnum imp
/** Last state */
LAST_WHO_AM_I_RESPONSE_STATE;
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<WhoAmIResponseContainer> grammar )
- {
- return "WHO_AM_I_RESPONSE_GRAMMER";
- }
-
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "WHO_AM_I_RESPONSE_GRAMMER";
}
@@ -77,13 +64,14 @@ public enum WhoAmIResponseStatesEnum imp
*/
public String getState( int state )
{
- return ( ( state == END_STATE.ordinal() ) ? "WHO_AM_I_RESPONSE_GRAMMER" : this.name() );
+ return ( state == END_STATE.ordinal() ) ? "WHO_AM_I_RESPONSE_GRAMMER" : name();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEndState()
{
return this == END_STATE;
@@ -93,6 +81,7 @@ public enum WhoAmIResponseStatesEnum imp
/**
* {@inheritDoc}
*/
+ @Override
public WhoAmIResponseStatesEnum getStartState()
{
return START_STATE;