directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985713 - in /directory: apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ shared/branches/shar...
Date Sun, 15 Aug 2010 17:04:00 GMT
Author: elecharny
Date: Sun Aug 15 17:04:00 2010
New Revision: 985713

URL: http://svn.apache.org/viewvc?rev=985713&view=rev
Log:
Renamed methods in LdapMessageContainer

Modified:
    directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.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/codec/actions/ResponseAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java

Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Sun Aug 15 17:04:00 2010
@@ -186,7 +186,7 @@ public class ImportCommand extends ToolC
                         else if ( message instanceof ExtendedResponse )
                         {
                             ExtendedResponse response = ( ( LdapMessageContainer ) ldapMessageContainer )
-                                .getInternalExtendedResponse();
+                                .getExtendedResponse();
 
                             if ( response.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
                             {

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=985713&r1=985712&r2=985713&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 Sun Aug 15 17:04:00 2010
@@ -21,7 +21,6 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
 import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
@@ -151,15 +150,6 @@ public class LdapMessageContainer extend
 
 
     /**
-     * @return Returns the AddRequest stored in the container
-     */
-    public AddRequestCodec getAddRequest()
-    {
-        return ( AddRequestCodec ) ldapMessage;
-    }
-
-
-    /**
      * @return Returns the InternalAddRequest stored in the container
      */
     public InternalAddRequest getInternalAddRequest()
@@ -180,7 +170,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the BindRequest stored in the container
      */
-    public InternalBindRequest getInternalBindRequest()
+    public InternalBindRequest getBindRequest()
     {
         return ( InternalBindRequest ) internalMessage;
     }
@@ -225,7 +215,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the DelRequest stored in the container
      */
-    public InternalDeleteRequest getInternalDeleteRequest()
+    public InternalDeleteRequest getDeleteRequest()
     {
         return ( InternalDeleteRequest ) internalMessage;
     }
@@ -252,7 +242,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ExtendedResponse stored in the container
      */
-    public ExtendedResponse getInternalExtendedResponse()
+    public ExtendedResponse getExtendedResponse()
     {
         return ( ExtendedResponse ) internalMessage;
     }
@@ -261,7 +251,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the IntermediateResponse stored in the container
      */
-    public InternalIntermediateResponse getInternalIntermediateResponse()
+    public InternalIntermediateResponse getIntermediateResponse()
     {
         return ( InternalIntermediateResponse ) internalMessage;
     }
@@ -279,7 +269,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ModifyResponse stored in the container
      */
-    public ModifyResponse getInternalModifyResponse()
+    public ModifyResponse getModifyResponse()
     {
         return ( ModifyResponse ) internalMessage;
     }
@@ -297,7 +287,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ModifyDnResponse stored in the container
      */
-    public ModifyDnResponse getInternalModifyDnResponse()
+    public ModifyDnResponse getModifyDnResponse()
     {
         return ( ModifyDnResponse ) internalMessage;
     }
@@ -315,7 +305,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the SearchResultEntry stored in the container
      */
-    public SearchResultEntry getInternalSearchResultEntry()
+    public SearchResultEntry getSearchResultEntry()
     {
         return ( SearchResultEntry ) internalMessage;
     }
@@ -324,7 +314,7 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the SearchResultReference stored in the container
      */
-    public SearchResultReference getInternalSearchResultReference()
+    public SearchResultReference getSearchResultReference()
     {
         return ( SearchResultReference ) 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=985713&r1=985712&r2=985713&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 Sun Aug 15 17:04:00 2010
@@ -526,7 +526,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // The current TLV should be a integer between 1 and 127
                     // We get it and store it in Version
@@ -572,7 +572,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -632,7 +632,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Allocate the Authentication Object
@@ -690,7 +690,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We will check that the sasl is not null
@@ -729,7 +729,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to handle the special case of a 0 length
@@ -769,7 +769,7 @@ public class LdapMessageGrammar extends 
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getInternalBindRequest();
+                    InternalBindRequest bindRequestMessage = ldapMessageContainer.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1130,7 +1130,7 @@ public class LdapMessageGrammar extends 
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+                    SearchResultEntry searchResultEntry = ldapMessageContainer.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1236,7 +1236,7 @@ public class LdapMessageGrammar extends 
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+                    SearchResultEntry searchResultEntry = ldapMessageContainer.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -3221,7 +3221,7 @@ public class LdapMessageGrammar extends 
 
                     // We can get the IntermediateResponse Object
                     InternalIntermediateResponse intermediateResponse = ldapMessageContainer
-                        .getInternalIntermediateResponse();
+                        .getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3286,7 +3286,7 @@ public class LdapMessageGrammar extends 
 
                     // We can get the IntermediateResponse Object
                     InternalIntermediateResponse intermediateResponse = ldapMessageContainer
-                        .getInternalIntermediateResponse();
+                        .getIntermediateResponse();
 
                     // Get the Value and store it in the IntermediateResponse
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -3330,7 +3330,7 @@ public class LdapMessageGrammar extends 
 
                     // We can allocate the ExtendedRequest Object
                     InternalIntermediateResponse intermediateResponse = ldapMessageContainer
-                        .getInternalIntermediateResponse();
+                        .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/codec/actions/ResponseAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java Sun Aug 15 17:04:00 2010
@@ -60,7 +60,7 @@ public class ResponseAction extends Gram
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
         // We can allocate the ExtendedResponse Object
-        ExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
+        ExtendedResponse extendedResponse = ldapMessageContainer.getExtendedResponse();
 
         // Get the Value and store it in the ExtendedResponse
         TLV tlv = ldapMessageContainer.getCurrentTLV();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java Sun Aug 15 17:04:00 2010
@@ -61,7 +61,7 @@ public class ResponseNameAction extends 
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
         // We can allocate the ExtendedResponse Object
-        ExtendedResponse extendedResponse = ldapMessageContainer.getInternalExtendedResponse();
+        ExtendedResponse extendedResponse = ldapMessageContainer.getExtendedResponse();
 
         // Get the Value and store it in the ExtendedResponse
         TLV tlv = ldapMessageContainer.getCurrentTLV();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java Sun Aug 15 17:04:00 2010
@@ -56,7 +56,7 @@ public class SearchResultAttributeValueA
     public void action( IAsn1Container container )
     {
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-        SearchResultEntry searchResultEntry = ldapMessageContainer.getInternalSearchResultEntry();
+        SearchResultEntry searchResultEntry = ldapMessageContainer.getSearchResultEntry();
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java Sun Aug 15 17:04:00 2010
@@ -64,7 +64,7 @@ public class StoreReferenceAction extend
 
         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
 
-        SearchResultReference searchResultReference = ldapMessageContainer.getInternalSearchResultReference();
+        SearchResultReference searchResultReference = ldapMessageContainer.getSearchResultReference();
 
         // Get the Value and store it in the BindRequest
         TLV tlv = ldapMessageContainer.getCurrentTLV();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java Sun Aug 15 17:04:00 2010
@@ -25,13 +25,11 @@ import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.exception.LdapException;
-
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
+import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
@@ -39,6 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -118,7 +117,7 @@ public class AddRequestCodec extends Lda
         return MessageTypeEnum.ADD_REQUEST;
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -280,7 +279,7 @@ public class AddRequestCodec extends Lda
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_04481_ENTRY_NULL_VALUE ) );
         }
-        
+
         // The entry
         addRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry.getDn() ) ) + DN.getNbBytes( entry.getDn() );
 
