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 2012/01/24 18:27:12 UTC
svn commit: r1235364 [9/27] - in /directory/shared/trunk:
asn1/api/src/main/java/org/apache/directory/shared/asn1/util/
asn1/api/src/test/java/org/apache/directory/shared/asn1/util/
asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/ asn1/...
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestDecorator.java Tue Jan 24 17:27:00 2012
@@ -39,8 +39,8 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedRequestDecorator<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
- extends SingleReplyRequestDecorator<Q,P> implements ExtendedRequest<P>
+public class ExtendedRequestDecorator<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
+ extends SingleReplyRequestDecorator<Q, P> implements ExtendedRequest<P>
{
/** The extended request length */
private int extendedRequestLength;
@@ -107,8 +107,7 @@ public class ExtendedRequestDecorator<Q
//-------------------------------------------------------------------------
// The ExtendedRequest methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -124,7 +123,7 @@ public class ExtendedRequestDecorator<Q
public ExtendedRequest<P> setRequestName( String oid )
{
getDecorated().setRequestName( oid );
-
+
return this;
}
@@ -146,50 +145,49 @@ public class ExtendedRequestDecorator<Q
this.requestValue = requestValue;
}
-
-
-
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> addControl( Control control ) throws MessageException
{
- return (ExtendedRequest<P>)super.addControl( control );
+ return ( ExtendedRequest<P> ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> addAllControls( Control[] controls ) throws MessageException
{
- return (ExtendedRequest<P>)super.addAllControls( controls );
+ return ( ExtendedRequest<P> ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<P> removeControl( Control control ) throws MessageException
{
- return (ExtendedRequest<P>)super.removeControl( control );
+ return ( ExtendedRequest<P> ) super.removeControl( control );
}
+
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
-
-
+
/**
* Compute the ExtendedRequest length
*
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedRequestFactory.java Tue Jan 24 17:27:00 2012
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public interface ExtendedRequestFactory<Q extends ExtendedRequest<P>,P extends ExtendedResponse>
+public interface ExtendedRequestFactory<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
{
/**
* Gets the OID of the extended requests this factory generates.
@@ -40,14 +40,14 @@ public interface ExtendedRequestFactory<
* @return the extended request OID
*/
String getOid();
-
-
+
+
/**
* @return A new instance of the {@link ExtendedRequestDecorator}.
*/
Q newRequest();
-
+
/**
* Returns a new {@link ExtendedRequestDecorator} with the following encoded value.
*
@@ -55,8 +55,8 @@ public interface ExtendedRequestFactory<
* @return the decorator for the extended request type
*/
Q newRequest( byte[] value );
-
-
+
+
/**
* Decorates a non-decorated request.
*
@@ -64,8 +64,8 @@ public interface ExtendedRequestFactory<
* @return the decorated model request
*/
ExtendedRequestDecorator<Q, P> decorate( ExtendedRequest<?> modelRequest );
-
-
+
+
/**
* Creates a new ExtendedResponse, for the ExtendedRequest with a specific
* encoded value.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedResponseDecorator.java Tue Jan 24 17:27:00 2012
@@ -37,7 +37,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedResponseDecorator<R extends ExtendedResponse> extends ResponseDecorator<R>
+public class ExtendedResponseDecorator<R extends ExtendedResponse> extends ResponseDecorator<R>
implements ExtendedResponse
{
private static final long serialVersionUID = -9029282485890195506L;
@@ -103,12 +103,11 @@ public class ExtendedResponseDecorator<R
return extendedResponseLength;
}
-
+
//-------------------------------------------------------------------------
// The ExtendedResponse methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -144,7 +143,7 @@ public class ExtendedResponseDecorator<R
this.responseValue = responseValue;
}
-
+
//-------------------------------------------------------------------------
// The Decorator methods
//-------------------------------------------------------------------------
@@ -169,15 +168,15 @@ public class ExtendedResponseDecorator<R
*/
public int computeLength()
{
- int ldapResultLength = ( (LdapResultDecorator) getLdapResult() ).computeLength();
+ int ldapResultLength = ( ( LdapResultDecorator ) getLdapResult() ).computeLength();
int extendedResponseLength = ldapResultLength;
String id = getResponseName();
- if ( !Strings.isEmpty(id) )
+ if ( !Strings.isEmpty( id ) )
{
- byte[] idBytes = Strings.getBytesUtf8(id);
+ byte[] idBytes = Strings.getBytesUtf8( id );
setResponseNameBytes( idBytes );
int idLength = idBytes.length;
extendedResponseLength += 1 + TLV.getNbBytes( idLength ) + idLength;
@@ -215,7 +214,7 @@ public class ExtendedResponseDecorator<R
buffer.put( TLV.getBytes( getExtendedResponseLength() ) );
// The LdapResult
- ((LdapResultDecorator)getLdapResult()).encode( buffer );
+ ( ( LdapResultDecorator ) getLdapResult() ).encode( buffer );
// The ID, if any
byte[] idBytes = getResponseNameBytes();
@@ -250,7 +249,7 @@ public class ExtendedResponseDecorator<R
{
throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
}
-
+
return buffer;
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiService.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiService.java Tue Jan 24 17:27:00 2012
@@ -39,46 +39,46 @@ import org.apache.mina.filter.codec.Prot
*/
public interface LdapApiService
{
- String DEFAULT_PROTOCOL_CODEC_FACTORY =
+ String DEFAULT_PROTOCOL_CODEC_FACTORY =
"org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecFactory";
-
+
+
// ------------------------------------------------------------------------
// Control Methods
// ------------------------------------------------------------------------
-
/**
* Returns an Iterator over the OID Strings of registered controls.
*
* @return The registered control OID Strings
*/
Iterator<String> registeredControls();
-
-
+
+
/**
* Checks if a control has been registered.
*
* @return The OID of the control to check for registration
*/
boolean isControlRegistered( String oid );
-
-
+
+
/**
* Registers an {@link ControlFactory} with this service.
*
* @param factory The control factory
*/
- ControlFactory<?,?> registerControl( ControlFactory<?,?> factory );
-
-
+ ControlFactory<?, ?> registerControl( ControlFactory<?, ?> factory );
+
+
/**
* Unregisters an {@link ControlFactory} with this service.
*
* @param oid The oid of the control the factory is associated with.
*/
- ControlFactory<?,?> unregisterControl( String oid );
-
-
+ ControlFactory<?, ?> unregisterControl( String oid );
+
+
/**
* Creates a new codec control decorator of the specified type.
*
@@ -86,7 +86,7 @@ public interface LdapApiService
* @return The newly created codec control.
*/
CodecControl<? extends Control> newControl( String oid );
-
+
/**
* Creates a new codec control decorator for the provided control.
@@ -95,8 +95,8 @@ public interface LdapApiService
* @return The newly created codec control.
*/
CodecControl<? extends Control> newControl( Control control );
-
-
+
+
/**
* Creates a JNDI control from the ldap model's control.
*
@@ -105,8 +105,8 @@ public interface LdapApiService
* @throws EncoderException if there are problems encoding the modelControl.
*/
javax.naming.ldap.Control toJndiControl( Control modelControl ) throws EncoderException;
-
-
+
+
/**
* Creates a model control from the JNDI control.
*
@@ -116,12 +116,11 @@ public interface LdapApiService
*/
Control fromJndiControl( javax.naming.ldap.Control jndiControl ) throws DecoderException;
-
+
// ------------------------------------------------------------------------
// Extended Request Methods
// ------------------------------------------------------------------------
-
/**
* Returns an Iterator over the OID Strings of registered extended
* requests.
@@ -129,8 +128,8 @@ public interface LdapApiService
* @return The registered extended request OID Strings
*/
Iterator<String> registeredExtendedRequests();
-
-
+
+
/**
* Registers an {@link ExtendedRequestFactory} for generating extended request
* response pairs.
@@ -138,9 +137,9 @@ public interface LdapApiService
* @param factory The extended request factory
* @return The displaced factory if one existed for the oid
*/
- ExtendedRequestFactory<?,?> registerExtendedRequest( ExtendedRequestFactory<?,?> factory );
-
-
+ ExtendedRequestFactory<?, ?> registerExtendedRequest( ExtendedRequestFactory<?, ?> factory );
+
+
/**
* Unregisters an {@link ExtendedRequestFactory} for generating extended
* request response pairs.
@@ -148,9 +147,9 @@ public interface LdapApiService
* @param oid The extended request oid
* @return The displaced factory if one existed for the oid
*/
- ExtendedRequestFactory<?,?> unregisterExtendedRequest( String oid );
-
-
+ ExtendedRequestFactory<?, ?> unregisterExtendedRequest( String oid );
+
+
/**
* Checks to see if an extended operation, either a standard request
* response, pair or just an unsolicited response is registered.
@@ -159,13 +158,12 @@ public interface LdapApiService
* @return true if registered, false if not
*/
boolean isExtendedOperationRegistered( String oid );
-
-
+
+
// ------------------------------------------------------------------------
// Extended Response Methods
// ------------------------------------------------------------------------
-
/**
* Returns an Iterator over the OID Strings of registered unsolicited
* extended responses.
@@ -173,8 +171,8 @@ public interface LdapApiService
* @return The registered unsolicited extended response OID Strings
*/
Iterator<String> registeredUnsolicitedResponses();
-
-
+
+
/**
* Registers an {@link UnsolicitedResponseFactory} for generating extended
* responses sent by servers without an extended request.
@@ -184,7 +182,7 @@ public interface LdapApiService
*/
UnsolicitedResponseFactory<?> registerUnsolicitedResponse( UnsolicitedResponseFactory<?> factory );
-
+
/**
* Unregisters an {@link UnsolicitedResponseFactory} for generating
* extended responses sent by servers without an extended request.
@@ -193,7 +191,7 @@ public interface LdapApiService
*/
UnsolicitedResponseFactory<?> unregisterUnsolicitedResponse( String oid );
-
+
/**
* Creates a model ExtendedResponse from the JNDI ExtendedResponse.
*
@@ -202,8 +200,8 @@ public interface LdapApiService
* @throws DecoderException if the response value cannot be decoded.
*/
ExtendedResponse fromJndi( javax.naming.ldap.ExtendedResponse jndiResponse ) throws DecoderException;
-
-
+
+
/**
* Creates a JNDI {@link javax.naming.ldap.ExtendedResponse} from the model
* {@link ExtendedResponse}.
@@ -214,7 +212,7 @@ public interface LdapApiService
*/
javax.naming.ldap.ExtendedResponse toJndi( ExtendedResponse modelResponse ) throws EncoderException;
-
+
/**
* Creates a model ExtendedResponse from the JNDI ExtendedResponse.
*
@@ -223,8 +221,8 @@ public interface LdapApiService
* @throws DecoderException if the response value cannot be decoded.
*/
ExtendedRequest<?> fromJndi( javax.naming.ldap.ExtendedRequest jndiRequest ) throws DecoderException;
-
-
+
+
/**
* Creates a JNDI {@link javax.naming.ldap.ExtendedResponse} from the model
* {@link ExtendedResponse}.
@@ -234,21 +232,20 @@ public interface LdapApiService
* @throws EncoderException
*/
javax.naming.ldap.ExtendedRequest toJndi( ExtendedRequest<?> modelRequest ) throws EncoderException;
-
-
+
+
// ------------------------------------------------------------------------
// Other Methods
// ------------------------------------------------------------------------
-
/**
* Creates a new LDAP {@link ProtocolCodecFactory}.
*
* @return the {@link ProtocolCodecFactory}
*/
ProtocolCodecFactory getProtocolCodecFactory();
-
-
+
+
/**
* Registers a ProtocolCodecFactory with this LdapCodecService.
*
@@ -258,7 +255,7 @@ public interface LdapApiService
*/
ProtocolCodecFactory registerProtocolCodecFactory( ProtocolCodecFactory factory );
-
+
/**
* Creates a new MessageContainer.
*
@@ -268,7 +265,8 @@ public interface LdapApiService
Asn1Container newMessageContainer();
- <E extends ExtendedResponse> E newExtendedResponse( ExtendedRequest<E> req, byte[] serializedResponse ) throws DecoderException;
+ <E extends ExtendedResponse> E newExtendedResponse( ExtendedRequest<E> req, byte[] serializedResponse )
+ throws DecoderException;
/**
@@ -281,7 +279,7 @@ public interface LdapApiService
ExtendedRequest<?> newExtendedRequest( String oid, byte[] value );
- ExtendedRequestDecorator<?,?> decorate( ExtendedRequest<?> decoratedMessage );
+ ExtendedRequestDecorator<?, ?> decorate( ExtendedRequest<?> decoratedMessage );
ExtendedResponseDecorator<?> decorate( ExtendedResponse decoratedMessage );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java Tue Jan 24 17:27:00 2012
@@ -39,14 +39,14 @@ public class LdapApiServiceFactory
{
/** Logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( LdapApiServiceFactory.class );
-
+
/** The LdapCodecService singleton bound to this factory */
private static LdapApiService ldapCodecService;
-
+
/** Whether or not the standalone implementation is being used */
private static boolean usingStandaloneImplementation;
-
-
+
+
/**
* Checks to see if the factory is initialized.
*
@@ -56,8 +56,8 @@ public class LdapApiServiceFactory
{
return ldapCodecService != null;
}
-
-
+
+
/**
* Checks to see if the factory is using the standalone implementation.
*
@@ -65,17 +65,17 @@ public class LdapApiServiceFactory
*/
public static boolean isUsingStandaloneImplementation()
{
- if ( ! isInitialized() )
+ if ( !isInitialized() )
{
String msg = "Not initialized yet!";
LOG.error( msg );
throw new IllegalStateException( msg );
}
-
+
return usingStandaloneImplementation;
}
-
-
+
+
/**
* Gets the singleton instance of the LdapCodecService.
*
@@ -88,11 +88,11 @@ public class LdapApiServiceFactory
{
initialize( null );
}
-
+
return ldapCodecService;
}
-
-
+
+
/**
* Initialization can only take place once. There after an exception
* results.
@@ -104,7 +104,7 @@ public class LdapApiServiceFactory
/*
* If the class member is already set we have problems.
*/
-
+
if ( LdapApiServiceFactory.ldapCodecService != null )
{
StringBuilder sb = new StringBuilder( "The LdapCodecService is already set to an instance of " );
@@ -113,7 +113,6 @@ public class LdapApiServiceFactory
throw new IllegalStateException( sb.toString() );
}
-
/*
* If the argument is null, then we attempt discovery
*/
@@ -123,7 +122,7 @@ public class LdapApiServiceFactory
try
{
@SuppressWarnings("unchecked")
- Class<? extends LdapApiService> serviceClass = ( Class<? extends LdapApiService> )
+ Class<? extends LdapApiService> serviceClass = ( Class<? extends LdapApiService> )
Class.forName( "org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapApiService" );
LdapApiServiceFactory.ldapCodecService = serviceClass.newInstance();
usingStandaloneImplementation = true;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java Tue Jan 24 17:27:00 2012
@@ -48,6 +48,7 @@ public class LdapDecoder
/** The ASN 1 decoder instance */
private Asn1Decoder asn1Decoder;
+
/**
* Creates an instance of a Ldap Decoder implementation.
*/
@@ -64,7 +65,8 @@ public class LdapDecoder
* @param in The input stream to read and decode PDU bytes from
* @return return The decoded message
*/
- public Message decode( InputStream in, LdapMessageContainer<MessageDecorator<? extends Message>> container ) throws DecoderException
+ public Message decode( InputStream in, LdapMessageContainer<MessageDecorator<? extends Message>> container )
+ throws DecoderException
{
try
{
@@ -72,7 +74,7 @@ public class LdapDecoder
while ( in.available() > 0 )
{
- byte[]buf = new byte[in.available()];
+ byte[] buf = new byte[in.available()];
if ( ( amount = in.read( buf ) ) == -1 )
{
@@ -105,7 +107,6 @@ public class LdapDecoder
}
}
-
/**
* Decode an incoming buffer into LDAP messages. The result can be 0, 1 or many
* LDAP messages, which will be stored into the array the caller has created.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapEncoder.java Tue Jan 24 17:27:00 2012
@@ -45,8 +45,8 @@ public class LdapEncoder
{
/** The LdapCodecService */
private LdapApiService codec;
-
-
+
+
/**
* Creates an instance of Ldap message encoder
*
@@ -59,19 +59,19 @@ public class LdapEncoder
{
throw new NullPointerException( "codec argument cannot be null" );
}
-
+
this.codec = codec;
}
-
-
+
+
/**
* Compute the control's encoded length
*/
private int computeControlLength( Control control )
{
// First, compute the control's value length
- int controlValueLength = ( ( CodecControl<?> ) control).computeLength();
-
+ int controlValueLength = ( ( CodecControl<?> ) control ).computeLength();
+
// Now, compute the envelop length
// The OID
int oidLengh = Strings.getBytesUtf8( control.getOid() ).length;
@@ -82,16 +82,16 @@ public class LdapEncoder
{
controlLength += 1 + 1 + 1; // Always 3 for a boolean
}
-
+
if ( controlValueLength != 0 )
{
controlLength += 1 + TLV.getNbBytes( controlValueLength ) + controlValueLength;
}
-
+
return controlLength;
}
-
-
+
+
/**
* Encode a control to a byte[]
*/
@@ -127,7 +127,7 @@ public class LdapEncoder
return buffer;
}
-
+
/**
* Generate the PDU which contains the encoded object.
@@ -167,7 +167,7 @@ public class LdapEncoder
buffer.put( UniversalTag.SEQUENCE.getValue() );
// The length has been calculated by the computeLength method
- buffer.put( TLV.getBytes(decorator.getMessageLength()) );
+ buffer.put( TLV.getBytes( decorator.getMessageLength() ) );
}
catch ( BufferOverflowException boe )
{
@@ -193,17 +193,17 @@ public class LdapEncoder
for ( Control control : controls.values() )
{
encodeControl( buffer, control );
-
+
// The OctetString tag if the value is not null
- int controlValueLength = ( ( CodecControl<?> ) control).computeLength();
-
+ int controlValueLength = ( ( CodecControl<?> ) control ).computeLength();
+
if ( controlValueLength > 0 )
{
buffer.put( UniversalTag.OCTET_STRING.getValue() );
buffer.put( TLV.getBytes( controlValueLength ) );
-
+
// And now, the value
- ( (org.apache.directory.shared.ldap.codec.api.CodecControl<?> ) control ).encode( buffer );
+ ( ( org.apache.directory.shared.ldap.codec.api.CodecControl<?> ) control ).encode( buffer );
}
}
}
@@ -241,7 +241,7 @@ public class LdapEncoder
// - the tag (0x02), 1 byte
// - the length of the Id length, 1 byte
// - the Id length, 1 to 4 bytes
- int ldapMessageLength = 1 + 1 + Value.getNbBytes( messageDecorator.getDecorated().getMessageId());
+ int ldapMessageLength = 1 + 1 + Value.getNbBytes( messageDecorator.getDecorated().getMessageId() );
// Get the protocolOp length
ldapMessageLength += messageDecorator.computeLength();
@@ -276,7 +276,7 @@ public class LdapEncoder
for ( Control control : controls.values() )
{
int controlLength = computeControlLength( control );
-
+
controlsSequenceLength += 1 + TLV.getNbBytes( controlLength ) + controlLength;
}
@@ -345,7 +345,7 @@ public class LdapEncoder
// Each referral
for ( String ldapUrl : ldapUrls )
{
- byte[] ldapUrlBytes = Strings.getBytesUtf8(ldapUrl);
+ byte[] ldapUrlBytes = Strings.getBytesUtf8( ldapUrl );
referralLength += 1 + TLV.getNbBytes( ldapUrlBytes.length ) + ldapUrlBytes.length;
referral.addLdapUrlBytes( ldapUrlBytes );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageDecorator.java Tue Jan 24 17:27:00 2012
@@ -91,20 +91,20 @@ public abstract class MessageDecorator<E
/** The length of the controls */
private int controlsLength;
-
+
/** The LdapCodecService */
private final LdapApiService codec;
-
+
public static MessageDecorator<? extends Message> getDecorator( LdapApiService codec, Message decoratedMessage )
{
if ( decoratedMessage instanceof MessageDecorator )
{
- return (org.apache.directory.shared.ldap.codec.api.MessageDecorator<?> ) decoratedMessage;
+ return ( org.apache.directory.shared.ldap.codec.api.MessageDecorator<?> ) decoratedMessage;
}
-
+
MessageDecorator<?> decorator = null;
-
+
switch ( decoratedMessage.getType() )
{
case ABANDON_REQUEST:
@@ -114,27 +114,27 @@ public abstract class MessageDecorator<E
case ADD_REQUEST:
decorator = new AddRequestDecorator( codec, ( AddRequest ) decoratedMessage );
break;
-
+
case ADD_RESPONSE:
decorator = new AddResponseDecorator( codec, ( AddResponse ) decoratedMessage );
break;
-
+
case BIND_REQUEST:
decorator = new BindRequestDecorator( codec, ( BindRequest ) decoratedMessage );
break;
-
+
case BIND_RESPONSE:
decorator = new BindResponseDecorator( codec, ( BindResponse ) decoratedMessage );
break;
-
+
case COMPARE_REQUEST:
decorator = new CompareRequestDecorator( codec, ( CompareRequest ) decoratedMessage );
break;
-
+
case COMPARE_RESPONSE:
decorator = new CompareResponseDecorator( codec, ( CompareResponse ) decoratedMessage );
break;
-
+
case DEL_REQUEST:
decorator = new DeleteRequestDecorator( codec, ( DeleteRequest ) decoratedMessage );
break;
@@ -142,61 +142,61 @@ public abstract class MessageDecorator<E
case DEL_RESPONSE:
decorator = new DeleteResponseDecorator( codec, ( DeleteResponse ) decoratedMessage );
break;
-
+
case EXTENDED_REQUEST:
decorator = codec.decorate( ( ExtendedRequest<?> ) decoratedMessage );
break;
-
+
case EXTENDED_RESPONSE:
decorator = codec.decorate( ( ExtendedResponse ) decoratedMessage );
break;
-
+
case INTERMEDIATE_RESPONSE:
decorator = new IntermediateResponseDecorator( codec, ( IntermediateResponse ) decoratedMessage );
break;
-
+
case MODIFY_REQUEST:
decorator = new ModifyRequestDecorator( codec, ( ModifyRequest ) decoratedMessage );
break;
-
+
case MODIFY_RESPONSE:
decorator = new ModifyResponseDecorator( codec, ( ModifyResponse ) decoratedMessage );
break;
-
+
case MODIFYDN_REQUEST:
decorator = new ModifyDnRequestDecorator( codec, ( ModifyDnRequest ) decoratedMessage );
break;
-
+
case MODIFYDN_RESPONSE:
decorator = new ModifyDnResponseDecorator( codec, ( ModifyDnResponse ) decoratedMessage );
break;
-
+
case SEARCH_REQUEST:
decorator = new SearchRequestDecorator( codec, ( SearchRequest ) decoratedMessage );
break;
-
+
case SEARCH_RESULT_DONE:
decorator = new SearchResultDoneDecorator( codec, ( SearchResultDone ) decoratedMessage );
break;
-
+
case SEARCH_RESULT_ENTRY:
decorator = new SearchResultEntryDecorator( codec, ( SearchResultEntry ) decoratedMessage );
break;
-
+
case SEARCH_RESULT_REFERENCE:
decorator = new SearchResultReferenceDecorator( codec, ( SearchResultReference ) decoratedMessage );
break;
-
+
case UNBIND_REQUEST:
decorator = new UnbindRequestDecorator( codec, ( UnbindRequest ) decoratedMessage );
break;
-
- default :
+
+ default:
return null;
}
-
+
Map<String, Control> controls = decoratedMessage.getControls();
-
+
if ( controls != null )
{
for ( Control control : controls.values() )
@@ -204,7 +204,7 @@ public abstract class MessageDecorator<E
decorator.addControl( control );
}
}
-
+
return decorator;
}
@@ -266,12 +266,11 @@ public abstract class MessageDecorator<E
return currentControl;
}
-
+
//-------------------------------------------------------------------------
// The Message methods
//-------------------------------------------------------------------------
-
-
+
/**
* {@inheritDoc}
*/
@@ -316,10 +315,10 @@ public abstract class MessageDecorator<E
{
Control decorated;
CodecControl<? extends Control> controlDecorator;
-
- if ( control instanceof ControlDecorator)
+
+ if ( control instanceof ControlDecorator )
{
- controlDecorator = (org.apache.directory.shared.ldap.codec.api.CodecControl<? extends Control> ) control;
+ controlDecorator = ( org.apache.directory.shared.ldap.codec.api.CodecControl<? extends Control> ) control;
decorated = controlDecorator.getDecorated();
}
else
@@ -327,7 +326,7 @@ public abstract class MessageDecorator<E
controlDecorator = codec.newControl( control );
decorated = control;
}
-
+
decoratedMessage.addControl( decorated );
controls.put( control.getOid(), controlDecorator );
currentControl = controlDecorator;
@@ -395,7 +394,7 @@ public abstract class MessageDecorator<E
public Message setMessageId( int messageId )
{
decoratedMessage.setMessageId( messageId );
-
+
return this;
}
@@ -416,7 +415,7 @@ public abstract class MessageDecorator<E
{
return decoratedMessage;
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageEncoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageEncoderException.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageEncoderException.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/MessageEncoderException.java Tue Jan 24 17:27:00 2012
@@ -36,6 +36,7 @@ public class MessageEncoderException ext
/** The message ID */
private int messageId;
+
/**
* Creates a new instance of MessageEncoderException.
*
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java Tue Jan 24 17:27:00 2012
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.codec.api;
+
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.ldap.model.message.Message;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
@@ -45,13 +46,14 @@ public class ResponseCarryingException e
/** The response with the error cause */
private Message response;
-
+
+
/**
* Creates a DecoderException
*
* @param message A message with meaning to a human
*/
- public ResponseCarryingException(String message)
+ public ResponseCarryingException( String message )
{
super( message );
}
@@ -63,27 +65,29 @@ public class ResponseCarryingException e
* @param message A message with meaning to a human
* @param cause The Exception which caused the error
*/
- public ResponseCarryingException(String message, ResultResponse response, ResultCodeEnum code,
- Dn matchedDn, Throwable cause)
+ public ResponseCarryingException( String message, ResultResponse response, ResultCodeEnum code,
+ Dn matchedDn, Throwable cause )
{
super( message, cause );
response.getLdapResult().setDiagnosticMessage( message );
response.getLdapResult().setResultCode( code );
response.getLdapResult().setMatchedDn( matchedDn );
-
- this.response = response;
+
+ this.response = response;
}
-
+
+
/**
* Set a response if we get an exception while parsing the message
* @param response the constructed response
*/
- public void setResponse( Message response )
+ public void setResponse( Message response )
{
this.response = response;
}
-
+
+
/**
* Get the constructed response
* @return The constructed response
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/UnsolicitedResponseFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/UnsolicitedResponseFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/UnsolicitedResponseFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/UnsolicitedResponseFactory.java Tue Jan 24 17:27:00 2012
@@ -39,8 +39,8 @@ public interface UnsolicitedResponseFact
* @return the extended response OID
*/
String getOid();
-
-
+
+
/**
* @return A new instance of the ExtendedResponse.
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java Tue Jan 24 17:27:00 2012
@@ -46,7 +46,7 @@ public class CascadeDecorator extends Co
super( codec, control );
}
-
+
/**
* Returns the default control length.
*/
@@ -55,7 +55,7 @@ public class CascadeDecorator extends Co
return 0;
}
-
+
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
return this;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java Tue Jan 24 17:27:00 2012
@@ -36,8 +36,8 @@ public class CascadeFactory implements C
{
/** The LDAP codec responsible for encoding and decoding Cascade Controls */
private LdapApiService codec;
-
-
+
+
/**
* Creates a new instance of CascadeFactory.
*
@@ -48,7 +48,7 @@ public class CascadeFactory implements C
this.codec = codec;
}
-
+
/**
* {@inheritDoc}
*/
@@ -57,7 +57,7 @@ public class CascadeFactory implements C
return Cascade.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -65,7 +65,7 @@ public class CascadeFactory implements C
{
return new CascadeDecorator( codec, new CascadeImpl() );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java Tue Jan 24 17:27:00 2012
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
public class ManageDsaITDecorator extends ControlDecorator<ManageDsaIT> implements ManageDsaIT
{
-
/**
* Default constructor
*/
@@ -55,9 +54,9 @@ public class ManageDsaITDecorator extend
{
return 0;
}
-
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException
+
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
return this;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java Tue Jan 24 17:27:00 2012
@@ -36,8 +36,8 @@ public class ManageDsaITFactory implemen
{
/** The LDAP codec responsible for encoding and decoding Cascade Controls */
private LdapApiService codec;
-
-
+
+
/**
* Creates a new instance of CascadeFactory.
*
@@ -48,7 +48,7 @@ public class ManageDsaITFactory implemen
this.codec = codec;
}
-
+
/**
* {@inheritDoc}
*/
@@ -57,7 +57,7 @@ public class ManageDsaITFactory implemen
return ManageDsaIT.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -65,7 +65,7 @@ public class ManageDsaITFactory implemen
{
return new ManageDsaITDecorator( codec, new ManageDsaITImpl() );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java Tue Jan 24 17:27:00 2012
@@ -32,7 +32,7 @@ public class EntryChangeContainer extend
{
/** EntryChangeControl */
private EntryChangeDecorator control;
-
+
/** The codec that encodes and decodes */
private LdapApiService codec;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java Tue Jan 24 17:27:00 2012
@@ -60,7 +60,7 @@ public class EntryChangeDecorator extend
/** An instance of this decoder */
private static final Asn1Decoder decoder = new Asn1Decoder();
-
+
/**
* Creates a new instance of EntryChangeDecoder wrapping a newly created
* EntryChange Control object.
@@ -207,7 +207,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public ChangeType getChangeType ()
+ public ChangeType getChangeType()
{
return getEntryChange().getChangeType();
}
@@ -216,7 +216,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public void setChangeType ( ChangeType changeType )
+ public void setChangeType( ChangeType changeType )
{
getEntryChange().setChangeType( changeType );
}
@@ -225,7 +225,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public Dn getPreviousDn ()
+ public Dn getPreviousDn()
{
return getEntryChange().getPreviousDn();
}
@@ -234,7 +234,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public void setPreviousDn ( Dn previousDn )
+ public void setPreviousDn( Dn previousDn )
{
getEntryChange().setPreviousDn( previousDn );
}
@@ -243,7 +243,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public long getChangeNumber ()
+ public long getChangeNumber()
{
return getEntryChange().getChangeNumber();
}
@@ -252,7 +252,7 @@ public class EntryChangeDecorator extend
/**
* {@inheritDoc}
*/
- public void setChangeNumber ( long changeNumber )
+ public void setChangeNumber( long changeNumber )
{
getEntryChange().setChangeNumber( changeNumber );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ public class EntryChangeFactory implemen
/** The LDAP codec service */
private LdapApiService codec;
-
+
/**
* Creates a new instance of EntryChangeFactory.
*
@@ -46,8 +46,8 @@ public class EntryChangeFactory implemen
{
this.codec = codec;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -56,7 +56,7 @@ public class EntryChangeFactory implemen
return EntryChange.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -64,7 +64,7 @@ public class EntryChangeFactory implemen
{
return new EntryChangeDecorator( codec );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java Tue Jan 24 17:27:00 2012
@@ -67,7 +67,7 @@ public final class EntryChangeGrammar ex
setName( EntryChangeGrammar.class.getName() );
// Create the transitions table
- super.transitions = new GrammarTransition[ EntryChangeStates.LAST_EC_STATE.ordinal()][256];
+ super.transitions = new GrammarTransition[EntryChangeStates.LAST_EC_STATE.ordinal()][256];
// ============================================================================================
// Transition from start state to Entry Change sequence
@@ -76,10 +76,10 @@ public final class EntryChangeGrammar ex
// ...
//
// Initialization of the structure
- super.transitions[ EntryChangeStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
+ super.transitions[EntryChangeStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
new GrammarTransition<EntryChangeContainer>( EntryChangeStates.START_STATE,
- EntryChangeStates.EC_SEQUENCE_STATE,
- UniversalTag.SEQUENCE.getValue(), null );
+ EntryChangeStates.EC_SEQUENCE_STATE,
+ UniversalTag.SEQUENCE.getValue(), null );
// ============================================================================================
// transition from Entry Change sequence to Change Type
@@ -89,57 +89,57 @@ public final class EntryChangeGrammar ex
// ...
//
// Evaluates the changeType
- super.transitions[ EntryChangeStates.EC_SEQUENCE_STATE.ordinal()][UniversalTag.ENUMERATED.getValue()] =
+ super.transitions[EntryChangeStates.EC_SEQUENCE_STATE.ordinal()][UniversalTag.ENUMERATED.getValue()] =
new GrammarTransition<EntryChangeContainer>( EntryChangeStates.EC_SEQUENCE_STATE,
- EntryChangeStates.CHANGE_TYPE_STATE,
- UniversalTag.ENUMERATED.getValue(),
- new GrammarAction<EntryChangeContainer>( "Set EntryChangeControl changeType" )
- {
- public void action( EntryChangeContainer container ) throws DecoderException
- {
- Value value = container.getCurrentTLV().getValue();
-
- try
+ EntryChangeStates.CHANGE_TYPE_STATE,
+ UniversalTag.ENUMERATED.getValue(),
+ new GrammarAction<EntryChangeContainer>( "Set EntryChangeControl changeType" )
{
- int change = IntegerDecoder.parse( value, 1, 8 );
-
- switch ( ChangeType.getChangeType( change ) )
+ public void action( EntryChangeContainer container ) throws DecoderException
{
- case ADD:
- case DELETE:
- case MODDN:
- case MODIFY:
- ChangeType changeType = ChangeType.getChangeType( change );
+ Value value = container.getCurrentTLV().getValue();
- if ( IS_DEBUG )
+ try
+ {
+ int change = IntegerDecoder.parse( value, 1, 8 );
+
+ switch ( ChangeType.getChangeType( change ) )
{
- LOG.debug( "changeType = " + changeType );
+ case ADD:
+ case DELETE:
+ case MODDN:
+ case MODIFY:
+ ChangeType changeType = ChangeType.getChangeType( change );
+
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "changeType = " + changeType );
+ }
+
+ container.getEntryChangeDecorator().setChangeType( changeType );
+ break;
+
+ default:
+ String msg = I18n.err( I18n.ERR_04044 );
+ LOG.error( msg );
+ throw new DecoderException( msg );
}
- container.getEntryChangeDecorator().setChangeType( changeType );
- break;
-
- default:
+ // We can have an END transition
+ container.setGrammarEndAllowed( true );
+ }
+ catch ( IntegerDecoderException e )
+ {
String msg = I18n.err( I18n.ERR_04044 );
- LOG.error( msg );
+ LOG.error( msg, e );
throw new DecoderException( msg );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new DecoderException( e.getLocalizedMessage() );
+ }
}
-
- // We can have an END transition
- container.setGrammarEndAllowed( true );
- }
- catch ( IntegerDecoderException e )
- {
- String msg = I18n.err( I18n.ERR_04044 );
- LOG.error( msg, e );
- throw new DecoderException( msg );
- }
- catch ( IllegalArgumentException e )
- {
- throw new DecoderException( e.getLocalizedMessage() );
- }
- }
- } );
+ } );
// ============================================================================================
// Transition from Change Type to Previous Dn
@@ -151,52 +151,52 @@ public final class EntryChangeGrammar ex
//
// Set the previousDN into the structure. We first check that it's a
// valid Dn
- super.transitions[ EntryChangeStates.CHANGE_TYPE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] =
+ super.transitions[EntryChangeStates.CHANGE_TYPE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] =
new GrammarTransition<EntryChangeContainer>( EntryChangeStates.CHANGE_TYPE_STATE,
- EntryChangeStates.PREVIOUS_DN_STATE,
- UniversalTag.OCTET_STRING.getValue(),
- new GrammarAction<EntryChangeContainer>( "Set EntryChangeControl previousDN" )
- {
- public void action( EntryChangeContainer container ) throws DecoderException
- {
- ChangeType changeType = container.getEntryChangeDecorator().getChangeType();
-
-
- if ( changeType != ChangeType.MODDN )
- {
- LOG.error( I18n.err( I18n.ERR_04045 ) );
- throw new DecoderException( I18n.err( I18n.ERR_04046 ));
- }
- else
+ EntryChangeStates.PREVIOUS_DN_STATE,
+ UniversalTag.OCTET_STRING.getValue(),
+ new GrammarAction<EntryChangeContainer>( "Set EntryChangeControl previousDN" )
{
- Value value = container.getCurrentTLV().getValue();
- Dn previousDn;
-
- try
- {
- previousDn = new Dn( Strings.utf8ToString(value.getData()) );
- }
- catch ( LdapInvalidDnException ine )
+ public void action( EntryChangeContainer container ) throws DecoderException
{
- LOG.error( I18n.err( I18n.ERR_04047, Strings.dumpBytes(value.getData()) ) );
- throw new DecoderException( I18n.err( I18n.ERR_04048 ) );
- }
+ ChangeType changeType = container.getEntryChangeDecorator().getChangeType();
- if ( IS_DEBUG )
- {
- LOG.debug( "previousDN = " + previousDn );
- }
+ if ( changeType != ChangeType.MODDN )
+ {
+ LOG.error( I18n.err( I18n.ERR_04045 ) );
+ throw new DecoderException( I18n.err( I18n.ERR_04046 ) );
+ }
+ else
+ {
+ Value value = container.getCurrentTLV().getValue();
+ Dn previousDn;
+
+ try
+ {
+ previousDn = new Dn( Strings.utf8ToString( value.getData() ) );
+ }
+ catch ( LdapInvalidDnException ine )
+ {
+ LOG.error( I18n.err( I18n.ERR_04047, Strings.dumpBytes( value.getData() ) ) );
+ throw new DecoderException( I18n.err( I18n.ERR_04048 ) );
+ }
+
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "previousDN = " + previousDn );
+ }
- container.getEntryChangeDecorator().setPreviousDn( previousDn );
+ container.getEntryChangeDecorator().setPreviousDn( previousDn );
- // We can have an END transition
- container.setGrammarEndAllowed( true );
- }
- }
- } );
+ // We can have an END transition
+ container.setGrammarEndAllowed( true );
+ }
+ }
+ } );
// Change Number action
- GrammarAction<EntryChangeContainer> setChangeNumberAction = new GrammarAction<EntryChangeContainer>( "Set EntryChangeControl changeNumber" )
+ GrammarAction<EntryChangeContainer> setChangeNumberAction = new GrammarAction<EntryChangeContainer>(
+ "Set EntryChangeControl changeNumber" )
{
public void action( EntryChangeContainer container ) throws DecoderException
{
@@ -234,10 +234,10 @@ public final class EntryChangeGrammar ex
// }
//
// Set the changeNumber into the structure
- super.transitions[ EntryChangeStates.PREVIOUS_DN_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[EntryChangeStates.PREVIOUS_DN_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
new GrammarTransition<EntryChangeContainer>( EntryChangeStates.PREVIOUS_DN_STATE,
- EntryChangeStates.CHANGE_NUMBER_STATE,
- UniversalTag.INTEGER.getValue(),
+ EntryChangeStates.CHANGE_NUMBER_STATE,
+ UniversalTag.INTEGER.getValue(),
setChangeNumberAction );
// ============================================================================================
@@ -249,10 +249,10 @@ public final class EntryChangeGrammar ex
// }
//
// Set the changeNumber into the structure
- super.transitions[ EntryChangeStates.CHANGE_TYPE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[EntryChangeStates.CHANGE_TYPE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
new GrammarTransition<EntryChangeContainer>( EntryChangeStates.CHANGE_TYPE_STATE,
- EntryChangeStates.CHANGE_NUMBER_STATE,
- UniversalTag.INTEGER.getValue(),
+ EntryChangeStates.CHANGE_NUMBER_STATE,
+ UniversalTag.INTEGER.getValue(),
setChangeNumberAction );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java Tue Jan 24 17:27:00 2012
@@ -60,7 +60,6 @@ public enum EntryChangeStates implements
/** terminal state */
LAST_EC_STATE;
-
/**
* Get the grammar name
*
@@ -100,7 +99,7 @@ public enum EntryChangeStates implements
return ( ( state == END_STATE.ordinal() ) ? "EC_END_STATE" : name() );
}
-
+
/**
* {@inheritDoc}
*/
@@ -108,8 +107,8 @@ public enum EntryChangeStates implements
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java Tue Jan 24 17:27:00 2012
@@ -34,7 +34,7 @@ public class PagedResultsContainer exten
{
/** PagedSearchControl */
private PagedResultsDecorator control;
-
+
private LdapApiService codec;
@@ -102,6 +102,7 @@ public class PagedResultsContainer exten
this.control = control;
}
+
/**
* Clean the container
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java Tue Jan 24 17:27:00 2012
@@ -234,12 +234,12 @@ public class PagedResultsDecorator exten
case 3:
value = ( ( getCookie()[0] & 0x00FF ) << 16 ) + ( ( getCookie()[1] & 0x00FF ) << 8 )
- + ( getCookie()[2] & 0x00FF );
+ + ( getCookie()[2] & 0x00FF );
break;
case 4:
value = ( ( getCookie()[0] & 0x00FF ) << 24 ) + ( ( getCookie()[1] & 0x00FF ) << 16 )
- + ( ( getCookie()[2] & 0x00FF ) << 8 ) + ( getCookie()[3] & 0x00FF );
+ + ( ( getCookie()[2] & 0x00FF ) << 8 ) + ( getCookie()[3] & 0x00FF );
break;
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java Tue Jan 24 17:27:00 2012
@@ -36,7 +36,7 @@ public class PagedResultsFactory impleme
/** The LDAP codec service */
private LdapApiService codec;
-
+
/**
* Creates a new instance of PagedResultsFactory.
*
@@ -46,8 +46,8 @@ public class PagedResultsFactory impleme
{
this.codec = codec;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -56,7 +56,7 @@ public class PagedResultsFactory impleme
return PagedResults.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -64,7 +64,7 @@ public class PagedResultsFactory impleme
{
return new PagedResultsDecorator( codec );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java Tue Jan 24 17:27:00 2012
@@ -69,7 +69,7 @@ public final class PagedResultsGrammar e
setName( PagedResultsGrammar.class.getName() );
// Create the transitions table
- super.transitions = new GrammarTransition[ PagedResultsStates.LAST_PAGED_SEARCH_STATE.ordinal()][256];
+ super.transitions = new GrammarTransition[PagedResultsStates.LAST_PAGED_SEARCH_STATE.ordinal()][256];
/**
* Transition from initial state to PagedSearch sequence
@@ -78,11 +78,10 @@ public final class PagedResultsGrammar e
*
* Nothing to do
*/
- super.transitions[ PagedResultsStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
+ super.transitions[PagedResultsStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] =
new GrammarTransition<PagedResultsContainer>( PagedResultsStates.START_STATE,
- PagedResultsStates.PAGED_SEARCH_SEQUENCE_STATE,
- UniversalTag.SEQUENCE.getValue(), null );
-
+ PagedResultsStates.PAGED_SEARCH_SEQUENCE_STATE,
+ UniversalTag.SEQUENCE.getValue(), null );
/**
* Transition from PagedSearch sequence to size
@@ -93,43 +92,43 @@ public final class PagedResultsGrammar e
*
* Stores the size value
*/
- super.transitions[ PagedResultsStates.PAGED_SEARCH_SEQUENCE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[PagedResultsStates.PAGED_SEARCH_SEQUENCE_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
new GrammarTransition<PagedResultsContainer>( PagedResultsStates.PAGED_SEARCH_SEQUENCE_STATE,
PagedResultsStates.SIZE_STATE,
UniversalTag.INTEGER.getValue(),
new GrammarAction<PagedResultsContainer>( "Set PagedSearchControl size" )
- {
- public void action( PagedResultsContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- try
+ public void action( PagedResultsContainer container ) throws DecoderException
{
- // Check that the value is into the allowed interval
- int size = IntegerDecoder.parse( value, Integer.MIN_VALUE, Integer.MAX_VALUE );
-
- // We allow negative value to absorb a bug in some M$ client.
- // Those negative values will be transformed to Integer.MAX_VALUE.
- if ( size < 0 )
+ Value value = container.getCurrentTLV().getValue();
+
+ try
{
- size = Integer.MAX_VALUE;
+ // Check that the value is into the allowed interval
+ int size = IntegerDecoder.parse( value, Integer.MIN_VALUE, Integer.MAX_VALUE );
+
+ // We allow negative value to absorb a bug in some M$ client.
+ // Those negative values will be transformed to Integer.MAX_VALUE.
+ if ( size < 0 )
+ {
+ size = Integer.MAX_VALUE;
+ }
+
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "size = " + size );
+ }
+
+ container.getDecorator().setSize( size );
}
-
- if ( IS_DEBUG )
+ catch ( IntegerDecoderException e )
{
- LOG.debug( "size = " + size );
+ String msg = I18n.err( I18n.ERR_04050 );
+ LOG.error( msg, e );
+ throw new DecoderException( msg );
}
-
- container.getDecorator().setSize( size );
- }
- catch ( IntegerDecoderException e )
- {
- String msg = I18n.err( I18n.ERR_04050 );
- LOG.error( msg, e );
- throw new DecoderException( msg );
}
- }
- } );
+ } );
/**
* Transition from size to cookie
@@ -140,28 +139,28 @@ public final class PagedResultsGrammar e
*
* Stores the cookie flag
*/
- super.transitions[ PagedResultsStates.SIZE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] =
+ super.transitions[PagedResultsStates.SIZE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] =
new GrammarTransition<PagedResultsContainer>( PagedResultsStates.SIZE_STATE,
- PagedResultsStates.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
+ PagedResultsStates.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<PagedResultsContainer>( "Set PagedSearchControl cookie" )
- {
- public void action( PagedResultsContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- if ( container.getCurrentTLV().getLength() == 0 )
+ public void action( PagedResultsContainer container ) throws DecoderException
{
- container.getDecorator().setCookie( StringConstants.EMPTY_BYTES );
- }
- else
- {
- container.getDecorator().setCookie( value.getData() );
- }
+ Value value = container.getCurrentTLV().getValue();
- // We can have an END transition
- container.setGrammarEndAllowed( true );
- }
- } );
+ if ( container.getCurrentTLV().getLength() == 0 )
+ {
+ container.getDecorator().setCookie( StringConstants.EMPTY_BYTES );
+ }
+ else
+ {
+ container.getDecorator().setCookie( value.getData() );
+ }
+
+ // We can have an END transition
+ container.setGrammarEndAllowed( true );
+ }
+ } );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java Tue Jan 24 17:27:00 2012
@@ -49,14 +49,13 @@ public enum PagedResultsStates implement
/** Size Value */
SIZE_STATE,
-
+
/** Cookie Value */
COOKIE_STATE,
/** terminal state */
LAST_PAGED_SEARCH_STATE;
-
/**
* Get the grammar name
*
@@ -97,7 +96,7 @@ public enum PagedResultsStates implement
return ( ( state == END_STATE.ordinal() ) ? "PAGED_SEARCH_END_STATE" : name() );
}
-
+
/**
* {@inheritDoc}
*/
@@ -105,8 +104,8 @@ public enum PagedResultsStates implement
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java Tue Jan 24 17:27:00 2012
@@ -32,7 +32,7 @@ public class PersistentSearchContainer e
{
/** PSearchControl */
private PersistentSearchDecorator decorator;
-
+
private LdapApiService codec;
@@ -83,7 +83,6 @@ public class PersistentSearchContainer e
}
-
/**
* @return Returns the persistent search decorator.
*/
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java Tue Jan 24 17:27:00 2012
@@ -50,7 +50,7 @@ public class PersistentSearchDecorator e
/** An instance of this decoder */
private static final Asn1Decoder decoder = new Asn1Decoder();
-
+
/**
* Default constructor creates a PersistentSearch Control automatically
* wrapped in a decorator object inside this container.
@@ -121,11 +121,11 @@ public class PersistentSearchDecorator e
Value.encode( buffer, getChangeTypes() );
Value.encode( buffer, isChangesOnly() );
Value.encode( buffer, isReturnECs() );
-
+
return buffer;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -134,10 +134,10 @@ public class PersistentSearchDecorator e
if ( value == null )
{
try
- {
+ {
computeLength();
ByteBuffer buffer = ByteBuffer.allocate( valueLength );
-
+
// Now encode the PagedSearch specific part
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( psearchSeqLength ) );
@@ -153,12 +153,11 @@ public class PersistentSearchDecorator e
return null;
}
}
-
+
return value;
}
-
private PersistentSearch getPersistentSearch()
{
return ( PersistentSearch ) getDecorated();
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java Tue Jan 24 17:27:00 2012
@@ -34,14 +34,14 @@ import org.apache.directory.shared.ldap.
public class PersistentSearchFactory implements ControlFactory<PersistentSearch, PersistentSearchDecorator>
{
private LdapApiService codec;
-
-
+
+
public PersistentSearchFactory( LdapApiService codec )
{
this.codec = codec;
}
-
+
/**
* {@inheritDoc}
*/
@@ -50,7 +50,7 @@ public class PersistentSearchFactory imp
return PersistentSearch.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -59,7 +59,7 @@ public class PersistentSearchFactory imp
return new PersistentSearchDecorator( codec );
}
-
+
/**
* {@inheritDoc}
*/