directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r986595 - in /directory: clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/ shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec...
Date Wed, 18 Aug 2010 08:44:44 GMT
Author: elecharny
Date: Wed Aug 18 08:44:44 2010
New Revision: 986595

URL: http://svn.apache.org/viewvc?rev=986595&view=rev
Log:
Some more cleanup (removed 'internal' from the methods and fields)

Modified:
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.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/ControlValueAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.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/protocol/LdapProtocolDecoder.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
(original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolDecoder.java
Wed Aug 18 08:44:44 2010
@@ -89,7 +89,7 @@ public class LdapProtocolDecoder impleme
                 if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED )
                 {
                     // get back the decoded message
-                    Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
+                    Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getMessage();
 
                     if ( IS_DEBUG )
                     {

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
Wed Aug 18 08:44:44 2010
@@ -140,11 +140,11 @@ public class LdapDecoder implements Prov
                 {
                     if ( IS_DEBUG )
                     {
-                        log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getInternalMessage()
);
+                        log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getMessage()
);
                         buf.mark();
                     }
 
-                    decoderCallback.decodeOccurred( null, ldapMessageContainer.getInternalMessage()
);
+                    decoderCallback.decodeOccurred( null, ldapMessageContainer.getMessage()
);
 
                     ldapMessageContainer.clean();
                 }
@@ -214,10 +214,10 @@ public class LdapDecoder implements Prov
             {
                 if ( IS_DEBUG )
                 {
-                    log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getInternalMessage()
);
+                    log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getMessage()
);
                 }
 
-                return ldapMessageContainer.getInternalMessage();
+                return ldapMessageContainer.getMessage();
             }
             else
             {
@@ -254,10 +254,10 @@ public class LdapDecoder implements Prov
             {
                 if ( IS_DEBUG )
                 {
-                    log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getInternalMessage()
);
+                    log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getMessage()
);
                 }
 
