You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/05/19 20:29:20 UTC
svn commit: r946327 - in
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message:
./ extended/ internal/
Author: felixk
Date: Wed May 19 18:29:19 2010
New Revision: 946327
URL: http://svn.apache.org/viewvc?rev=946327&view=rev
Log:
Formatting
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java Wed May 19 18:29:19 2010
@@ -51,7 +51,7 @@ public class BindResponseImpl extends In
* @param id
* the session unique message id
*/
- public BindResponseImpl(final int id)
+ public BindResponseImpl( final int id )
{
super( id, TYPE );
}
@@ -75,7 +75,7 @@ public class BindResponseImpl extends In
return null;
}
- final byte[] copy = new byte[ serverSaslCreds.length ];
+ final byte[] copy = new byte[serverSaslCreds.length];
System.arraycopy( serverSaslCreds, 0, copy, 0, serverSaslCreds.length );
return copy;
}
@@ -93,9 +93,11 @@ public class BindResponseImpl extends In
{
if ( serverSaslCreds != null )
{
- this.serverSaslCreds = new byte[ serverSaslCreds.length ];
+ this.serverSaslCreds = new byte[serverSaslCreds.length];
System.arraycopy( serverSaslCreds, 0, this.serverSaslCreds, 0, serverSaslCreds.length );
- } else {
+ }
+ else
+ {
this.serverSaslCreds = null;
}
}
@@ -132,7 +134,7 @@ public class BindResponseImpl extends In
InternalBindResponse response = ( InternalBindResponse ) obj;
byte[] creds = response.getServerSaslCreds();
-
+
if ( serverSaslCreds == null )
{
if ( creds != null )
@@ -144,7 +146,7 @@ public class BindResponseImpl extends In
{
return false;
}
-
+
return Arrays.equals( serverSaslCreds, creds );
}
@@ -162,7 +164,8 @@ public class BindResponseImpl extends In
if ( serverSaslCreds != null )
{
- sb.append( " Server sasl credentials : '" ).append( StringTools.dumpBytes( serverSaslCreds ) ).append( "'\n" );
+ sb.append( " Server sasl credentials : '" ).append( StringTools.dumpBytes( serverSaslCreds ) )
+ .append( "'\n" );
}
return sb.toString();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java Wed May 19 18:29:19 2010
@@ -61,6 +61,7 @@ public class CancelRequest extends Exten
/** The requestName for this extended request */
public static final String EXTENSION_OID = "1.3.6.1.1.8";
+
/**
*
* Creates a new instance of CancelRequest.
@@ -72,11 +73,11 @@ public class CancelRequest extends Exten
{
super( messageId );
setOid( EXTENSION_OID );
-
+
this.cancelId = cancelId;
}
-
+
/**
* Encode the request
*/
@@ -87,7 +88,8 @@ public class CancelRequest extends Exten
payload = cancel.encode().array();
}
-
+
+
/**
* Gets the extended request's <b>requestValue</b> portion of the PDU. The
* form of the data is request specific and is determined by the extended
@@ -109,7 +111,7 @@ public class CancelRequest extends Exten
throw new RuntimeException( e );
}
}
-
+
return super.getPayload();
}
@@ -119,19 +121,21 @@ public class CancelRequest extends Exten
*
* @param payload byte array of data encapsulating ext. req. parameters
*/
- public void setPayload( byte[] payload )
+ public void setPayload( byte[] payload )
{
CancelDecoder decoder = new CancelDecoder();
-
+
try
{
Cancel cancel = ( Cancel ) decoder.decode( payload );
if ( payload != null )
{
- this.payload = new byte[ payload.length ];
+ this.payload = new byte[payload.length];
System.arraycopy( payload, 0, this.payload, 0, payload.length );
- } else {
+ }
+ else
+ {
this.payload = null;
}
this.cancelId = cancel.getCancelId();
@@ -167,4 +171,3 @@ public class CancelRequest extends Exten
return response;
}
}
-
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java Wed May 19 18:29:19 2010
@@ -19,10 +19,13 @@
*/
package org.apache.directory.shared.ldap.message.extended;
+
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.StringTools;
+
+
/**
*
* The response sent back from the server after the Cancel extended operation is performed.
@@ -35,6 +38,7 @@ public class CancelResponse extends Exte
/** The serial version UUID */
private static final long serialVersionUID = 1L;
+
/**
* Create a new CancelResponse object
* @param messageId The messageId
@@ -46,18 +50,18 @@ public class CancelResponse extends Exte
switch ( rcode )
{
- case SUCCESS :
+ case SUCCESS:
case CANCELED:
- case CANNOT_CANCEL :
- case NO_SUCH_OPERATION :
- case TOO_LATE :
+ case CANNOT_CANCEL:
+ case NO_SUCH_OPERATION:
+ case TOO_LATE:
break;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.SUCCESS,
- ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
+ ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
}
-
+
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java Wed May 19 18:29:19 2010
@@ -53,6 +53,7 @@ public class CertGenerationRequest exten
public static final String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.8";
+
/**
*
* Creates a new instance of CertGenerationRequest.
@@ -67,7 +68,7 @@ public class CertGenerationRequest exten
{
super( messageId );
setOid( EXTENSION_OID );
-
+
this.certGenObj = new CertGenerationObject();
certGenObj.setTargetDN( targerDN );
certGenObj.setIssuerDN( issuerDN );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java Wed May 19 18:29:19 2010
@@ -19,10 +19,13 @@
*/
package org.apache.directory.shared.ldap.message.extended;
+
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.StringTools;
+
+
/**
*
* The response sent back from the server after the CertGeneration extended operation is performed.
@@ -34,32 +37,33 @@ public class CertGenerationResponse exte
{
/** The serial version UUID */
private static final long serialVersionUID = 1L;
-
+
/** The CertGenerationResponse OID */
public static final String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.9";
- public CertGenerationResponse(int messageId, ResultCodeEnum rcode)
+
+ public CertGenerationResponse( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
switch ( rcode )
{
- case SUCCESS :
- case OPERATIONS_ERROR :
- case INSUFFICIENT_ACCESS_RIGHTS :
+ case SUCCESS:
+ case OPERATIONS_ERROR:
+ case INSUFFICIENT_ACCESS_RIGHTS:
break;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.SUCCESS,
- ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
+ ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
}
-
+
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
}
- public CertGenerationResponse(int messageId)
+ public CertGenerationResponse( int messageId )
{
super( messageId, EXTENSION_OID );
super.getLdapResult().setMatchedDn( null );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Wed May 19 18:29:19 2010
@@ -68,21 +68,23 @@ public class GracefulDisconnect extends
private InternalReferral replicatedContexts = new ReferralImpl();
- public GracefulDisconnect(byte[] value) throws DecoderException
+ public GracefulDisconnect( byte[] value ) throws DecoderException
{
super( 0, EXTENSION_OID );
if ( value != null )
{
- this.value = new byte[ value.length ];
+ this.value = new byte[value.length];
System.arraycopy( value, 0, this.value, 0, value.length );
- } else {
+ }
+ else
+ {
this.value = null;
}
decodeValue();
}
- public GracefulDisconnect(int timeOffline, int delay)
+ public GracefulDisconnect( int timeOffline, int delay )
{
super( 0, EXTENSION_OID );
super.oid = EXTENSION_OID;
@@ -114,7 +116,7 @@ public class GracefulDisconnect extends
this.delay = codec.getDelay();
super.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
List<LdapURL> contexts = codec.getReplicatedContexts();
-
+
for ( int ii = 0; ii < contexts.size(); ii++ )
{
replicatedContexts.addLdapUrl( contexts.get( ii ).toString() );
@@ -134,7 +136,7 @@ public class GracefulDisconnect extends
codec.setTimeOffline( this.timeOffline );
codec.setDelay( this.delay );
Iterator<String> contexts = this.replicatedContexts.getLdapUrls().iterator();
-
+
while ( contexts.hasNext() )
{
String urlstr = ( String ) contexts.next();
@@ -179,7 +181,7 @@ public class GracefulDisconnect extends
encodeResponse();
}
- final byte[] copy = new byte[ value.length ];
+ final byte[] copy = new byte[value.length];
System.arraycopy( value, 0, copy, 0, value.length );
return copy;
}
@@ -210,7 +212,7 @@ public class GracefulDisconnect extends
this.delay = codec.getDelay();
this.timeOffline = codec.getTimeOffline();
List<LdapURL> contexts = codec.getReplicatedContexts();
-
+
for ( int ii = 0; ii < contexts.size(); ii++ )
{
LdapURL url = contexts.get( ii );
@@ -219,9 +221,11 @@ public class GracefulDisconnect extends
if ( value != null )
{
- this.value = new byte[ value.length ];
+ this.value = new byte[value.length];
System.arraycopy( value, 0, this.value, 0, value.length );
- } else {
+ }
+ else
+ {
this.value = null;
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java Wed May 19 18:29:19 2010
@@ -65,13 +65,13 @@ public class GracefulShutdownRequest ext
private int delay;
- public GracefulShutdownRequest(int messageId)
+ public GracefulShutdownRequest( int messageId )
{
this( messageId, UNDETERMINED, NOW );
}
- public GracefulShutdownRequest(int messageId, int timeOffline, int delay)
+ public GracefulShutdownRequest( int messageId, int timeOffline, int delay )
{
super( messageId );
setOid( EXTENSION_OID );
@@ -97,9 +97,11 @@ public class GracefulShutdownRequest ext
GracefulShutdown gs = ( GracefulShutdown ) decoder.decode( payload );
if ( payload != null )
{
- this.payload = new byte[ payload.length ];
+ this.payload = new byte[payload.length];
System.arraycopy( payload, 0, this.payload, 0, payload.length );
- } else {
+ }
+ else
+ {
this.payload = null;
}
this.timeOffline = gs.getTimeOffline();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java Wed May 19 18:29:19 2010
@@ -42,32 +42,32 @@ public class GracefulShutdownResponse ex
private static final byte[] EMPTY_RESPONSE = new byte[0];
- public GracefulShutdownResponse(int messageId, ResultCodeEnum rcode)
+ public GracefulShutdownResponse( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
switch ( rcode )
{
- case SUCCESS :
+ case SUCCESS:
break;
-
- case OPERATIONS_ERROR :
+
+ case OPERATIONS_ERROR:
break;
-
- case INSUFFICIENT_ACCESS_RIGHTS :
+
+ case INSUFFICIENT_ACCESS_RIGHTS:
break;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.SUCCESS,
- ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
+ ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
}
-
+
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
}
- public GracefulShutdownResponse(int messageId)
+ public GracefulShutdownResponse( int messageId )
{
super( messageId, EXTENSION_OID );
super.getLdapResult().setMatchedDn( null );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java Wed May 19 18:29:19 2010
@@ -43,7 +43,7 @@ public class LaunchDiagnosticUiRequest e
private static final byte[] EMPTY_PAYLOAD = new byte[0];
- public LaunchDiagnosticUiRequest(int messageId)
+ public LaunchDiagnosticUiRequest( int messageId )
{
super( messageId );
setOid( EXTENSION_OID );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java Wed May 19 18:29:19 2010
@@ -41,35 +41,35 @@ public class LaunchDiagnosticUiResponse
private static final byte[] EMPTY_RESPONSE = new byte[0];
- public LaunchDiagnosticUiResponse(int messageId, ResultCodeEnum rcode)
+ public LaunchDiagnosticUiResponse( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
switch ( rcode )
{
- case SUCCESS :
+ case SUCCESS:
break;
-
- case OPERATIONS_ERROR :
+
+ case OPERATIONS_ERROR:
break;
-
- case INSUFFICIENT_ACCESS_RIGHTS :
+
+ case INSUFFICIENT_ACCESS_RIGHTS:
break;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.SUCCESS,
ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
}
-
+
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
}
- public LaunchDiagnosticUiResponse(int messageId)
+ public LaunchDiagnosticUiResponse( int messageId )
{
super( messageId, EXTENSION_OID );
- super.getLdapResult().setMatchedDn( null);
+ super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java Wed May 19 18:29:19 2010
@@ -114,7 +114,8 @@ public class NoticeOfDisconnect extends
public static final NoticeOfDisconnect PROTOCOLERROR = new NoticeOfDisconnect( ResultCodeEnum.PROTOCOL_ERROR );
- public static final NoticeOfDisconnect STRONGAUTHREQUIRED = new NoticeOfDisconnect( ResultCodeEnum.STRONG_AUTH_REQUIRED );
+ public static final NoticeOfDisconnect STRONGAUTHREQUIRED = new NoticeOfDisconnect(
+ ResultCodeEnum.STRONG_AUTH_REQUIRED );
private NoticeOfDisconnect( ResultCodeEnum rcode )
@@ -123,20 +124,20 @@ public class NoticeOfDisconnect extends
switch ( rcode )
{
- case UNAVAILABLE :
+ case UNAVAILABLE:
break;
-
- case PROTOCOL_ERROR :
+
+ case PROTOCOL_ERROR:
break;
-
- case STRONG_AUTH_REQUIRED :
+
+ case STRONG_AUTH_REQUIRED:
break;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.UNAVAILABLE,
ResultCodeEnum.PROTOCOL_ERROR, ResultCodeEnum.STRONG_AUTH_REQUIRED ) );
}
-
+
super.getLdapResult().setErrorMessage( rcode.toString() + ": The server will disconnect!" );
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
@@ -147,7 +148,6 @@ public class NoticeOfDisconnect extends
// ExtendedResponse Interface Method Implementations
// ------------------------------------------------------------------------
-
/**
* Gets the reponse OID specific encoded response values.
*
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java Wed May 19 18:29:19 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.message.extended;
+
import java.nio.ByteBuffer;
import javax.naming.NamingException;
@@ -52,7 +53,7 @@ public class StoredProcedureRequest exte
private StoredProcedure procedure;
-
+
public StoredProcedureRequest( int messageId )
{
super( messageId );
@@ -81,7 +82,7 @@ public class StoredProcedureRequest exte
{
StoredProcedureDecoder decoder = new StoredProcedureDecoder();
StoredProcedureContainer container = new StoredProcedureContainer();
-
+
try
{
decoder.decode( ByteBuffer.wrap( payload ), container );
@@ -147,71 +148,70 @@ public class StoredProcedureRequest exte
// Parameters of the Extended Request Payload
// -----------------------------------------------------------------------
-
public String getLanguage()
{
return procedure.getLanguage();
}
-
-
+
+
public void setLanguage( String language )
{
this.procedure.setLanguage( language );
}
-
+
public void setProcedure( String procedure )
{
this.procedure.setProcedure( StringTools.getBytesUtf8( procedure ) );
}
-
+
public String getProcedureSpecification()
{
return StringTools.utf8ToString( procedure.getProcedure() );
}
-
-
+
+
public int size()
{
return this.procedure.getParameters().size();
}
-
-
+
+
public Object getParameterType( int index )
{
- if ( ! this.procedure.getLanguage().equals( "java" ) )
+ if ( !this.procedure.getLanguage().equals( "java" ) )
{
return procedure.getParameters().get( index ).getType();
}
return getJavaParameterType( index );
}
-
-
+
+
public Class<?> getJavaParameterType( int index )
{
throw new NotImplementedException( I18n.err( I18n.ERR_04175 ) );
}
-
-
+
+
public Object getParameterValue( int index )
{
- if ( ! this.procedure.getLanguage().equals( "java" ) )
+ if ( !this.procedure.getLanguage().equals( "java" ) )
{
return procedure.getParameters().get( index ).getValue();
}
return getJavaParameterValue( index );
}
-
-
+
+
public Object getJavaParameterValue( int index )
{
throw new NotImplementedException( I18n.err( I18n.ERR_04176 ) );
}
-
-
+
+
public void addParameter( Object type, Object value )
{
/**
@@ -230,14 +230,14 @@ public class StoredProcedureRequest exte
* Replacing this code with the one below without the conditional check.
*/
-
+
StoredProcedureParameter parameter = new StoredProcedureParameter();
parameter.setType( ( byte[] ) type );
parameter.setValue( ( byte[] ) value );
this.procedure.addParameter( parameter );
// below here try to convert parameters to their appropriate byte[] representations
-
+
/**
* FIXME: What is this for?
*
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java Wed May 19 18:29:19 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.message.internal;
+
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
@@ -46,7 +47,7 @@ public class InternalAbstractRequest ext
* @param hasResponse
* flag indicating if this request generates a response
*/
- protected InternalAbstractRequest(final int id, final MessageTypeEnum type, boolean hasResponse)
+ protected InternalAbstractRequest( final int id, final MessageTypeEnum type, boolean hasResponse )
{
super( id, type );
@@ -64,7 +65,8 @@ public class InternalAbstractRequest ext
{
return hasResponse;
}
-
+
+
/**
* @see Object#hashCode()
* @return the instance's hash code
@@ -72,9 +74,9 @@ public class InternalAbstractRequest ext
public int hashCode()
{
int hash = 37;
- hash = hash*17 + (hasResponse ? 0 : 1 );
- hash = hash*17 + super.hashCode();
-
+ hash = hash * 17 + ( hasResponse ? 0 : 1 );
+ hash = hash * 17 + super.hashCode();
+
return hash;
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java?rev=946327&r1=946326&r2=946327&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java Wed May 19 18:29:19 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.message.internal;
+
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.LdapResultImpl;
@@ -48,7 +49,7 @@ public abstract class InternalAbstractRe
* @param type
* the message type of the response
*/
- protected InternalAbstractResultResponse(final int id, final MessageTypeEnum type)
+ protected InternalAbstractResultResponse( final int id, final MessageTypeEnum type )
{
super( id, type );
}