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 2014/03/18 18:49:28 UTC
svn commit: r1578983 - in
/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel:
Cancel.java CancelContainer.java CancelDecoder.java CancelGrammar.java
CancelRequestDecorator.java
Author: elecharny
Date: Tue Mar 18 17:49:28 2014
New Revision: 1578983
URL: http://svn.apache.org/r1578983
Log:
Removed the Cancel class, it's not useful
Removed:
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/Cancel.java
Modified:
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java?rev=1578983&r1=1578982&r2=1578983&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelContainer.java Tue Mar 18 17:49:28 2014
@@ -31,7 +31,7 @@ import org.apache.directory.api.asn1.ber
public class CancelContainer extends AbstractContainer
{
/** Cancel */
- private Cancel cancel;
+ private CancelRequestDecorator cancel;
/**
@@ -49,7 +49,7 @@ public class CancelContainer extends Abs
/**
* @return Returns the Cancel object.
*/
- public Cancel getCancel()
+ public CancelRequestDecorator getCancel()
{
return cancel;
}
@@ -61,7 +61,7 @@ public class CancelContainer extends Abs
*
* @param cancel the Cancel to set.
*/
- public void setCancel( Cancel cancel )
+ public void setCancel( CancelRequestDecorator cancel )
{
this.cancel = cancel;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java?rev=1578983&r1=1578982&r2=1578983&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelDecoder.java Tue Mar 18 17:49:28 2014
@@ -22,9 +22,9 @@ package org.apache.directory.api.ldap.ex
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
+import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest;
/**
@@ -46,12 +46,12 @@ public class CancelDecoder extends Asn1D
* @return An Cancel object
* @throws DecoderException If the decoding failed
*/
- public Asn1Object decode( byte[] stream ) throws DecoderException
+ public CancelRequest decode( byte[] stream ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( stream );
CancelContainer container = new CancelContainer();
decoder.decode( bb, container );
- Cancel cancel = container.getCancel();
+ CancelRequest cancel = container.getCancel();
// Clean the container for the next decoding
container.clean();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java?rev=1578983&r1=1578982&r2=1578983&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelGrammar.java Tue Mar 18 17:49:28 2014
@@ -30,6 +30,8 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequestImpl;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,7 +89,10 @@ public final class CancelGrammar extends
{
public void action( CancelContainer cancelContainer )
{
- Cancel cancel = new Cancel();
+ CancelRequestDecorator cancel = new CancelRequestDecorator(
+ LdapApiServiceFactory.getSingleton(),
+ new CancelRequestImpl() );
+
cancelContainer.setCancel( cancel );
}
} );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java?rev=1578983&r1=1578982&r2=1578983&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java Tue Mar 18 17:49:28 2014
@@ -60,12 +60,18 @@ public class CancelRequestDecorator exte
}
+ /**
+ * {@inheritDoc}
+ */
public int getCancelId()
{
return cancelRequest.getCancelId();
}
+ /**
+ * {@inheritDoc}
+ */
public void setCancelId( int cancelId )
{
if ( cancelId == cancelRequest.getCancelId() )
@@ -81,7 +87,6 @@ public class CancelRequestDecorator exte
/**
* {@inheritDoc}
*/
- @Override
public byte[] getRequestValue()
{
if ( requestValue == null )
@@ -113,7 +118,7 @@ public class CancelRequestDecorator exte
try
{
- Cancel cancel = ( Cancel ) decoder.decode( requestValue );
+ CancelRequest cancel = decoder.decode( requestValue );
if ( requestValue != null )
{