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 2010/08/16 13:26:50 UTC

svn commit: r985876 - in /directory: apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/...

Author: elecharny
Date: Mon Aug 16 11:26:49 2010
New Revision: 985876

URL: http://svn.apache.org/viewvc?rev=985876&view=rev
Log:
Renamed the InternalIntermediateResponse class and removed the IntermediateResponse class from the API

Added:
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/IntermediateResponse.java
      - copied, changed from r985776, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
Removed:
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/IntermediateResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
Modified:
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Mon Aug 16 11:26:49 2010
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.message.internal.BindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
@@ -422,7 +422,7 @@ public class SyncReplConsumer implements
     /**
      * {@inheritDoc}
      */
-    public void handleSyncInfo( InternalIntermediateResponse syncInfoResp )
+    public void handleSyncInfo( IntermediateResponse syncInfoResp )
     {
         try
         {
@@ -561,9 +561,9 @@ public class SyncReplConsumer implements
             {
                 handleSearchReference( ( SearchResultReference ) resp );
             }
-            else if ( resp instanceof InternalIntermediateResponse )
+            else if ( resp instanceof IntermediateResponse )
             {
-                handleSyncInfo( ( InternalIntermediateResponse ) resp );
+                handleSyncInfo( ( IntermediateResponse ) resp );
             }
 
             resp = sf.get();

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Mon Aug 16 11:26:49 2010
@@ -77,7 +77,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.Response;
@@ -324,7 +324,7 @@ public class SyncReplProvider implements
 
         if ( refreshNPersist )
         {
-            InternalIntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
+            IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
             intermResp.setResponseName( SyncInfoValueControl.CONTROL_OID );
 
             SyncInfoValueControl syncInfo = new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE );
@@ -417,7 +417,7 @@ public class SyncReplProvider implements
                 contextCsn = sendContentFromLog( session, req, replicaLog );
                 cookie = StringTools.getBytesUtf8( replicaLog.getId() + REPLICA_ID_DELIM + contextCsn );
 
-                InternalIntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
+                IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
                 intermResp.setResponseName( SyncInfoValueControl.CONTROL_OID );
 
                 SyncInfoValueControl syncInfo = new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Aug 16 11:26:49 2010
@@ -102,7 +102,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
@@ -1570,18 +1570,18 @@ public class LdapNetworkConnection exten
                 break;
 
             case INTERMEDIATE_RESPONSE:
-                InternalIntermediateResponse intermediateResponse = null;
+                IntermediateResponse intermediateResponse = null;
 
                 if ( responseFuture instanceof SearchFuture )
                 {
                     intermediateResponse = new IntermediateResponseImpl( messageId );
-                    addControls( intermediateResponse, ( InternalIntermediateResponse ) response );
+                    addControls( intermediateResponse, ( IntermediateResponse ) response );
                     ( ( SearchFuture ) responseFuture ).set( intermediateResponse );
                 }
                 else if ( responseFuture instanceof ExtendedFuture )
                 {
                     intermediateResponse = new IntermediateResponseImpl( messageId );
-                    addControls( intermediateResponse, ( InternalIntermediateResponse ) response );
+                    addControls( intermediateResponse, ( IntermediateResponse ) response );
                     ( ( ExtendedFuture ) responseFuture ).set( intermediateResponse );
                 }
                 else
@@ -1591,9 +1591,9 @@ public class LdapNetworkConnection exten
                         + responseFuture.getClass().getName() );
                 }
 
-                intermediateResponse.setResponseName( ( ( InternalIntermediateResponse ) response ).getResponseName() );
+                intermediateResponse.setResponseName( ( ( IntermediateResponse ) response ).getResponseName() );
                 intermediateResponse
-                    .setResponseValue( ( ( InternalIntermediateResponse ) response ).getResponseValue() );
+                    .setResponseValue( ( ( IntermediateResponse ) response ).getResponseValue() );
 
                 break;
 

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/IntermediateResponseListener.java Mon Aug 16 11:26:49 2010
@@ -19,8 +19,10 @@
  */
 package org.apache.directory.ldap.client.api.listener;
 
