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 2011/02/02 23:49:31 UTC
svn commit: r1066673 - in
/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec:
./ controls/ controls/ppolicy/ controls/replication/syncDoneValue/
controls/replication/syncInfoValue/ controls/replication/syncRequestVa...
Author: elecharny
Date: Wed Feb 2 22:49:31 2011
New Revision: 1066673
URL: http://svn.apache.org/viewvc?rev=1066673&view=rev
Log:
o Removed the useless abstract methods from ControlDecorator
o Removed the useless @override annotations
Modified:
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java Wed Feb 2 22:49:31 2011
@@ -56,7 +56,9 @@ public class BasicControlDecorator exten
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
return null;
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java Wed Feb 2 22:49:31 2011
@@ -19,13 +19,7 @@
*/
package org.apache.directory.shared.ldap.codec.controls;
-
-import java.nio.ByteBuffer;
-
import org.apache.directory.shared.asn1.AbstractAsn1Object;
-import org.apache.directory.shared.asn1.Asn1Object;
-import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.ldap.codec.api.ICodecControl;
import org.apache.directory.shared.ldap.codec.api.ILdapCodecService;
import org.apache.directory.shared.ldap.model.message.Control;
@@ -39,8 +33,7 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @param <E>
*/
-public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object
- implements Control, ICodecControl<E>
+public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object implements ICodecControl<E>
{
/** The decorated Control */
private E decorated;
@@ -97,8 +90,6 @@ public abstract class ControlDecorator<E
// ------------------------------------------------------------------------
// Control Methods
// ------------------------------------------------------------------------
-
-
/**
* Get the OID
*
@@ -175,8 +166,6 @@ public abstract class ControlDecorator<E
// ------------------------------------------------------------------------
// CodecControl Methods
// ------------------------------------------------------------------------
-
-
/**
* {@inheritDoc}
*/
@@ -186,12 +175,6 @@ public abstract class ControlDecorator<E
}
- /**
- * {@inheritDoc}
- */
- public abstract ByteBuffer encode( ByteBuffer buffer ) throws EncoderException;
-
-
// ------------------------------------------------------------------------
// Object Method Overrides
// ------------------------------------------------------------------------
@@ -226,7 +209,4 @@ public abstract class ControlDecorator<E
{
return decorated.toString();
}
-
-
- public abstract Asn1Object decode( byte[] controlBytes ) throws DecoderException;
}
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyDecorator.java Wed Feb 2 22:49:31 2011
@@ -210,7 +210,9 @@ public class PasswordPolicyDecorator ext
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
if ( ! hasResponse() )
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueDecorator.java Wed Feb 2 22:49:31 2011
@@ -252,8 +252,10 @@ public class SyncDoneValueDecorator exte
}
- @Override
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException
+ /**
+ * {@inheritDoc}
+ */
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
SyncDoneValueContainer container = new SyncDoneValueContainer( getCodecService(), this );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java Wed Feb 2 22:49:31 2011
@@ -657,7 +657,9 @@ public class SyncInfoValueDecorator exte
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java Wed Feb 2 22:49:31 2011
@@ -285,7 +285,9 @@ public class SyncRequestValueDecorator
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java Wed Feb 2 22:49:31 2011
@@ -260,7 +260,10 @@ public class SyncStateValueDecorator ext
return sb.toString();
}
- @Override
+
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java Wed Feb 2 22:49:31 2011
@@ -406,7 +406,9 @@ public class SyncModifyDnDecorator exten
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java Wed Feb 2 22:49:31 2011
@@ -258,7 +258,9 @@ public class EntryChangeDecorator extend
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java Wed Feb 2 22:49:31 2011
@@ -282,7 +282,9 @@ public class PagedResultsDecorator exten
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java Wed Feb 2 22:49:31 2011
@@ -213,7 +213,9 @@ public class PersistentSearchDecorator e
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java?rev=1066673&r1=1066672&r2=1066673&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java Wed Feb 2 22:49:31 2011
@@ -136,7 +136,9 @@ public class SubentriesDecorator extends
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );