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/17 21:21:59 UTC
svn commit: r1578548 [2/2] - in /directory:
apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/
apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/
apacheds/trunk/protocol-ldap/src/main/java/org/ap...
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java Mon Mar 17 20:21:57 2014
@@ -35,7 +35,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface PwdModifyRequest extends ExtendedRequest<PwdModifyResponse>
+public interface PwdModifyRequest extends ExtendedRequest
{
/** The OID for the pwdModify extended operation request. */
String EXTENSION_OID = "1.3.6.1.4.1.4203.1.11.1";
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -36,7 +36,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PwdModifyRequestImpl extends AbstractExtendedRequest<PwdModifyResponse> implements PwdModifyRequest
+public class PwdModifyRequestImpl extends AbstractExtendedRequest implements PwdModifyRequest
{
/** The user identity */
private byte[] userIdentity;
@@ -134,7 +134,7 @@ public class PwdModifyRequestImpl extend
response = new PwdModifyResponseImpl( getMessageId() );
}
- return response;
+ return ( PwdModifyResponse ) response;
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java Mon Mar 17 20:21:57 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 interface StoredProcedureRequest extends ExtendedRequest<StoredProcedureResponse>
+public interface StoredProcedureRequest extends ExtendedRequest
{
/** The OID for the stored procedure extended operation request. */
static final String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.6";
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -38,8 +38,7 @@ import org.apache.directory.api.util.exc
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoredProcedureRequestImpl extends AbstractExtendedRequest<StoredProcedureResponse> implements
- StoredProcedureRequest
+public class StoredProcedureRequestImpl extends AbstractExtendedRequest implements StoredProcedureRequest
{
private String language = "Java";
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -21,8 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
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;
@@ -93,7 +93,7 @@ public class CancelFactory implements Ex
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<CancelRequest, CancelResponse> decorate( ExtendedRequest<?> modelRequest )
+ public ExtendedRequestDecorator<CancelRequest, CancelResponse> decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof CancelRequestDecorator )
{
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -21,8 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
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;
@@ -96,7 +96,7 @@ public class CertGenerationFactory
* {@inheritDoc}
*/
public ExtendedRequestDecorator<CertGenerationRequest, CertGenerationResponse> decorate(
- ExtendedRequest<?> modelRequest )
+ ExtendedRequest modelRequest )
{
if ( modelRequest instanceof CertGenerationRequestDecorator )
{
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -124,7 +124,7 @@ public class CertGenerationRequestDecora
@Override
public CertGenerationResponse getResultResponse()
{
- return getDecorated().getResultResponse();
+ return ( CertGenerationResponse ) getDecorated().getResultResponse();
}
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -21,8 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
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;
@@ -36,8 +36,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>, GracefulDisconnectResponse>
+public class GracefulDisconnectFactory implements ExtendedOperationFactory<ExtendedRequest, GracefulDisconnectResponse>
{
private LdapApiService codec;
@@ -51,8 +50,8 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<ExtendedRequest<GracefulDisconnectResponse>, GracefulDisconnectResponse> decorate(
- ExtendedRequest<?> modelRequest )
+ public ExtendedRequestDecorator<ExtendedRequest, GracefulDisconnectResponse> decorate(
+ ExtendedRequest modelRequest )
{
// Nothing to do (there's no request associated to GracefulDisconnectResponse)
return null;
@@ -85,7 +84,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public ExtendedRequest<GracefulDisconnectResponse> newRequest()
+ public ExtendedRequest newRequest()
{
// Nothing to do (there's no request associated to GracefulDisconnectResponse)
return null;
@@ -95,7 +94,7 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public ExtendedRequest<GracefulDisconnectResponse> newRequest( byte[] value )
+ public ExtendedRequest newRequest( byte[] value )
{
// Nothing to do (there's no request associated to GracefulDisconnectResponse)
return null;
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -21,8 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
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;
@@ -97,7 +97,7 @@ public class GracefulShutdownFactory
* {@inheritDoc}
*/
public ExtendedRequestDecorator<GracefulShutdownRequest, GracefulShutdownResponse> decorate(
- ExtendedRequest<?> modelRequest )
+ ExtendedRequest modelRequest )
{
if ( modelRequest instanceof GracefulShutdownRequestDecorator )
{
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -107,7 +107,7 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
- public ExtendedRequestDecorator<PwdModifyRequest, PwdModifyResponse> decorate( ExtendedRequest<?> modelRequest )
+ public ExtendedRequestDecorator<PwdModifyRequest, PwdModifyResponse> decorate( ExtendedRequest modelRequest )
{
if ( modelRequest instanceof PasswordModifyRequestDecorator )
{
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -140,7 +140,7 @@ public class PasswordModifyRequestDecora
@Override
public PwdModifyResponse getResultResponse()
{
- return getDecorated().getResultResponse();
+ return ( PwdModifyResponse ) getDecorated().getResultResponse();
}
@@ -149,7 +149,7 @@ public class PasswordModifyRequestDecora
*/
public byte[] getUserIdentity()
{
- return ( ( PwdModifyRequestImpl ) getDecorated() ).getUserIdentity();
+ return getDecorated().getUserIdentity();
}
@@ -158,7 +158,7 @@ public class PasswordModifyRequestDecora
*/
public void setUserIdentity( byte[] userIdentity )
{
- ( ( PwdModifyRequestImpl ) getDecorated() ).setUserIdentity( userIdentity );
+ getDecorated().setUserIdentity( userIdentity );
}
@@ -167,7 +167,7 @@ public class PasswordModifyRequestDecora
*/
public byte[] getOldPassword()
{
- return ( ( PwdModifyRequestImpl ) getDecorated() ).getOldPassword();
+ return getDecorated().getOldPassword();
}
@@ -176,7 +176,7 @@ public class PasswordModifyRequestDecora
*/
public void setOldPassword( byte[] oldPassword )
{
- ( ( PwdModifyRequestImpl ) getDecorated() ).setOldPassword( oldPassword );
+ getDecorated().setOldPassword( oldPassword );
}
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=1578548&r1=1578547&r2=1578548&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 Mon Mar 17 20:21:57 2014
@@ -21,8 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
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;
@@ -38,7 +38,8 @@ 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<StoredProcedureRequest, StoredProcedureResponse>
{
private LdapApiService codec;
@@ -103,7 +104,7 @@ public class StoredProcedureFactory impl
* {@inheritDoc}
*/
public ExtendedRequestDecorator<StoredProcedureRequest, StoredProcedureResponse> decorate(
- ExtendedRequest<?> modelRequest )
+ ExtendedRequest modelRequest )
{
if ( modelRequest instanceof StoredProcedureRequestDecorator )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java Mon Mar 17 20:21:57 2014
@@ -25,8 +25,7 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractExtendedRequest<R extends ExtendedResponse> extends AbstractRequest implements
- ExtendedRequest<R>
+public abstract class AbstractExtendedRequest extends AbstractRequest implements ExtendedRequest
{
static final long serialVersionUID = 7916990159044177480L;
@@ -34,7 +33,7 @@ public abstract class AbstractExtendedRe
private String oid;
/** The associated response */
- protected R response;
+ protected ExtendedResponse response;
/**
@@ -43,7 +42,7 @@ public abstract class AbstractExtendedRe
*/
public AbstractExtendedRequest()
{
- super( -1, TYPE, true );
+ super( -1, MessageTypeEnum.EXTENDED_REQUEST, true );
}
@@ -55,7 +54,7 @@ public abstract class AbstractExtendedRe
*/
public AbstractExtendedRequest( final int id )
{
- super( id, TYPE, true );
+ super( id, MessageTypeEnum.EXTENDED_REQUEST, true );
}
@@ -80,7 +79,7 @@ public abstract class AbstractExtendedRe
*
* @param newOid the dotted-decimal representation as a String of the OID
*/
- public ExtendedRequest<R> setRequestName( String newOid )
+ public ExtendedRequest setRequestName( String newOid )
{
this.oid = newOid;
@@ -91,7 +90,7 @@ public abstract class AbstractExtendedRe
/**
* {@inheritDoc}
*/
- public ExtendedRequest<R> setMessageId( int messageId )
+ public ExtendedRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -102,30 +101,27 @@ public abstract class AbstractExtendedRe
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<R> addControl( Control control )
+ public ExtendedRequest addControl( Control control )
{
- return ( ExtendedRequest<R> ) super.addControl( control );
+ return ( ExtendedRequest ) super.addControl( control );
}
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<R> addAllControls( Control[] controls )
+ public ExtendedRequest addAllControls( Control[] controls )
{
- return ( ExtendedRequest<R> ) super.addAllControls( controls );
+ return ( ExtendedRequest ) super.addAllControls( controls );
}
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<R> removeControl( Control control )
+ public ExtendedRequest removeControl( Control control )
{
- return ( ExtendedRequest<R> ) super.removeControl( control );
+ return ( ExtendedRequest ) super.removeControl( control );
}
@@ -141,7 +137,7 @@ public abstract class AbstractExtendedRe
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.EXTENDED_RESPONSE;
}
@@ -150,7 +146,7 @@ public abstract class AbstractExtendedRe
*
* @return the result containing response for this request
*/
- public abstract R getResultResponse();
+ public abstract ExtendedResponse getResultResponse();
/**
@@ -193,7 +189,7 @@ public abstract class AbstractExtendedRe
return false;
}
- ExtendedRequest<?> req = ( ExtendedRequest<?> ) obj;
+ ExtendedRequest req = ( ExtendedRequest ) obj;
if ( ( oid != null ) && ( req.getRequestName() == null ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequest.java Mon Mar 17 20:21:57 2014
@@ -30,15 +30,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface AddRequest extends SingleReplyRequest<AddResponse>, AbandonableRequest
+public interface AddRequest extends SingleReplyRequest, AbandonableRequest
{
- /** LDAPv3 add request type enum code */
- MessageTypeEnum TYPE = MessageTypeEnum.ADD_REQUEST;
-
- /** LDAPv3 add response type enum code */
- MessageTypeEnum RESP_TYPE = AddResponse.TYPE;
-
-
/**
* Gets the distinguished name of the entry to add.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -56,7 +56,7 @@ public class AddRequestImpl extends Abst
*/
public AddRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.ADD_REQUEST );
entry = new DefaultEntry();
}
@@ -219,7 +219,7 @@ public class AddRequestImpl extends Abst
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.ADD_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponse.java Mon Mar 17 20:21:57 2014
@@ -29,6 +29,4 @@ package org.apache.directory.api.ldap.mo
*/
public interface AddResponse extends ResultResponse
{
- /** Add response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.ADD_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -35,7 +35,7 @@ public class AddResponseImpl extends Abs
*/
public AddResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.ADD_RESPONSE );
}
@@ -46,7 +46,7 @@ public class AddResponseImpl extends Abs
*/
public AddResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.ADD_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequest.java Mon Mar 17 20:21:57 2014
@@ -29,15 +29,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface BindRequest extends SingleReplyRequest<BindResponse>, AbandonableRequest
+public interface BindRequest extends SingleReplyRequest, AbandonableRequest
{
- /** Bind request message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.BIND_REQUEST;
-
- /** Bind response message type enumeration value */
- MessageTypeEnum RESP_TYPE = BindResponse.TYPE;
-
-
/**
* Checks to see if the authentication mechanism is simple and not SASL
* based.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -81,7 +81,7 @@ public class BindRequestImpl extends Abs
*/
public BindRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.BIND_REQUEST );
hCredentials = 0;
}
@@ -322,7 +322,7 @@ public class BindRequestImpl extends Abs
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.BIND_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponse.java Mon Mar 17 20:21:57 2014
@@ -30,8 +30,7 @@ package org.apache.directory.api.ldap.mo
public interface BindResponse extends ResultResponse
{
/** Bind response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.BIND_RESPONSE;
-
+ //MessageTypeEnum TYPE = MessageTypeEnum.BIND_RESPONSE;
/**
* Gets the optional property holding SASL authentication response parameters
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -46,7 +46,7 @@ public class BindResponseImpl extends Ab
*/
public BindResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.BIND_RESPONSE );
}
@@ -57,7 +57,7 @@ public class BindResponseImpl extends Ab
*/
public BindResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.BIND_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java Mon Mar 17 20:21:57 2014
@@ -30,15 +30,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface CompareRequest extends SingleReplyRequest<CompareResponse>, AbandonableRequest
+public interface CompareRequest extends SingleReplyRequest, AbandonableRequest
{
- /** Compare request message type enum code */
- MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_REQUEST;
-
- /** Compare response message type enum code */
- MessageTypeEnum RESP_TYPE = CompareResponse.TYPE;
-
-
/**
* Gets the distinguished name of the entry to be compared using the
* attribute value assertion.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -58,7 +58,7 @@ public class CompareRequestImpl extends
*/
public CompareRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.COMPARE_REQUEST );
}
@@ -201,7 +201,7 @@ public class CompareRequestImpl extends
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.COMPARE_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponse.java Mon Mar 17 20:21:57 2014
@@ -28,10 +28,6 @@ package org.apache.directory.api.ldap.mo
*/
public interface CompareResponse extends ResultResponse
{
- /** Compare response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_RESPONSE;
-
-
/**
* @return True if the compared response is a success
* @return
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -35,7 +35,7 @@ public class CompareResponseImpl extends
*/
public CompareResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.COMPARE_RESPONSE );
}
@@ -46,7 +46,7 @@ public class CompareResponseImpl extends
*/
public CompareResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.COMPARE_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequest.java Mon Mar 17 20:21:57 2014
@@ -29,15 +29,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DeleteRequest extends SingleReplyRequest<DeleteResponse>, AbandonableRequest
+public interface DeleteRequest extends SingleReplyRequest, AbandonableRequest
{
- /** Delete request message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.DEL_REQUEST;
-
- /** Delete response message type enumeration value */
- MessageTypeEnum RESP_TYPE = DeleteResponse.TYPE;
-
-
/**
* Gets the distinguished name of the leaf entry to be deleted by this
* request.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -48,7 +48,7 @@ public class DeleteRequestImpl extends A
*/
public DeleteRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.DEL_REQUEST );
}
@@ -129,7 +129,7 @@ public class DeleteRequestImpl extends A
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.DEL_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponse.java Mon Mar 17 20:21:57 2014
@@ -28,6 +28,4 @@ package org.apache.directory.api.ldap.mo
*/
public interface DeleteResponse extends ResultResponse
{
- /** Delete response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.DEL_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/DeleteResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -35,7 +35,7 @@ public class DeleteResponseImpl extends
*/
public DeleteResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.DEL_RESPONSE );
}
@@ -46,7 +46,7 @@ public class DeleteResponseImpl extends
*/
public DeleteResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.DEL_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequest.java Mon Mar 17 20:21:57 2014
@@ -52,15 +52,8 @@ package org.apache.directory.api.ldap.mo
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*
*/
-public interface ExtendedRequest<R extends ExtendedResponse> extends SingleReplyRequest<R>
+public interface ExtendedRequest extends SingleReplyRequest
{
- /** Extended request message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_REQUEST;
-
- /** Extended response message type enumeration value */
- MessageTypeEnum RESP_TYPE = ExtendedResponse.TYPE;
-
-
/**
* Gets the Object Identifier corresponding to the extended request type.
* This is the <b>requestName</b> portion of the ExtendedRequst PDU.
@@ -76,29 +69,29 @@ public interface ExtendedRequest<R exten
* @param oid the dotted-decimal representation as a String of the OID
* @return The ExtendedRequest instance
*/
- ExtendedRequest<R> setRequestName( String oid );
+ ExtendedRequest setRequestName( String oid );
/**
* {@inheritDoc}
*/
- ExtendedRequest<R> setMessageId( int messageId );
+ ExtendedRequest setMessageId( int messageId );
/**
* {@inheritDoc}
*/
- ExtendedRequest<R> addControl( Control control );
+ ExtendedRequest addControl( Control control );
/**
* {@inheritDoc}
*/
- ExtendedRequest<R> addAllControls( Control[] controls );
+ ExtendedRequest addAllControls( Control[] controls );
/**
* {@inheritDoc}
*/
- ExtendedRequest<R> removeControl( Control control );
+ ExtendedRequest removeControl( Control control );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -25,7 +25,7 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest<ExtendedResponse>
+public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest
{
static final long serialVersionUID = 7916990159044177480L;
@@ -42,7 +42,7 @@ public class ExtendedRequestImpl extends
*/
public ExtendedRequestImpl()
{
- super( -1, TYPE, true );
+ super( -1, MessageTypeEnum.EXTENDED_REQUEST, true );
}
@@ -67,7 +67,7 @@ public class ExtendedRequestImpl extends
*
* @param newOid the dotted-decimal representation as a String of the OID
*/
- public ExtendedRequest<ExtendedResponse> setRequestName( String newOid )
+ public ExtendedRequest setRequestName( String newOid )
{
this.oid = newOid;
@@ -78,7 +78,7 @@ public class ExtendedRequestImpl extends
/**
* {@inheritDoc}
*/
- public ExtendedRequest<ExtendedResponse> setMessageId( int messageId )
+ public ExtendedRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
@@ -89,30 +89,27 @@ public class ExtendedRequestImpl extends
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<ExtendedResponse> addControl( Control control )
+ public ExtendedRequest addControl( Control control )
{
- return ( ExtendedRequest<ExtendedResponse> ) super.addControl( control );
+ return ( ExtendedRequest ) super.addControl( control );
}
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<ExtendedResponse> addAllControls( Control[] controls )
+ public ExtendedRequest addAllControls( Control[] controls )
{
- return ( ExtendedRequest<ExtendedResponse> ) super.addAllControls( controls );
+ return ( ExtendedRequest ) super.addAllControls( controls );
}
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public ExtendedRequest<ExtendedResponse> removeControl( Control control )
+ public ExtendedRequest removeControl( Control control )
{
- return ( ExtendedRequest<ExtendedResponse> ) super.removeControl( control );
+ return ( ExtendedRequest ) super.removeControl( control );
}
@@ -128,7 +125,7 @@ public class ExtendedRequestImpl extends
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.EXTENDED_RESPONSE;
}
@@ -197,7 +194,7 @@ public class ExtendedRequestImpl extends
return false;
}
- ExtendedRequest<?> req = ( ExtendedRequest<?> ) obj;
+ ExtendedRequest req = ( ExtendedRequest ) obj;
if ( ( oid != null ) && ( req.getRequestName() == null ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ManyReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ManyReplyRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ManyReplyRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ManyReplyRequest.java Mon Mar 17 20:21:57 2014
@@ -26,7 +26,7 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public interface ManyReplyRequest<R extends ResultResponse> extends ResultResponseRequest<R>
+public interface ManyReplyRequest extends ResultResponseRequest
{
/**
* Gets the various types of messages that can be generated by this kind of
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequest.java Mon Mar 17 20:21:57 2014
@@ -65,15 +65,8 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface ModifyDnRequest extends SingleReplyRequest<ModifyDnResponse>, AbandonableRequest
+public interface ModifyDnRequest extends SingleReplyRequest, AbandonableRequest
{
- /** Modify Dn request message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_REQUEST;
-
- /** Modify Dn response message type enumeration value */
- MessageTypeEnum RESP_TYPE = ModifyDnResponse.TYPE;
-
-
/**
* Gets the entry's distinguished name representing the <b>entry</b> PDU
* field.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -58,7 +58,7 @@ public class ModifyDnRequestImpl extends
*/
public ModifyDnRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.MODIFYDN_REQUEST );
}
@@ -205,7 +205,7 @@ public class ModifyDnRequestImpl extends
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.MODIFYDN_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponse.java Mon Mar 17 20:21:57 2014
@@ -28,6 +28,4 @@ package org.apache.directory.api.ldap.mo
*/
public interface ModifyDnResponse extends ResultResponse
{
- /** Modify Dn response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_RESPONSE;
-}
+}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyDnResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -35,7 +35,7 @@ public class ModifyDnResponseImpl extend
*/
public ModifyDnResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.MODIFYDN_RESPONSE );
}
@@ -46,7 +46,7 @@ public class ModifyDnResponseImpl extend
*/
public ModifyDnResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.MODIFYDN_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequest.java Mon Mar 17 20:21:57 2014
@@ -96,15 +96,8 @@ import org.apache.directory.api.ldap.mod
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*
*/
-public interface ModifyRequest extends SingleReplyRequest<ModifyResponse>, AbandonableRequest
+public interface ModifyRequest extends SingleReplyRequest, AbandonableRequest
{
- /** Modify request message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_REQUEST;
-
- /** Modify response message type enumeration value */
- MessageTypeEnum RESP_TYPE = ModifyResponse.TYPE;
-
-
/**
* Gets the distinguished name of the entry to be modified by this request.
* This property represents the PDU's <b>object</b> field.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -63,7 +63,7 @@ public class ModifyRequestImpl extends A
*/
public ModifyRequestImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.MODIFY_REQUEST );
}
@@ -306,7 +306,7 @@ public class ModifyRequestImpl extends A
*/
public MessageTypeEnum getResponseType()
{
- return RESP_TYPE;
+ return MessageTypeEnum.MODIFY_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponse.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponse.java Mon Mar 17 20:21:57 2014
@@ -27,6 +27,4 @@ package org.apache.directory.api.ldap.mo
*/
public interface ModifyResponse extends ResultResponse
{
- /** Modify response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_RESPONSE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ModifyResponseImpl.java Mon Mar 17 20:21:57 2014
@@ -34,7 +34,7 @@ public class ModifyResponseImpl extends
*/
public ModifyResponseImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.MODIFY_RESPONSE );
}
@@ -45,7 +45,7 @@ public class ModifyResponseImpl extends
*/
public ModifyResponseImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.MODIFY_RESPONSE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultResponseRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultResponseRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultResponseRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ResultResponseRequest.java Mon Mar 17 20:21:57 2014
@@ -25,14 +25,14 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface ResultResponseRequest<R extends ResultResponse> extends Request
+public interface ResultResponseRequest extends Request
{
/**
- * If called for the first time, this methohd creates a result containing
+ * If called for the first time, this method creates a result containing
* response object for this request.
*
* @return a result containing response with defaults and the messageId set
* in response to this specific request
*/
- R getResultResponse();
+ ResultResponse getResultResponse();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequest.java Mon Mar 17 20:21:57 2014
@@ -32,7 +32,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public interface SearchRequest extends ManyReplyRequest<SearchResultDone>, AbandonableRequest
+public interface SearchRequest extends ManyReplyRequest, AbandonableRequest
{
/**
* Different response types that a search request may return. A search
@@ -44,7 +44,12 @@ public interface SearchRequest extends M
* @see #getResponseTypes()
*/
MessageTypeEnum[] RESPONSE_TYPES =
- { SearchResultDone.TYPE, SearchResultEntry.TYPE, SearchResultReference.TYPE, ExtendedResponse.TYPE };
+ {
+ MessageTypeEnum.SEARCH_RESULT_DONE,
+ MessageTypeEnum.SEARCH_RESULT_ENTRY,
+ MessageTypeEnum.SEARCH_RESULT_REFERENCE,
+ MessageTypeEnum.EXTENDED_RESPONSE
+ };
/**
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDone.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDone.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDone.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDone.java Mon Mar 17 20:21:57 2014
@@ -29,6 +29,4 @@ package org.apache.directory.api.ldap.mo
*/
public interface SearchResultDone extends ResultResponse
{
- /** Search done response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_DONE;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultDoneImpl.java Mon Mar 17 20:21:57 2014
@@ -36,7 +36,7 @@ public class SearchResultDoneImpl extend
*/
public SearchResultDoneImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.SEARCH_RESULT_DONE );
}
@@ -48,7 +48,7 @@ public class SearchResultDoneImpl extend
*/
public SearchResultDoneImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.SEARCH_RESULT_DONE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntry.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntry.java Mon Mar 17 20:21:57 2014
@@ -33,10 +33,6 @@ import org.apache.directory.api.ldap.mod
*/
public interface SearchResultEntry extends Response
{
- /** Search entry response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_ENTRY;
-
-
/**
* Gets the distinguished name of the entry object returned.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultEntryImpl.java Mon Mar 17 20:21:57 2014
@@ -44,7 +44,7 @@ public class SearchResultEntryImpl exten
*/
public SearchResultEntryImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.SEARCH_RESULT_ENTRY );
}
@@ -56,7 +56,7 @@ public class SearchResultEntryImpl exten
*/
public SearchResultEntryImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.SEARCH_RESULT_ENTRY );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReference.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReference.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReference.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReference.java Mon Mar 17 20:21:57 2014
@@ -29,10 +29,6 @@ package org.apache.directory.api.ldap.mo
*/
public interface SearchResultReference extends Response
{
- /** Search reference response message type enumeration value */
- MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_REFERENCE;
-
-
/**
* Gets the sequence of LdapUrls as a Referral instance.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReferenceImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReferenceImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReferenceImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchResultReferenceImpl.java Mon Mar 17 20:21:57 2014
@@ -39,7 +39,7 @@ public class SearchResultReferenceImpl e
*/
public SearchResultReferenceImpl()
{
- super( -1, TYPE );
+ super( -1, MessageTypeEnum.SEARCH_RESULT_REFERENCE );
}
@@ -51,7 +51,7 @@ public class SearchResultReferenceImpl e
*/
public SearchResultReferenceImpl( final int id )
{
- super( id, TYPE );
+ super( id, MessageTypeEnum.SEARCH_RESULT_REFERENCE );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SingleReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SingleReplyRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SingleReplyRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SingleReplyRequest.java Mon Mar 17 20:21:57 2014
@@ -25,7 +25,7 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface SingleReplyRequest<R extends ResultResponse> extends ResultResponseRequest<R>
+public interface SingleReplyRequest extends ResultResponseRequest
{
/**
* Gets the protocol response message type for this request which produces
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequest.java Mon Mar 17 20:21:57 2014
@@ -27,10 +27,6 @@ package org.apache.directory.api.ldap.mo
*/
public interface UnbindRequest extends Request
{
- /** Unbind request protocol message type */
- MessageTypeEnum TYPE = MessageTypeEnum.UNBIND_REQUEST;
-
-
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequestImpl.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/UnbindRequestImpl.java Mon Mar 17 20:21:57 2014
@@ -42,7 +42,7 @@ public class UnbindRequestImpl extends A
*/
public UnbindRequestImpl()
{
- super( -1, TYPE, false );
+ super( -1, MessageTypeEnum.UNBIND_REQUEST, false );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/BindRequestImplTest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/BindRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/BindRequestImplTest.java Mon Mar 17 20:21:57 2014
@@ -292,7 +292,7 @@ public class BindRequestImplTest
public MessageTypeEnum getResponseType()
{
- return MessageTypeEnum.BIND_REQUEST;
+ return MessageTypeEnum.BIND_RESPONSE;
}
@@ -403,7 +403,7 @@ public class BindRequestImplTest
}
};
- BindRequestImpl req1 = new BindRequestImpl();
+ BindRequest req1 = new BindRequestImpl();
req1.setMessageId( 5 );
assertTrue( req1.equals( req0 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java?rev=1578548&r1=1578547&r2=1578548&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java Mon Mar 17 20:21:57 2014
@@ -167,9 +167,9 @@ public class ExtendedRequestImplTest
@Test
public void testEqualsDiffImpl()
{
- ExtendedRequest<ExtendedResponse> req0 = new ExtendedRequest<ExtendedResponse>()
+ ExtendedRequest req0 = new ExtendedRequest()
{
- public ExtendedRequest<ExtendedResponse> setRequestName( String oid )
+ public ExtendedRequest setRequestName( String oid )
{
return this;
}
@@ -199,13 +199,13 @@ public class ExtendedRequestImplTest
}
- public ExtendedRequest<ExtendedResponse> addControl( Control control )
+ public ExtendedRequest addControl( Control control )
{
return this;
}
- public ExtendedRequest<ExtendedResponse> removeControl( Control control )
+ public ExtendedRequest removeControl( Control control )
{
return this;
}
@@ -241,7 +241,7 @@ public class ExtendedRequestImplTest
}
- public ExtendedRequest<ExtendedResponse> addAllControls( Control[] controls )
+ public ExtendedRequest addAllControls( Control[] controls )
{
return this;
}
@@ -259,7 +259,7 @@ public class ExtendedRequestImplTest
}
- public ExtendedRequest<ExtendedResponse> setMessageId( int messageId )
+ public ExtendedRequest setMessageId( int messageId )
{
return this;
}