-                return ldapMessageContainer.getInternalMessage();
+                return ldapMessageContainer.getMessage();
             }
             else
             {

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=986595&r1=986594&r2=986595&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
Wed Aug 18 08:44:44 2010
@@ -22,28 +22,28 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.asn1.ber.AbstractContainer;
 import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
-import org.apache.directory.shared.ldap.message.internal.AddResponse;
-import org.apache.directory.shared.ldap.message.internal.BindResponse;
-import org.apache.directory.shared.ldap.message.internal.CompareResponse;
-import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
 import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
 import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.Message;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.SearchRequest;
-import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
 import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
 import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
 import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
 import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
 
 
@@ -60,7 +60,7 @@ public class LdapMessageContainer extend
     // ----------------------------------------------------------------------------
 
     /** The internal ldap message */
-    private Message internalMessage;
+    private Message message;
 
     /** checks if attribute is binary */
     private final BinaryAttributeDetector binaryAttributeDetector;
@@ -112,9 +112,9 @@ public class LdapMessageContainer extend
     /**
      * @return Returns the ldapMessage.
      */
-    public Message getInternalMessage()
+    public Message getMessage()
     {
-        return internalMessage;
+        return message;
     }
 
 
@@ -123,7 +123,7 @@ public class LdapMessageContainer extend
      */
     public AbandonRequest getAbandonRequest()
     {
-        return ( AbandonRequest ) internalMessage;
+        return ( AbandonRequest ) message;
     }
 
 
@@ -132,7 +132,7 @@ public class LdapMessageContainer extend
      */
     public AddRequest getAddRequest()
     {
-        return ( AddRequest ) internalMessage;
+        return ( AddRequest ) message;
     }
 
 
@@ -141,7 +141,7 @@ public class LdapMessageContainer extend
      */
     public AddResponse getAddResponse()
     {
-        return ( AddResponse ) internalMessage;
+        return ( AddResponse ) message;
     }
 
 
@@ -150,7 +150,7 @@ public class LdapMessageContainer extend
      */
     public BindRequest getBindRequest()
     {
-        return ( BindRequest ) internalMessage;
+        return ( BindRequest ) message;
     }
 
 
@@ -159,7 +159,7 @@ public class LdapMessageContainer extend
      */
     public BindResponse getBindResponse()
     {
-        return ( BindResponse ) internalMessage;
+        return ( BindResponse ) message;
     }
 
 
@@ -168,7 +168,7 @@ public class LdapMessageContainer extend
      */
     public CompareRequest getCompareRequest()
     {
-        return ( CompareRequest ) internalMessage;
+        return ( CompareRequest ) message;
     }
 
 
@@ -177,7 +177,7 @@ public class LdapMessageContainer extend
      */
     public CompareResponse getCompareResponse()
     {
-        return ( CompareResponse ) internalMessage;
+        return ( CompareResponse ) message;
     }
 
 
@@ -186,7 +186,7 @@ public class LdapMessageContainer extend
      */
     public DeleteRequest getDeleteRequest()
     {
-        return ( DeleteRequest ) internalMessage;
+        return ( DeleteRequest ) message;
     }
 
 
@@ -195,7 +195,7 @@ public class LdapMessageContainer extend
      */
     public DeleteResponse getDeleteResponse()
     {
-        return ( DeleteResponse ) internalMessage;
+        return ( DeleteResponse ) message;
     }
 
 
@@ -204,7 +204,7 @@ public class LdapMessageContainer extend
      */
     public ExtendedRequest getExtendedRequest()
     {
-        return ( ExtendedRequest ) internalMessage;
+        return ( ExtendedRequest ) message;
     }
 
 
@@ -213,7 +213,7 @@ public class LdapMessageContainer extend
      */
     public ExtendedResponse getExtendedResponse()
     {
-        return ( ExtendedResponse ) internalMessage;
+        return ( ExtendedResponse ) message;
     }
 
 
@@ -222,7 +222,7 @@ public class LdapMessageContainer extend
      */
     public IntermediateResponse getIntermediateResponse()
     {
-        return ( IntermediateResponse ) internalMessage;
+        return ( IntermediateResponse ) message;
     }
 
 
@@ -231,7 +231,7 @@ public class LdapMessageContainer extend
      */
     public ModifyRequest getModifyRequest()
     {
-        return ( ModifyRequest ) internalMessage;
+        return ( ModifyRequest ) message;
     }
 
 
@@ -240,7 +240,7 @@ public class LdapMessageContainer extend
      */
     public ModifyResponse getModifyResponse()
     {
-        return ( ModifyResponse ) internalMessage;
+        return ( ModifyResponse ) message;
     }
 
 
@@ -249,7 +249,7 @@ public class LdapMessageContainer extend
      */
     public ModifyDnRequest getModifyDnRequest()
     {
-        return ( ModifyDnRequest ) internalMessage;
+        return ( ModifyDnRequest ) message;
     }
 
 
@@ -258,7 +258,7 @@ public class LdapMessageContainer extend
      */
     public ModifyDnResponse getModifyDnResponse()
     {
-        return ( ModifyDnResponse ) internalMessage;
+        return ( ModifyDnResponse ) message;
     }
 
 
@@ -267,7 +267,7 @@ public class LdapMessageContainer extend
      */
     public SearchRequest getSearchRequest()
     {
-        return ( SearchRequest ) internalMessage;
+        return ( SearchRequest ) message;
     }
 
 
@@ -276,7 +276,7 @@ public class LdapMessageContainer extend
      */
     public SearchResultEntry getSearchResultEntry()
     {
-        return ( SearchResultEntry ) internalMessage;
+        return ( SearchResultEntry ) message;
     }
 
 
@@ -285,7 +285,7 @@ public class LdapMessageContainer extend
      */
     public SearchResultReference getSearchResultReference()
     {
-        return ( SearchResultReference ) internalMessage;
+        return ( SearchResultReference ) message;
     }
 
 
@@ -294,7 +294,7 @@ public class LdapMessageContainer extend
      */
     public SearchResultDone getSearchResultDone()
     {
-        return ( SearchResultDone ) internalMessage;
+        return ( SearchResultDone ) message;
     }
 
 
@@ -303,19 +303,19 @@ public class LdapMessageContainer extend
      */
     public UnbindRequest getUnbindRequest()
     {
-        return ( UnbindRequest ) internalMessage;
+        return ( UnbindRequest ) message;
     }
 
 
     /**
-     * Set a InternalMessage Object into the container. It will be completed by the
+     * Set a Message Object into the container. It will be completed by the
      * ldapDecoder.
      * 
-     * @param internalMessage The message to set.
+     * @param message The message to set.
      */
-    public void setInternalMessage( Message internalMessage )
+    public void setMessage( Message message )
     {
-        this.internalMessage = internalMessage;
+        this.message = message;
     }
 
 
@@ -323,7 +323,7 @@ public class LdapMessageContainer extend
     {
         super.clean();
 
-        internalMessage = null;
+        message = null;
         messageId = 0;
         currentControl = null;
         decodeBytes = 0;

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=986595&r1=986594&r2=986595&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
Wed Aug 18 08:44:44 2010
@@ -304,7 +304,7 @@ public class LdapMessageGrammar extends 
 
                     // Create the UnbindRequest LdapMessage instance and store it in the
container
                     UnbindRequest unbindRequest = new UnbindRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( unbindRequest );
+                    ldapMessageContainer.setMessage( unbindRequest );
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
                     int expectedLength = tlv.getLength();
@@ -351,7 +351,7 @@ public class LdapMessageGrammar extends 
 
                     // Create the DeleteRequest LdapMessage instance and store it in the
container
                     DeleteRequest delRequest = new DeleteRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( delRequest );
+                    ldapMessageContainer.setMessage( delRequest );
 
                     // And store the DN into it
                     // Get the Value and store it in the DelRequest
@@ -427,7 +427,7 @@ public class LdapMessageGrammar extends 
 
                     // Create the AbandonRequest LdapMessage instance and store it in the
container
                     AbandonRequest abandonRequest = new AbandonRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( abandonRequest );
+                    ldapMessageContainer.setMessage( abandonRequest );
 
                     // The current TLV should be a integer
                     // We get it and store it in MessageId
@@ -500,7 +500,7 @@ public class LdapMessageGrammar extends 
 
                     // Create the BindRequest LdapMessage instance and store it in the container
                     BindRequest bindRequest = new BindRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( bindRequest );
+                    ldapMessageContainer.setMessage( bindRequest );
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -839,7 +839,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the BindResponse Object
                     BindResponse bindResponse = new BindResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( bindResponse );
+                    ldapMessageContainer.setMessage( bindResponse );
                 }
             } );
 
@@ -1032,7 +1032,7 @@ public class LdapMessageGrammar extends 
                         throw new DecoderException( msg );
                     }
 
-                    Message response = ldapMessageContainer.getInternalMessage();
+                    Message response = ldapMessageContainer.getMessage();
                     LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
 
                     Referral referral = new ReferralImpl();
@@ -1105,7 +1105,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the SearchResultEntry Object
                     SearchResultEntry searchResultEntry = new SearchResultEntryImpl( ldapMessageContainer
                         .getMessageId() );
-                    ldapMessageContainer.setInternalMessage( searchResultEntry );
+                    ldapMessageContainer.setMessage( searchResultEntry );
                 }
             } );
 
@@ -1382,7 +1382,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the SearchResultDone Object
                     SearchResultDone searchResultDone = new SearchResultDoneImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( searchResultDone );
+                    ldapMessageContainer.setMessage( searchResultDone );
 
                     log.debug( "Search Result Done found" );
                 }
@@ -1420,7 +1420,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the ModifyRequest Object
                     ModifyRequest modifyRequest = new ModifyRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( modifyRequest );
+                    ldapMessageContainer.setMessage( modifyRequest );
                 }
             } );
 
@@ -1791,7 +1791,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the ModifyResponse Object
                     ModifyResponse modifyResponse = new ModifyResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( modifyResponse );