@@ -368,7 +367,7 @@ public class AddRequestCodec extends Lda
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_04481_ENTRY_NULL_VALUE ) );
         }
-        
+
         try
         {
             // The AddRequest Tag

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Sun Aug 15 17:04:00 2010
@@ -96,7 +96,7 @@ public class LdapDecoderTest
         }
 
         // Check the decoded PDU
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -144,7 +144,7 @@ public class LdapDecoderTest
         assertEquals( TLVStateEnum.VALUE_STATE_PENDING, ldapMessageContainer.getState() );
 
         // Check the decoded PDU
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -216,7 +216,7 @@ public class LdapDecoderTest
         assertEquals( ldapMessageContainer.getState(), TLVStateEnum.PDU_DECODED );
 
         // Check the decoded PDU
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Sun Aug 15 17:04:00 2010
@@ -126,7 +126,7 @@ public class BindRequestPerfTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Sun Aug 15 17:04:00 2010
@@ -203,7 +203,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -365,7 +365,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -442,7 +442,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -524,7 +524,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -601,7 +601,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -915,7 +915,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -1017,7 +1017,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -1123,7 +1123,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -1194,7 +1194,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );
@@ -1273,7 +1273,7 @@ public class BindRequestTest
         }
 
         // Check the decoded BindRequest
-        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalBindRequest();
+        InternalBindRequest bindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getBindRequest();
 
         assertEquals( 1, bindRequest.getMessageId() );
         assertTrue( bindRequest.isVersion3() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Sun Aug 15 17:04:00 2010
@@ -99,7 +99,7 @@ public class DelRequestTest
         }
 
         // Check the decoded DelRequest PDU
-        InternalDeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDeleteRequest();
+        InternalDeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteRequest();
 
         assertEquals( 1, delRequest.getMessageId() );
         assertEquals( "cn=testModify,ou=users,ou=system", delRequest.getName().toString() );
@@ -252,7 +252,7 @@ public class DelRequestTest
         }
 
         // Check the decoded DelRequest PDU
-        InternalDeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalDeleteRequest();
+        InternalDeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteRequest();
 
         assertEquals( 1, delRequest.getMessageId() );
         assertEquals( "cn=testModify,ou=users,ou=system", delRequest.getName().toString() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Sun Aug 15 17:04:00 2010
@@ -103,7 +103,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -195,7 +195,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -278,7 +278,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -361,7 +361,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -565,7 +565,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -652,7 +652,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -744,7 +744,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
@@ -832,7 +832,7 @@ public class ExtendedResponseTest
 
         // Check the decoded ExtendedResponse PDU
         ExtendedResponse extendedResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalExtendedResponse();
+            .getExtendedResponse();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );

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=985713&r1=985712&r2=985713&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 Sun Aug 15 17:04:00 2010
@@ -94,7 +94,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
@@ -165,7 +165,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
@@ -246,7 +246,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
@@ -424,7 +424,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
@@ -490,7 +490,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
@@ -553,7 +553,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "", intermediateResponse.getResponseName() );
@@ -616,7 +616,7 @@ public class IntermediateResponseTest
 
         // Check the decoded IntermediateResponse PDU
         InternalIntermediateResponse intermediateResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalIntermediateResponse();
+            .getIntermediateResponse();
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Sun Aug 15 17:04:00 2010
@@ -100,7 +100,7 @@ public class ModifyResponseTest
 
         // Check the decoded ModifyResponse PDU
         ModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalModifyResponse();
+            .getModifyResponse();
 
         assertEquals( 1, modifyResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() );
@@ -181,7 +181,7 @@ public class ModifyResponseTest
 
         // Check the decoded ModifyResponse PDU
         ModifyResponse modifyResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalModifyResponse();
+            .getModifyResponse();
 
         assertEquals( 1, modifyResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Sun Aug 15 17:04:00 2010
@@ -101,7 +101,7 @@ public class ModifyDNResponseTest
 
         // Check the decoded ModifyDNResponse PDU
         ModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalModifyDnResponse();
+            .getModifyDnResponse();
 
         assertEquals( 1, modifyDnResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() );
@@ -184,7 +184,7 @@ public class ModifyDNResponseTest
 
         // Check the decoded ModifyDNResponse PDU
         ModifyDnResponse modifyDnResponse = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalModifyDnResponse();
+            .getModifyDnResponse();
 
         assertEquals( 1, modifyDnResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Sun Aug 15 17:04:00 2010
@@ -113,7 +113,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -214,7 +214,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -325,7 +325,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 2, searchResultEntry.getMessageId() );
         assertEquals( "uid=admin,ou=system", searchResultEntry.getObjectName().toString() );
@@ -544,7 +544,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -819,7 +819,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -906,7 +906,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -996,7 +996,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -1093,7 +1093,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );
@@ -1187,7 +1187,7 @@ public class SearchResultEntryTest
         }
 
         SearchResultEntry searchResultEntry = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultEntry();
+            .getSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getMessageId() );
         assertEquals( "ou=contacts,dc=iktek,dc=com", searchResultEntry.getObjectName().toString() );

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=985713&r1=985712&r2=985713&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Sun Aug 15 17:04:00 2010
@@ -127,7 +127,7 @@ public class SearchResultReferenceTest
         }
 
         SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultReference();
+            .getSearchResultReference();
 
         assertEquals( 1, searchResultReference.getMessageId() );
 
@@ -258,7 +258,7 @@ public class SearchResultReferenceTest
         stream.flip();
 
         SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultReference();
+            .getSearchResultReference();
 
         assertEquals( 1, searchResultReference.getMessageId() );
 
@@ -399,7 +399,7 @@ public class SearchResultReferenceTest
         }
 
         SearchResultReference searchResultReference = ( ( LdapMessageContainer ) ldapMessageContainer )
-            .getInternalSearchResultReference();
+            .getSearchResultReference();
 
         assertEquals( 1, searchResultReference.getMessageId() );
 



Mime
View raw message