+
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
-import org.apache.directory.ldap.client.api.message.IntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
+
 
 /**
  * A listener used for asynchronous IntermediateResponse handling. 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Mon Aug 16 11:26:49 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
@@ -241,9 +241,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the IntermediateResponse stored in the container
      */
-    public InternalIntermediateResponse getIntermediateResponse()
+    public IntermediateResponse getIntermediateResponse()
     {
-        return ( InternalIntermediateResponse ) internalMessage;
+        return ( IntermediateResponse ) internalMessage;
     }
 
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Mon Aug 16 11:26:49 2010
@@ -111,7 +111,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
 import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
@@ -3194,7 +3194,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // Now, we can allocate the IntermediateResponse Object
-                    InternalIntermediateResponse intermediateResponse = new IntermediateResponseImpl(
+                    IntermediateResponse intermediateResponse = new IntermediateResponseImpl(
                         ldapMessageContainer.getMessageId() );
                     ldapMessageContainer.setInternalMessage( intermediateResponse );
 
@@ -3220,7 +3220,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // We can get the IntermediateResponse Object
-                    InternalIntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
+                    IntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3284,7 +3284,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // We can get the IntermediateResponse Object
-                    InternalIntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
+                    IntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3327,7 +3327,7 @@ public class LdapMessageGrammar extends 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
                     // We can allocate the ExtendedRequest Object
-                    InternalIntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
+                    IntermediateResponse intermediateResponse = ldapMessageContainer.getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java Mon Aug 16 11:26:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.util.Arrays;
 
 import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  */
-public class IntermediateResponseImpl extends InternalAbstractResultResponse implements InternalIntermediateResponse
+public class IntermediateResponseImpl extends InternalAbstractResultResponse implements IntermediateResponse
 {
     static final long serialVersionUID = -6646752766410531060L;
 
@@ -184,12 +184,12 @@ public class IntermediateResponseImpl ex
             return false;
         }
 
-        if ( !( obj instanceof InternalIntermediateResponse ) )
+        if ( !( obj instanceof IntermediateResponse ) )
         {
             return false;
         }
 
-        InternalIntermediateResponse resp = ( InternalIntermediateResponse ) obj;
+        IntermediateResponse resp = ( IntermediateResponse ) obj;
 
         if ( ( responseName != null ) && ( resp.getResponseName() == null ) )
         {

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Mon Aug 16 11:26:49 2010
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
 import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
@@ -126,7 +126,7 @@ public class LdapProtocolEncoder extends
         if ( ( message instanceof BindResponse ) || ( message instanceof DeleteResponse )
             || ( message instanceof AddResponse ) || ( message instanceof CompareResponse )
             || ( message instanceof ExtendedResponse ) || ( message instanceof ModifyResponse )
-            || ( message instanceof ModifyDnResponse ) || ( message instanceof InternalIntermediateResponse )
+            || ( message instanceof ModifyDnResponse ) || ( message instanceof IntermediateResponse )
             || ( message instanceof SearchResultDone ) || ( message instanceof SearchResultEntry )
             || ( message instanceof SearchResultReference ) || ( message instanceof InternalAbandonRequest )
             || ( message instanceof InternalDeleteRequest ) || ( message instanceof InternalUnbindRequest )

Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/IntermediateResponse.java (from r985776, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/IntermediateResponse.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/IntermediateResponse.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java&r1=985776&r2=985876&rev=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/IntermediateResponse.java Mon Aug 16 11:26:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface InternalIntermediateResponse extends Response
+public interface IntermediateResponse extends Response
 {
     /** Intermediate response message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.INTERMEDIATE_RESPONSE;

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=985876&r1=985875&r2=985876&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Mon Aug 16 11:26:49 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.message.LdapProtocolEncoder;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -93,7 +93,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -164,7 +164,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -245,7 +245,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -423,7 +423,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -489,7 +489,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -552,7 +552,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
@@ -615,7 +615,7 @@ public class IntermediateResponseTest
         }
 
         // Check the decoded IntermediateResponse PDU
-        InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
+        IntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
             .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );