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 01:09:13 UTC
svn commit: r1578675 - in /directory/shared/trunk/ldap:
codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/
codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/
codec/core/src/main/java/org/apache/director...
Author: elecharny
Date: Tue Mar 18 00:09:12 2014
New Revision: 1578675
URL: http://svn.apache.org/r1578675
Log:
o Some more generic removal
Modified:
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/InitExtendedRequest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestValue.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java
directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/InitExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/InitExtendedRequest.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/InitExtendedRequest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/InitExtendedRequest.java Tue Mar 18 00:09:12 2014
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class InitExtendedRequest extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?, ?>>>
+public class InitExtendedRequest extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?>>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( InitExtendedRequest.class );
@@ -54,7 +54,7 @@ public class InitExtendedRequest extends
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container ) throws DecoderException
+ public void action( LdapMessageContainer<ExtendedRequestDecorator<?>> container ) throws DecoderException
{
/*
* It is the responsibility of the LdapCodecService to instantiate new
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java Tue Mar 18 00:09:12 2014
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoreExtendedRequestName extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?, ?>>>
+public class StoreExtendedRequestName extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?>>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreExtendedRequestName.class );
@@ -64,7 +64,7 @@ public class StoreExtendedRequestName ex
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container ) throws DecoderException
+ public void action( LdapMessageContainer<ExtendedRequestDecorator<?>> container ) throws DecoderException
{
ExtendedRequest req;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestValue.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestValue.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedRequest/StoreExtendedRequestValue.java Tue Mar 18 00:09:12 2014
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoreExtendedRequestValue extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?, ?>>>
+public class StoreExtendedRequestValue extends GrammarAction<LdapMessageContainer<ExtendedRequestDecorator<?>>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreExtendedRequestValue.class );
@@ -60,10 +60,10 @@ public class StoreExtendedRequestValue e
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container ) throws DecoderException
+ public void action( LdapMessageContainer<ExtendedRequestDecorator<?>> container ) throws DecoderException
{
// We can allocate the ExtendedRequest Object
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
// Get the Value and store it in the ExtendedRequest
TLV tlv = container.getCurrentTLV();
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java Tue Mar 18 00:09:12 2014
@@ -32,7 +32,7 @@ import org.apache.directory.api.ldap.mod
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public interface ExtendedOperationFactory<Q extends ExtendedRequest, P extends ExtendedResponse>
+public interface ExtendedOperationFactory
{
/**
* Gets the OID of the extended requests this factory generates.
@@ -45,7 +45,7 @@ public interface ExtendedOperationFactor
/**
* @return A new instance of the {@link ExtendedRequestDecorator}.
*/
- Q newRequest();
+ ExtendedRequest newRequest();
/**
@@ -54,7 +54,7 @@ public interface ExtendedOperationFactor
* @param value the encoded value
* @return the decorator for the extended request type
*/
- Q newRequest( byte[] value );
+ ExtendedRequest newRequest( byte[] value );
/**
@@ -63,7 +63,7 @@ public interface ExtendedOperationFactor
* @param modelRequest the non decorated model request
* @return the decorated model request
*/
- ExtendedRequestDecorator<Q, P> decorate( ExtendedRequest modelRequest );
+ ExtendedRequest decorate( ExtendedRequest modelRequest );
/**
@@ -73,7 +73,7 @@ public interface ExtendedOperationFactor
* @param encodedValue The encoded value for the ExtendedResponse instance.
* @return The new ExtendedResponse.
*/
- P newResponse( byte[] encodedValue ) throws DecoderException;
+ ExtendedResponse newResponse( byte[] encodedValue ) throws DecoderException;
/**
@@ -83,5 +83,5 @@ public interface ExtendedOperationFactor
* @param decoratedMessage the message to be decorated.
* @return The decorated message
*/
- ExtendedResponseDecorator<P> decorate( ExtendedResponse decoratedMessage );
+ ExtendedResponse decorate( ExtendedResponse decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -29,7 +29,6 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.codec.decorators.SingleReplyRequestDecorator;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
-import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.util.Strings;
@@ -38,8 +37,8 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedRequestDecorator<Q extends ExtendedRequest, P extends ExtendedResponse>
- extends SingleReplyRequestDecorator<Q, P> implements ExtendedRequest
+public class ExtendedRequestDecorator<Q extends ExtendedRequest>
+ extends SingleReplyRequestDecorator<Q> implements ExtendedRequest
{
/** The extended request length */
private int extendedRequestLength;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java Tue Mar 18 00:09:12 2014
@@ -137,7 +137,7 @@ public interface LdapApiService
* @param factory The extended request factory
* @return The displaced factory if one existed for the oid
*/
- ExtendedOperationFactory<?, ?> registerExtendedRequest( ExtendedOperationFactory<?, ?> factory );
+ ExtendedOperationFactory registerExtendedRequest( ExtendedOperationFactory factory );
/**
@@ -147,7 +147,7 @@ public interface LdapApiService
* @param oid The extended request oid
* @return The displaced factory if one existed for the oid
*/
- ExtendedOperationFactory<?, ?> unregisterExtendedRequest( String oid );
+ ExtendedOperationFactory unregisterExtendedRequest( String oid );
/**
@@ -262,7 +262,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/api/ldap/codec/decorators/AbandonableRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -23,7 +23,6 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.model.message.AbandonListener;
import org.apache.directory.api.ldap.model.message.AbandonableRequest;
-import org.apache.directory.api.ldap.model.message.ResultResponse;
/**
@@ -31,8 +30,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbandonableRequestDecorator<M extends AbandonableResultResponseRequest<R>, R extends ResultResponse>
- extends ResultResponseRequestDecorator<M, R>
+public abstract class AbandonableRequestDecorator<M extends AbandonableResultResponseRequest>
+ extends ResultResponseRequestDecorator<M>
implements AbandonableRequest
{
/**
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequest.java Tue Mar 18 00:09:12 2014
@@ -20,7 +20,6 @@ package org.apache.directory.api.ldap.co
import org.apache.directory.api.ldap.model.message.AbandonableRequest;
-import org.apache.directory.api.ldap.model.message.ResultResponse;
import org.apache.directory.api.ldap.model.message.ResultResponseRequest;
@@ -29,7 +28,6 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface AbandonableResultResponseRequest<R extends ResultResponse> extends ResultResponseRequest,
- AbandonableRequest
+public interface AbandonableResultResponseRequest extends ResultResponseRequest, AbandonableRequest
{
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -30,8 +30,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbandonableResultResponseRequestDecorator<M extends AbandonableResultResponseRequest<R>, R extends ResultResponse>
- extends AbandonableRequestDecorator<M, R> implements ResultResponseRequest
+public abstract class AbandonableResultResponseRequestDecorator<M extends AbandonableResultResponseRequest>
+ extends AbandonableRequestDecorator<M> implements ResultResponseRequest
{
/**
* Makes Request a MessageDecorator.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -38,7 +38,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.AddRequest;
-import org.apache.directory.api.ldap.model.message.AddResponse;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
@@ -49,7 +48,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class AddRequestDecorator extends SingleReplyRequestDecorator<AddRequest, AddResponse> implements
+public final class AddRequestDecorator extends SingleReplyRequestDecorator<AddRequest> implements
AddRequest
{
/** The add request length */
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/BindRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -30,7 +30,6 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapConstants;
import org.apache.directory.api.ldap.model.message.BindRequest;
-import org.apache.directory.api.ldap.model.message.BindResponse;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
@@ -41,7 +40,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BindRequestDecorator extends SingleReplyRequestDecorator<BindRequest, BindResponse>
+public class BindRequestDecorator extends SingleReplyRequestDecorator<BindRequest>
implements BindRequest
{
/** The bind request length */
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -33,7 +33,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.message.CompareRequest;
-import org.apache.directory.api.ldap.model.message.CompareResponse;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
@@ -44,7 +43,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareRequestDecorator extends SingleReplyRequestDecorator<CompareRequest, CompareResponse>
+public class CompareRequestDecorator extends SingleReplyRequestDecorator<CompareRequest>
implements CompareRequest
{
/** The bytes of the attribute id used in the comparison */
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/DeleteRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -30,7 +30,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.LdapConstants;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.DeleteRequest;
-import org.apache.directory.api.ldap.model.message.DeleteResponse;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
@@ -40,7 +39,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DeleteRequestDecorator extends SingleReplyRequestDecorator<DeleteRequest, DeleteResponse>
+public class DeleteRequestDecorator extends SingleReplyRequestDecorator<DeleteRequest>
implements DeleteRequest
{
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyDnRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -31,7 +31,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.LdapConstants;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
-import org.apache.directory.api.ldap.model.message.ModifyDnResponse;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.util.Strings;
@@ -42,7 +41,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyDnRequestDecorator extends SingleReplyRequestDecorator<ModifyDnRequest, ModifyDnResponse>
+public class ModifyDnRequestDecorator extends SingleReplyRequestDecorator<ModifyDnRequest>
implements ModifyDnRequest
{
/** The modify Dn request length */
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -42,7 +42,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
-import org.apache.directory.api.ldap.model.message.ModifyResponse;
import org.apache.directory.api.ldap.model.name.Dn;
@@ -51,7 +50,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest, ModifyResponse>
+public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest>
implements ModifyRequest
{
/** The modify request length */
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ResultResponseRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -30,7 +30,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest, R extends ResultResponse>
+public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest>
extends RequestDecorator<M> implements ResultResponseRequest
{
/**
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SingleReplyRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -24,7 +24,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.model.message.AbandonListener;
import org.apache.directory.api.ldap.model.message.AbandonableRequest;
import org.apache.directory.api.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.api.ldap.model.message.ResultResponse;
import org.apache.directory.api.ldap.model.message.SingleReplyRequest;
@@ -33,8 +32,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest, R extends ResultResponse>
- extends ResultResponseRequestDecorator<M, R> implements SingleReplyRequest, AbandonableRequest
+public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest>
+ extends ResultResponseRequestDecorator<M> implements SingleReplyRequest, AbandonableRequest
{
/**
* Makes Request a MessageDecorator.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java Tue Mar 18 00:09:12 2014
@@ -82,7 +82,7 @@ public class DefaultLdapCodecService imp
protected Map<String, ControlFactory<? extends Control>> controlFactories = new HashMap<String, ControlFactory<? extends Control>>();
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory}'s by request OID */
- protected Map<String, ExtendedOperationFactory<?, ?>> extendedOperationsFactories = new HashMap<String, ExtendedOperationFactory<?, ?>>();
+ protected Map<String, ExtendedOperationFactory> extendedOperationsFactories = new HashMap<String, ExtendedOperationFactory>();
/** The registered ProtocolCodecFactory */
protected ProtocolCodecFactory protocolCodecFactory;
@@ -180,7 +180,7 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- public ExtendedOperationFactory<?, ?> registerExtendedRequest( ExtendedOperationFactory<?, ?> factory )
+ public ExtendedOperationFactory registerExtendedRequest( ExtendedOperationFactory factory )
{
return extendedOperationsFactories.put( factory.getOid(), factory );
}
@@ -303,7 +303,7 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- public ExtendedOperationFactory<?, ?> unregisterExtendedRequest( String oid )
+ public ExtendedOperationFactory unregisterExtendedRequest( String oid )
{
return extendedOperationsFactories.remove( oid );
}
@@ -332,8 +332,8 @@ public class DefaultLdapCodecService imp
*/
public ExtendedRequest fromJndi( javax.naming.ldap.ExtendedRequest jndiRequest ) throws DecoderException
{
- ExtendedRequestDecorator<?, ?> decorator =
- ( ExtendedRequestDecorator<?, ?> ) newExtendedRequest( jndiRequest.getID(), jndiRequest.getEncodedValue() );
+ ExtendedRequestDecorator<?> decorator =
+ ( ExtendedRequestDecorator<?> ) newExtendedRequest( jndiRequest.getID(), jndiRequest.getEncodedValue() );
return decorator;
}
@@ -348,15 +348,16 @@ public class DefaultLdapCodecService imp
if ( modelRequest instanceof ExtendedRequestDecorator )
{
- ExtendedRequestDecorator<?, ?> decorator = ( ExtendedRequestDecorator<?, ?> ) modelRequest;
+ ExtendedRequestDecorator<?> decorator = ( ExtendedRequestDecorator<?> ) modelRequest;
value = decorator.getRequestValue();
}
else
{
// have to ask the factory to decorate for us - can't do it ourselves
- ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( modelRequest
+ ExtendedOperationFactory extendedRequestFactory = extendedOperationsFactories.get( modelRequest
.getRequestName() );
- ExtendedRequestDecorator<?, ?> decorator = extendedRequestFactory.decorate( modelRequest );
+ ExtendedRequestDecorator<?> decorator = ( ExtendedRequestDecorator<?> ) extendedRequestFactory
+ .decorate( modelRequest );
value = decorator.getRequestValue();
}
@@ -380,7 +381,7 @@ public class DefaultLdapCodecService imp
public javax.naming.ldap.ExtendedResponse createExtendedResponse( String id, byte[] berValue, int offset,
int length ) throws NamingException
{
- ExtendedOperationFactory<?, ?> factory = extendedOperationsFactories
+ ExtendedOperationFactory factory = extendedOperationsFactories
.get( modelRequest.getRequestName() );
try
@@ -431,7 +432,7 @@ public class DefaultLdapCodecService imp
{
ExtendedResponseDecorator<ExtendedResponse> resp;
- ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( responseName );
+ ExtendedOperationFactory extendedRequestFactory = extendedOperationsFactories.get( responseName );
if ( extendedRequestFactory != null )
{
@@ -459,7 +460,7 @@ public class DefaultLdapCodecService imp
{
ExtendedRequest req = null;
- ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( oid );
+ ExtendedOperationFactory extendedRequestFactory = extendedOperationsFactories.get( oid );
if ( extendedRequestFactory != null )
{
@@ -467,8 +468,8 @@ public class DefaultLdapCodecService imp
}
else
{
- ExtendedRequestDecorator<ExtendedRequest, ExtendedResponse> decorator =
- new ExtendedRequestDecorator<ExtendedRequest, ExtendedResponse>( this,
+ ExtendedRequestDecorator<ExtendedRequest> decorator =
+ new ExtendedRequestDecorator<ExtendedRequest>( this,
new ExtendedRequestImpl() );
decorator.setRequestName( oid );
decorator.setRequestValue( value );
@@ -482,21 +483,20 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequestDecorator<?, ?> decorate( ExtendedRequest decoratedMessage )
+ public ExtendedRequestDecorator<?> decorate( ExtendedRequest decoratedMessage )
{
- ExtendedRequestDecorator<?, ?> req = null;
+ ExtendedRequestDecorator<?> req = null;
- ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
+ ExtendedOperationFactory extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
.getRequestName() );
if ( extendedRequestFactory != null )
{
- req = extendedRequestFactory.decorate( decoratedMessage );
+ req = ( ExtendedRequestDecorator<?> ) extendedRequestFactory.decorate( decoratedMessage );
}
else
{
- req = new ExtendedRequestDecorator<ExtendedRequest, ExtendedResponse>( this,
+ req = new ExtendedRequestDecorator<ExtendedRequest>( this,
decoratedMessage );
}
@@ -511,12 +511,12 @@ public class DefaultLdapCodecService imp
{
ExtendedResponseDecorator<?> resp = null;
- ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
+ ExtendedOperationFactory extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
.getResponseName() );
if ( extendedRequestFactory != null )
{
- resp = extendedRequestFactory.decorate( decoratedMessage );
+ resp = ( ExtendedResponseDecorator<?> ) extendedRequestFactory.decorate( decoratedMessage );
}
else
{
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedRequestTest.java Tue Mar 18 00:09:12 2014
@@ -27,9 +27,6 @@ import static org.junit.Assert.fail;
import java.nio.ByteBuffer;
import java.util.Map;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
@@ -42,6 +39,9 @@ import org.apache.directory.api.util.Str
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Test the ExtendedRequest codec
@@ -99,8 +99,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode the ExtendedRequest PDU
try
@@ -114,7 +114,7 @@ public class ExtendedRequestTest extends
}
// Check the decoded ExtendedRequest PDU
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
assertEquals( 1, extendedRequest.getMessageId() );
assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -217,8 +217,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode the ExtendedRequest PDU
try
@@ -232,7 +232,7 @@ public class ExtendedRequestTest extends
}
// Check the decoded ExtendedRequest PDU
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
assertEquals( 1, extendedRequest.getMessageId() );
assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -247,7 +247,7 @@ public class ExtendedRequestTest extends
@SuppressWarnings("unchecked")
CodecControl<Control> control = ( org.apache.directory.api.ldap.codec.api.CodecControl<Control> ) extendedRequest
.getControl( "2.16.840.1.113730.3.4.2" );
- assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) );
+ assertEquals( "", Strings.dumpBytes( control.getValue() ) );
// Check the encoding
try
@@ -340,8 +340,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode the ExtendedRequest PDU
try
@@ -355,7 +355,7 @@ public class ExtendedRequestTest extends
}
// Check the decoded ExtendedRequest PDU
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
assertEquals( 1, extendedRequest.getMessageId() );
assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -371,7 +371,7 @@ public class ExtendedRequestTest extends
@SuppressWarnings("unchecked")
CodecControl<Control> control = ( org.apache.directory.api.ldap.codec.api.CodecControl<Control> ) extendedRequest
.getControl( "2.16.840.1.113730.3.4.2" );
- assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) );
+ assertEquals( "", Strings.dumpBytes( control.getValue() ) );
// Check the encoding
try
@@ -416,8 +416,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode a ExtendedRequest PDU
try
@@ -456,8 +456,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode a ExtendedRequest PDU
try
@@ -510,8 +510,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode a ExtendedRequest PDU
try
@@ -565,8 +565,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode the ExtendedRequest PDU
try
@@ -580,7 +580,7 @@ public class ExtendedRequestTest extends
}
// Check the decoded ExtendedRequest PDU
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
assertEquals( 1, extendedRequest.getMessageId() );
assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -647,8 +647,8 @@ public class ExtendedRequestTest extends
stream.flip();
// Allocate a LdapMessage Container
- LdapMessageContainer<ExtendedRequestDecorator<?, ?>> container =
- new LdapMessageContainer<ExtendedRequestDecorator<?, ?>>( codec );
+ LdapMessageContainer<ExtendedRequestDecorator<?>> container =
+ new LdapMessageContainer<ExtendedRequestDecorator<?>>( codec );
// Decode the ExtendedRequest PDU
try
@@ -662,7 +662,7 @@ public class ExtendedRequestTest extends
}
// Check the decoded ExtendedRequest PDU
- ExtendedRequestDecorator<?, ?> extendedRequest = container.getMessage();
+ ExtendedRequestDecorator<?> extendedRequest = container.getMessage();
assertEquals( 1, extendedRequest.getMessageId() );
assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java Tue Mar 18 00:09:12 2014
@@ -131,30 +131,30 @@ public class CodecFactoryUtil
public static void loadStockExtendedOperations(
- Map<String, ExtendedOperationFactory<?, ?>> extendendOperationsFactories, LdapApiService apiService )
+ Map<String, ExtendedOperationFactory> extendendOperationsFactories, LdapApiService apiService )
{
- ExtendedOperationFactory<?, ?> factory = new CancelFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
-
- factory = new CertGenerationFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
-
- factory = new GracefulShutdownFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
-
- factory = new StoredProcedureFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
-
- factory = new GracefulDisconnectFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
-
- factory = new PasswordModifyFactory( apiService );
- extendendOperationsFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
+ CancelFactory cancelFactory = new CancelFactory( apiService );
+ extendendOperationsFactories.put( cancelFactory.getOid(), cancelFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", cancelFactory.getOid() );
+
+ CertGenerationFactory certGenerationFactory = new CertGenerationFactory( apiService );
+ extendendOperationsFactories.put( certGenerationFactory.getOid(), certGenerationFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", certGenerationFactory.getOid() );
+
+ GracefulShutdownFactory gracefulShutdownFactory = new GracefulShutdownFactory( apiService );
+ extendendOperationsFactories.put( gracefulShutdownFactory.getOid(), gracefulShutdownFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", gracefulShutdownFactory.getOid() );
+
+ StoredProcedureFactory storedProcedureFactory = new StoredProcedureFactory( apiService );
+ extendendOperationsFactories.put( storedProcedureFactory.getOid(), storedProcedureFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", storedProcedureFactory.getOid() );
+
+ GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( apiService );
+ extendendOperationsFactories.put( gracefulDisconnectFactory.getOid(), gracefulDisconnectFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", gracefulDisconnectFactory.getOid() );
+
+ PasswordModifyFactory passwordModifyFactory = new PasswordModifyFactory( apiService );
+ extendendOperationsFactories.put( passwordModifyFactory.getOid(), passwordModifyFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", passwordModifyFactory.getOid() );
}
}
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java Tue Mar 18 00:09:12 2014
@@ -28,8 +28,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.osgi.DefaultLdapCodecService;
-import org.apache.directory.api.ldap.model.message.ExtendedRequest;
-import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.util.Strings;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.slf4j.Logger;
@@ -334,12 +332,11 @@ public class StandaloneLdapApiService ex
// note, trimming whitespace doesn't hurt as it is a class name and
// helps DI containers that use xml config as xml ignores whitespace
@SuppressWarnings("unchecked")
- Class<? extends ExtendedOperationFactory<?, ?>> clazz = ( Class<? extends ExtendedOperationFactory<?, ?>> ) Class
+ Class<? extends ExtendedOperationFactory> clazz = ( Class<? extends ExtendedOperationFactory> ) Class
.forName( extendedOperationFQCN.trim() );
Constructor<?> constructor = clazz.getConstructor( types );
- @SuppressWarnings("unchecked")
- ExtendedOperationFactory<ExtendedRequest, ExtendedResponse> factory = ( ExtendedOperationFactory<ExtendedRequest, ExtendedResponse> ) constructor
+ ExtendedOperationFactory factory = ( ExtendedOperationFactory ) constructor
.newInstance( new Object[]
{ this } );
extendedOperationsFactories.put( factory.getOid(), factory );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java Tue Mar 18 00:09:12 2014
@@ -21,7 +21,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.ldap.codec.api.ControlFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
@@ -107,23 +106,23 @@ public class ExtrasBundleActivator imple
// Register Extended Request Factories
// --------------------------------------------------------------------
- ExtendedOperationFactory<?, ?> extReqfactory = new CancelFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ CancelFactory cancelFactory = new CancelFactory( codec );
+ codec.registerExtendedRequest( cancelFactory );
- extReqfactory = new CertGenerationFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ CertGenerationFactory certGenerationFactory = new CertGenerationFactory( codec );
+ codec.registerExtendedRequest( certGenerationFactory );
- extReqfactory = new GracefulShutdownFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ GracefulShutdownFactory gracefulShutdownFactory = new GracefulShutdownFactory( codec );
+ codec.registerExtendedRequest( gracefulShutdownFactory );
- extReqfactory = new StoredProcedureFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ StoredProcedureFactory storedProcedureFactory = new StoredProcedureFactory( codec );
+ codec.registerExtendedRequest( storedProcedureFactory );
- extReqfactory = new PasswordModifyFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ PasswordModifyFactory passwordModifyFactory = new PasswordModifyFactory( codec );
+ codec.registerExtendedRequest( passwordModifyFactory );
- extReqfactory = new GracefulDisconnectFactory( codec );
- codec.registerExtendedRequest( extReqfactory );
+ GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( codec );
+ codec.registerExtendedRequest( gracefulDisconnectFactory );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.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/CancelFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java Tue Mar 18 00:09:12 2014
@@ -22,8 +22,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest;
import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequestImpl;
@@ -39,7 +37,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CancelFactory implements ExtendedOperationFactory<CancelRequest, CancelResponse>
+public class CancelFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -86,6 +84,7 @@ public class CancelFactory implements Ex
{
CancelRequestDecorator req = new CancelRequestDecorator( codec, new CancelRequestImpl() );
req.setRequestValue( value );
+
return req;
}
@@ -93,7 +92,7 @@ public class CancelFactory implements Ex
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<CancelRequest, CancelResponse> decorate( ExtendedRequest modelRequest )
+ public CancelRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof CancelRequestDecorator )
{
@@ -107,7 +106,7 @@ public class CancelFactory implements Ex
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<CancelResponse> decorate( ExtendedResponse decoratedMessage )
+ public CancelResponseDecorator decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof CancelResponseDecorator )
{
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=1578675&r1=1578674&r2=1578675&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 00:09:12 2014
@@ -26,7 +26,6 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest;
-import org.apache.directory.api.ldap.extras.extended.cancel.CancelResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CancelRequestDecorator extends ExtendedRequestDecorator<CancelRequest, CancelResponse> implements
+public class CancelRequestDecorator extends ExtendedRequestDecorator<CancelRequest> implements
CancelRequest
{
private static final Logger LOG = LoggerFactory.getLogger( CancelRequestDecorator.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java Tue Mar 18 00:09:12 2014
@@ -22,8 +22,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.certGeneration.CertGenerationRequest;
import org.apache.directory.api.ldap.extras.extended.certGeneration.CertGenerationRequestImpl;
@@ -39,8 +37,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CertGenerationFactory
- implements ExtendedOperationFactory<CertGenerationRequest, CertGenerationResponse>
+public class CertGenerationFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -95,8 +92,7 @@ public class CertGenerationFactory
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<CertGenerationRequest, CertGenerationResponse> decorate(
- ExtendedRequest modelRequest )
+ public CertGenerationRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof CertGenerationRequestDecorator )
{
@@ -110,7 +106,7 @@ public class CertGenerationFactory
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<CertGenerationResponse> decorate( ExtendedResponse decoratedMessage )
+ public CertGenerationResponseDecorator decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof CertGenerationResponseDecorator )
{
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CertGenerationRequestDecorator
- extends ExtendedRequestDecorator<CertGenerationRequest, CertGenerationResponse>
+ extends ExtendedRequestDecorator<CertGenerationRequest>
implements CertGenerationRequest
{
private static final Logger LOG = LoggerFactory.getLogger( CertGenerationRequestDecorator.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java Tue Mar 18 00:09:12 2014
@@ -23,7 +23,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.gracefulDisconnect.GracefulDisconnectResponse;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
@@ -36,7 +35,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GracefulDisconnectFactory implements ExtendedOperationFactory<ExtendedRequest, GracefulDisconnectResponse>
+public class GracefulDisconnectFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -50,7 +49,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<ExtendedRequest, GracefulDisconnectResponse> decorate(
+ public ExtendedRequestDecorator<ExtendedRequest> decorate(
ExtendedRequest modelRequest )
{
// Nothing to do (there's no request associated to GracefulDisconnectResponse)
@@ -61,11 +60,11 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<GracefulDisconnectResponse> decorate( ExtendedResponse decoratedMessage )
+ public ExtendedResponse decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof GracefulDisconnectResponseDecorator )
{
- return ( GracefulDisconnectResponseDecorator ) decoratedMessage;
+ return decoratedMessage;
}
return new GracefulDisconnectResponseDecorator( codec, ( GracefulDisconnectResponse ) decoratedMessage );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java Tue Mar 18 00:09:12 2014
@@ -22,8 +22,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownRequest;
import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownRequestImpl;
@@ -39,8 +37,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GracefulShutdownFactory
- implements ExtendedOperationFactory<GracefulShutdownRequest, GracefulShutdownResponse>
+public class GracefulShutdownFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -96,12 +93,11 @@ public class GracefulShutdownFactory
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<GracefulShutdownRequest, GracefulShutdownResponse> decorate(
- ExtendedRequest modelRequest )
+ public ExtendedRequest decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof GracefulShutdownRequestDecorator )
{
- return ( GracefulShutdownRequestDecorator ) modelRequest;
+ return modelRequest;
}
return new GracefulShutdownRequestDecorator( codec, ( GracefulShutdownRequest ) modelRequest );
@@ -111,11 +107,11 @@ public class GracefulShutdownFactory
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<GracefulShutdownResponse> decorate( ExtendedResponse decoratedMessage )
+ public ExtendedResponse decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof GracefulShutdownResponseDecorator )
{
- return ( GracefulShutdownResponseDecorator ) decoratedMessage;
+ return decoratedMessage;
}
return new GracefulShutdownResponseDecorator( codec, ( GracefulShutdownResponse ) decoratedMessage );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -26,7 +26,6 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownRequest;
-import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GracefulShutdownRequestDecorator extends
- ExtendedRequestDecorator<GracefulShutdownRequest, GracefulShutdownResponse>
+ ExtendedRequestDecorator<GracefulShutdownRequest>
implements GracefulShutdownRequest
{
private static final Logger LOG = LoggerFactory.getLogger( GracefulShutdownRequestDecorator.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java Tue Mar 18 00:09:12 2014
@@ -27,7 +27,6 @@ import java.nio.ByteBuffer;
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -47,7 +46,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordModifyFactory implements ExtendedOperationFactory<PwdModifyRequest, PwdModifyResponse>
+public class PasswordModifyFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -107,7 +106,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<PwdModifyRequest, PwdModifyResponse> decorate( ExtendedRequest modelRequest )
+ public PasswordModifyRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof PasswordModifyRequestDecorator )
{
@@ -121,7 +120,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<PwdModifyResponse> decorate( ExtendedResponse decoratedResponse )
+ public PasswordModifyResponseDecorator decorate( ExtendedResponse decoratedResponse )
{
if ( decoratedResponse instanceof PasswordModifyResponseDecorator )
{
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -37,9 +37,8 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordModifyRequestDecorator
- extends ExtendedRequestDecorator<PwdModifyRequest, PwdModifyResponse>
- implements PwdModifyRequest
+public class PasswordModifyRequestDecorator extends ExtendedRequestDecorator<PwdModifyRequest> implements
+ PwdModifyRequest
{
private static final Logger LOG = LoggerFactory.getLogger( PasswordModifyRequestDecorator.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java Tue Mar 18 00:09:12 2014
@@ -22,8 +22,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequest;
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureResponse;
@@ -38,8 +36,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoredProcedureFactory implements
- ExtendedOperationFactory<StoredProcedureRequest, StoredProcedureResponse>
+public class StoredProcedureFactory implements ExtendedOperationFactory
{
private LdapApiService codec;
@@ -103,8 +100,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<StoredProcedureRequest, StoredProcedureResponse> decorate(
- ExtendedRequest modelRequest )
+ public StoredProcedureRequestDecorator decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof StoredProcedureRequestDecorator )
{
@@ -118,7 +114,7 @@ public class StoredProcedureFactory impl
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<StoredProcedureResponse> decorate( ExtendedResponse decoratedMessage )
+ public StoredProcedureResponseDecorator decorate( ExtendedResponse decoratedMessage )
{
if ( decoratedMessage instanceof StoredProcedureResponseDecorator )
{
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java?rev=1578675&r1=1578674&r2=1578675&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java Tue Mar 18 00:09:12 2014
@@ -35,7 +35,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureParameter;
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequest;
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequestImpl;
-import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureResponse;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoredProcedureRequestDecorator
- extends ExtendedRequestDecorator<StoredProcedureRequest, StoredProcedureResponse>
+public class StoredProcedureRequestDecorator extends ExtendedRequestDecorator<StoredProcedureRequest>
implements StoredProcedureRequest
{
private static final Logger LOG = LoggerFactory.getLogger( StoredProcedureRequestDecorator.class );