+                    ldapMessageContainer.setMessage( modifyResponse );
 
                     log.debug( "Modify response" );
                 }
@@ -1831,7 +1831,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the AddRequest Object
                     int messageId = ldapMessageContainer.getMessageId();
                     AddRequest addRequest = new AddRequestImpl( messageId );
-                    ldapMessageContainer.setInternalMessage( addRequest );
+                    ldapMessageContainer.setMessage( addRequest );
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2059,7 +2059,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the AddResponse Object
                     AddResponse addResponse = new AddResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( addResponse );
+                    ldapMessageContainer.setMessage( addResponse );
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2108,7 +2108,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the DelResponse Object
                     DeleteResponse delResponse = new DeleteResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( delResponse );
+                    ldapMessageContainer.setMessage( delResponse );
 
                     log.debug( "Del response " );
                 }
@@ -2147,7 +2147,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the ModifyDNRequest Object
                     ModifyDnRequest modifyDnRequest = new ModifyDnRequestImpl( ldapMessageContainer
                         .getMessageId() );
-                    ldapMessageContainer.setInternalMessage( modifyDnRequest );
+                    ldapMessageContainer.setMessage( modifyDnRequest );
 
                     log.debug( "ModifyDn request" );
                 }
@@ -2453,7 +2453,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the ModifyDnResponse Object
                     ModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( modifyDnResponse );
+                    ldapMessageContainer.setMessage( modifyDnResponse );
 
                     log.debug( "Modify DN response " );
                 }
@@ -2495,7 +2495,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the CompareRequest Object
                     CompareRequest compareRequest = new CompareRequestImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( compareRequest );
+                    ldapMessageContainer.setMessage( compareRequest );
 
                     log.debug( "Compare Request" );
                 }
@@ -2709,7 +2709,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the CompareResponse Object
                     CompareResponse compareResponse = new CompareResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( compareResponse );
+                    ldapMessageContainer.setMessage( compareResponse );
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2758,7 +2758,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the SearchResultReference Object
                     SearchResultReference searchResultReference = new SearchResultReferenceImpl(
ldapMessageContainer
                         .getMessageId() );
-                    ldapMessageContainer.setInternalMessage( searchResultReference );
+                    ldapMessageContainer.setMessage( searchResultReference );
 
                     log.debug( "SearchResultReference response " );
                 }
@@ -2816,7 +2816,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the ExtendedRequest Object
                     ExtendedRequest extendedRequest = new ExtendedRequestImpl( ldapMessageContainer
                         .getMessageId() );
-                    ldapMessageContainer.setInternalMessage( extendedRequest );
+                    ldapMessageContainer.setMessage( extendedRequest );
 
                     log.debug( "Extended request" );
                 }
@@ -2981,7 +2981,7 @@ public class LdapMessageGrammar extends 
 
                     // Now, we can allocate the ExtendedResponse Object
                     ExtendedResponse extendedResponse = new ExtendedResponseImpl( ldapMessageContainer.getMessageId()
);
-                    ldapMessageContainer.setInternalMessage( extendedResponse );
+                    ldapMessageContainer.setMessage( extendedResponse );
 
                     log.debug( "Extended Response" );
                 }
@@ -3192,7 +3192,7 @@ public class LdapMessageGrammar extends 
                     // Now, we can allocate the IntermediateResponse Object
                     IntermediateResponse intermediateResponse = new IntermediateResponseImpl(
ldapMessageContainer
                         .getMessageId() );
-                    ldapMessageContainer.setInternalMessage( intermediateResponse );
+                    ldapMessageContainer.setMessage( intermediateResponse );
 
                     log.debug( "Intermediate Response" );
                 }
@@ -3448,7 +3448,7 @@ public class LdapMessageGrammar extends 
                         throw new DecoderException( I18n.err( I18n.ERR_04099, oidValue )
);
                     }
 
-                    Message message = ldapMessageContainer.getInternalMessage();
+                    Message message = ldapMessageContainer.getMessage();
 
                     Control control = ControlEnum.getControl( oidValue );
 
@@ -3492,7 +3492,7 @@ public class LdapMessageGrammar extends 
                     // Get the current control
                     Control control = null;
 
-                    Message message = ldapMessageContainer.getInternalMessage();
+                    Message message = ldapMessageContainer.getMessage();
                     control = message.getCurrentControl();
 
                     // Store the criticality
@@ -3604,7 +3604,7 @@ public class LdapMessageGrammar extends 
 
                     SearchRequest searchRequest = new SearchRequestImpl( ldapMessageContainer.getMessageId()
);
                     ( ( SearchRequestImpl ) searchRequest ).setTlvId( tlv.getId() );
-                    ldapMessageContainer.setInternalMessage( searchRequest );
+                    ldapMessageContainer.setMessage( searchRequest );
 
                     log.debug( "Search Request" );
                 }

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
Wed Aug 18 08:44:44 2010
@@ -57,7 +57,7 @@ public class ControlValueAction extends 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
         Control control = null;
 
-        Message message = ldapMessageContainer.getInternalMessage();
+        Message message = ldapMessageContainer.getMessage();
         control = message.getCurrentControl();
 
         // Get the current control

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
Wed Aug 18 08:44:44 2010
@@ -74,7 +74,7 @@ public class ErrorMessageAction extends 
             errorMessage = StringTools.utf8ToString( tlv.getValue().getData() );
         }
 
-        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getMessage();
         LdapResult ldapResult = response.getLdapResult();
         ldapResult.setErrorMessage( errorMessage );
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
Wed Aug 18 08:44:44 2010
@@ -73,7 +73,7 @@ public class InitReferralsAction extends
             throw new DecoderException( msg );
         }
 
-        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getMessage();
         LdapResult ldapResult = response.getLdapResult();
 
         Referral referral = new ReferralImpl();

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
Wed Aug 18 08:44:44 2010
@@ -68,7 +68,7 @@ public class MatchedDNAction extends Gra
         DN matchedDN = null;
         ResultCodeEnum resultCode = null;
 
-        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getMessage();
         LdapResult ldapResult = response.getLdapResult();
         resultCode = ldapResult.getResultCode();
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
Wed Aug 18 08:44:44 2010
@@ -67,7 +67,7 @@ public class ReferralAction extends Gram
 
         TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-        Message response = ldapMessageContainer.getInternalMessage();
+        Message response = ldapMessageContainer.getMessage();
         LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
         Referral referral = ldapResult.getReferral();
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
Wed Aug 18 08:44:44 2010
@@ -140,7 +140,7 @@ public class ResultCodeAction extends Gr
             log.debug( "The result code is set to " + resultCode );
         }
 
-        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getInternalMessage();
+        ResultResponse response = ( ResultResponse ) ldapMessageContainer.getMessage();
         LdapResult ldapResult = response.getLdapResult();
         ldapResult.setResultCode( resultCode );
     }

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
Wed Aug 18 08:44:44 2010
@@ -74,7 +74,7 @@ public class ServerSASLCredsAction exten
             serverSaslCreds = tlv.getValue().getData();
         }
 
-        BindResponse response = ( BindResponse ) ldapMessageContainer.getInternalMessage();
+        BindResponse response = ( BindResponse ) ldapMessageContainer.getMessage();
         response.setServerSaslCreds( serverSaslCreds );
 
         // We can have an END transition

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java?rev=986595&r1=986594&r2=986595&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
Wed Aug 18 08:44:44 2010
@@ -311,7 +311,7 @@ public class LdapMessageTest
             fail( de.getMessage() );
         }
 
-        Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getInternalMessage();
+        Message message = ( ( LdapMessageContainer ) ldapMessageContainer ).getMessage();
 
         assertEquals( 500, message.getMessageId() );
 



Mime
View raw message