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 2019/01/02 02:11:46 UTC

[directory-ldap-api] branch master updated: o Removed some dead code from LdapEncoder o Renamed some methods

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new f5a7338  o Removed some dead code from LdapEncoder o Renamed some methods
f5a7338 is described below

commit f5a7338260fd311a74ba9ea24df440165ff2a2cf
Author: Emmanuel Lecharny <el...@apache.org>
AuthorDate: Wed Jan 2 03:11:44 2019 +0100

    o Removed some dead code from LdapEncoder
    o Renamed some methods
---
 .../directory/api/ldap/codec/api/LdapEncoder.java  | 153 +--------------------
 .../directory/api/ldap/codec/LdapControlTest.java  |   4 +-
 .../directory/api/ldap/codec/LdapDecoderTest.java  |   4 +-
 .../directory/api/ldap/codec/LdapMessageTest.java  |   2 +-
 .../directory/api/ldap/codec/LdapResultTest.java   |   8 +-
 .../api/ldap/codec/abandon/AbandonRequestTest.java |   4 +-
 .../api/ldap/codec/add/AddRequestTest.java         |   8 +-
 .../api/ldap/codec/add/AddResponseTest.java        |   4 +-
 .../api/ldap/codec/bind/BindRequestPerfTest.java   |   2 +-
 .../api/ldap/codec/bind/BindRequestTest.java       |  20 +--
 .../api/ldap/codec/bind/BindResponseTest.java      |  10 +-
 .../api/ldap/codec/compare/CompareRequestTest.java |   6 +-
 .../ldap/codec/compare/CompareResponseTest.java    |   4 +-
 .../api/ldap/codec/del/DelRequestTest.java         |   4 +-
 .../api/ldap/codec/del/DelResponseTest.java        |   4 +-
 .../intermediate/IntermediateResponseTest.java     |  14 +-
 .../api/ldap/codec/modify/ModifyRequestTest.java   |  14 +-
 .../api/ldap/codec/modify/ModifyResponseTest.java  |   4 +-
 .../ldap/codec/modifyDn/ModifyDNRequestTest.java   |   8 +-
 .../ldap/codec/modifyDn/ModifyDNResponseTest.java  |   4 +-
 .../SearchRequestMatchingRuleAssertionTest.java    |   4 +-
 .../codec/search/SearchRequestSubstringTest.java   |  20 +--
 .../api/ldap/codec/search/SearchRequestTest.java   |  50 +++----
 .../ldap/codec/search/SearchResultDoneTest.java    |   6 +-
 .../ldap/codec/search/SearchResultEntryTest.java   |  18 +--
 .../codec/search/SearchResultReferenceTest.java    |   6 +-
 .../api/ldap/codec/unbind/UnBindRequestTest.java   |   4 +-
 .../ldap/extras/extended/ExtendedRequestTest.java  |  10 +-
 .../ldap/extras/extended/ExtendedResponseTest.java |  16 +--
 .../codec/protocol/mina/LdapProtocolEncoder.java   |   2 +-
 30 files changed, 136 insertions(+), 281 deletions(-)

diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java
index 4fcf42d..0d97baa 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapEncoder.java
@@ -20,15 +20,12 @@
 package org.apache.directory.api.ldap.codec.api;
 
 
-import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.tlv.BerValue;
-import org.apache.directory.api.asn1.ber.tlv.TLV;
 import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.api.asn1.util.Asn1Buffer;
 import org.apache.directory.api.i18n.I18n;
@@ -55,9 +52,7 @@ import org.apache.directory.api.ldap.codec.factory.SearchResultReferenceFactory;
 import org.apache.directory.api.ldap.codec.factory.UnbindRequestFactory;
 import org.apache.directory.api.ldap.model.message.Control;
 import org.apache.directory.api.ldap.model.message.Message;
-import org.apache.directory.api.ldap.model.message.Referral;
 import org.apache.directory.api.ldap.model.message.Request;
-import org.apache.directory.api.util.Strings;
 
 
 /**
@@ -75,79 +70,6 @@ public final class LdapEncoder
         // Nothing to do
     }
 
-    /**
-     * Compute the control's encoded length
-     *
-     * @param control The control to compute
-     * @return the encoded control length
-     */
-    public static int computeControlLength( Control control )
-    {
-        // First, compute the control's value length
-        int controlValueLength = ( ( CodecControl<?> ) control ).computeLength();
-
-        // Now, compute the envelop length
-        // The OID
-        int oidLengh = Strings.getBytesUtf8( control.getOid() ).length;
-        int controlLength = 1 + TLV.getNbBytes( oidLengh ) + oidLengh;
-
-        // The criticality, only if true
-        if ( control.isCritical() )
-        {
-            // Always 3 for a boolean
-            controlLength += 1 + 1 + 1;
-        }
-
-        if ( controlValueLength != 0 )
-        {
-            controlLength += 1 + TLV.getNbBytes( controlValueLength ) + controlValueLength;
-        }
-
-        return controlLength;
-    }
-
-
-    /**
-     * Encode a control to a byte[]
-     *
-     * @param buffer The buffer that will contain the encoded control
-     * @param control The control to encode
-     * @return The control encoded in a byte[]
-     * @throws EncoderException If the encoding failed
-     */
-    public static ByteBuffer encodeControl( ByteBuffer buffer, Control control ) throws EncoderException
-    {
-        if ( buffer == null )
-        {
-            throw new EncoderException( I18n.err( I18n.ERR_08000_CANNOT_PUT_A_PDU_IN_NULL_BUFFER ) );
-        }
-
-        try
-        {
-            // The LdapMessage Sequence
-            buffer.put( UniversalTag.SEQUENCE.getValue() );
-
-            // The length has been calculated by the computeLength method
-            int controlLength = computeControlLength( control );
-            buffer.put( TLV.getBytes( controlLength ) );
-        }
-        catch ( BufferOverflowException boe )
-        {
-            throw new EncoderException( I18n.err( I18n.ERR_08212_PDU_BUFFER_TOO_SMALL ), boe );
-        }
-
-        // The control type
-        BerValue.encode( buffer, Strings.getBytesUtf8( control.getOid() ) );
-
-        // The control criticality, if true
-        if ( control.isCritical() )
-        {
-            BerValue.encode( buffer, control.isCritical() );
-        }
-
-        return buffer;
-    }
-
 
     /**
      * Encode a control to a byte[]. The controls are encoded recursively, to start with the last
@@ -167,7 +89,7 @@ public final class LdapEncoder
      * @return The control encoded in a byte[]
      * @throws EncoderException If the encoding failed
      */
-    private static void encodeControlsReverse( Asn1Buffer buffer, LdapApiService codec,
+    private static void encodeControls( Asn1Buffer buffer, LdapApiService codec,
         Map<String, Control> controls, Iterator<String> iterator, boolean isRequest ) throws EncoderException
     {
         if ( iterator.hasNext() )
@@ -176,7 +98,7 @@ public final class LdapEncoder
             Control control = controls.get( iterator.next() );
 
             // Encode the remaining controls recursively
-            encodeControlsReverse( buffer, codec, controls, iterator, isRequest );
+            encodeControls( buffer, codec, controls, iterator, isRequest );
 
             // Fetch the control's factory from the LdapApiService
             ControlFactory<?> controlFactory;
@@ -347,7 +269,7 @@ public final class LdapEncoder
      * @return A ByteBuffer that contains the PDU
      * @throws EncoderException If anything goes wrong.
      */
-    public static ByteBuffer encodeMessageReverse( Asn1Buffer buffer, LdapApiService codec, Message message ) throws EncoderException
+    public static ByteBuffer encodeMessage( Asn1Buffer buffer, LdapApiService codec, Message message ) throws EncoderException
     {
         int start = buffer.getPos();
 
@@ -356,7 +278,7 @@ public final class LdapEncoder
 
         if ( ( controls != null ) && ( controls.size() > 0 ) )
         {
-            encodeControlsReverse( buffer, codec, controls, controls.keySet().iterator(), message instanceof Request );
+            encodeControls( buffer, codec, controls, controls.keySet().iterator(), message instanceof Request );
 
             // The controls tag
             BerValue.encodeSequence( buffer, ( byte ) LdapCodecConstants.CONTROLS_TAG, start );
@@ -373,71 +295,4 @@ public final class LdapEncoder
 
         return buffer.getBytes();
     }
-
-
-    /**
-     * Encode the Referral message to a PDU.
-     *
-     * @param buffer The buffer where to put the PDU
-     * @param referral The referral to encode
-     * @exception EncoderException If the encoding failed
-     */
-    public static void encodeReferral( ByteBuffer buffer, Referral referral ) throws EncoderException
-    {
-        Collection<byte[]> ldapUrlsBytes = referral.getLdapUrlsBytes();
-
-        if ( ( ldapUrlsBytes != null ) && ( !ldapUrlsBytes.isEmpty() ) )
-        {
-            // Encode the referrals sequence
-            // The referrals length MUST have been computed before !
-            buffer.put( ( byte ) LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG );
-            buffer.put( TLV.getBytes( referral.getReferralLength() ) );
-
-            // Each referral
-            for ( byte[] ldapUrlBytes : ldapUrlsBytes )
-            {
-                // Encode the current referral
-                BerValue.encode( buffer, ldapUrlBytes );
-            }
-        }
-    }
-
-
-    /**
-     * Compute the referral's encoded length
-     * @param referral The referral to encode
-     * @return The length of the encoded PDU
-     */
-    public static int computeReferralLength( Referral referral )
-    {
-        if ( referral != null )
-        {
-            Collection<String> ldapUrls = referral.getLdapUrls();
-
-            if ( ( ldapUrls != null ) && ( !ldapUrls.isEmpty() ) )
-            {
-                int referralLength = 0;
-
-                // Each referral
-                for ( String ldapUrl : ldapUrls )
-                {
-                    byte[] ldapUrlBytes = Strings.getBytesUtf8( ldapUrl );
-                    referralLength += 1 + TLV.getNbBytes( ldapUrlBytes.length ) + ldapUrlBytes.length;
-                    referral.addLdapUrlBytes( ldapUrlBytes );
-                }
-
-                referral.setReferralLength( referralLength );
-
-                return referralLength;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            return 0;
-        }
-    }
 }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java
index c532336..d97060b 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapControlTest.java
@@ -162,7 +162,7 @@ public class LdapControlTest extends AbstractCodecServiceTest
 
         // Check the encoding
         Asn1Buffer buffer = new Asn1Buffer();
-        ByteBuffer bb = LdapEncoder.encodeMessageReverse( buffer, codec, internalAbandonRequest );
+        ByteBuffer bb = LdapEncoder.encodeMessage( buffer, codec, internalAbandonRequest );
 
         // Check the length
         assertEquals( 0x9C, bb.limit() );
@@ -221,7 +221,7 @@ public class LdapControlTest extends AbstractCodecServiceTest
 
         // Check the encoding
         Asn1Buffer buffer = new Asn1Buffer();
-        ByteBuffer bb = LdapEncoder.encodeMessageReverse( buffer, codec, internalAbandonRequest );
+        ByteBuffer bb = LdapEncoder.encodeMessage( buffer, codec, internalAbandonRequest );
 
         // Check the length, which should be 2 bytes shorter, as we don't encode teh empty control
         assertEquals( 0x08, bb.limit() );
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java
index 20a84e7..b89410c 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapDecoderTest.java
@@ -173,7 +173,7 @@ public class LdapDecoderTest extends AbstractCodecServiceTest
         // Check the revert encoder
         Asn1Buffer buffer = new Asn1Buffer();
         
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -353,7 +353,7 @@ public class LdapDecoderTest extends AbstractCodecServiceTest
         // Check the revert encoder
         Asn1Buffer buffer = new Asn1Buffer();
         
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( 
             new byte[]
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java
index 2d22cd9..d010747 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapMessageTest.java
@@ -272,7 +272,7 @@ public class LdapMessageTest extends AbstractCodecServiceTest
         // Check the reverse encoding
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, unbindRequest );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, unbindRequest );
 
         assertArrayEquals( stream.array(), result.array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java
index 41c8f26..064dd6e 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/LdapResultTest.java
@@ -251,7 +251,7 @@ public class LdapResultTest extends AbstractCodecServiceTest
         AddResponse response = new AddResponseImpl( addResponse.getMessageId() );
         response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, response );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, response );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -314,7 +314,7 @@ public class LdapResultTest extends AbstractCodecServiceTest
         response.getLdapResult().setReferral( referralResult );
         response.getLdapResult().setResultCode( ResultCodeEnum.REFERRAL );
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, response );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, response );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -385,7 +385,7 @@ public class LdapResultTest extends AbstractCodecServiceTest
         response.getLdapResult().setReferral( referralResult );
         response.getLdapResult().setResultCode( ResultCodeEnum.REFERRAL );
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, response );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, response );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -461,7 +461,7 @@ public class LdapResultTest extends AbstractCodecServiceTest
         response.getLdapResult().setReferral( referralResult );
         response.getLdapResult().setResultCode( ResultCodeEnum.REFERRAL );
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, response );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, response );
 
         assertArrayEquals( stream.array(), result.array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java
index c041f42..2e24ec2 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/abandon/AbandonRequestTest.java
@@ -165,7 +165,7 @@ public class AbandonRequestTest extends AbstractCodecServiceTest
 
         // Check reverse encoding
         Asn1Buffer buffer = new Asn1Buffer();
-        LdapEncoder.encodeMessageReverse( buffer, codec, internalAbandonRequest );
+        LdapEncoder.encodeMessage( buffer, codec, internalAbandonRequest );
 
         // Check that the decoded messages are equals
         LdapMessageContainer<AbandonRequest>  ldapMessageContainer2 =
@@ -220,7 +220,7 @@ public class AbandonRequestTest extends AbstractCodecServiceTest
 
         // Check the reverse encoding
         Asn1Buffer buffer = new Asn1Buffer();
-        LdapEncoder.encodeMessageReverse( buffer, codec, internalAbandonRequest );
+        LdapEncoder.encodeMessage( buffer, codec, internalAbandonRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java
index 468b5e0..4de9d15 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java
@@ -177,7 +177,7 @@ public class AddRequestTest extends AbstractCodecServiceTest
         request.setEntry( addRequest.getEntry() );
         request.setMessageId( addRequest.getMessageId() );
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, request );
+        LdapEncoder.encodeMessage( buffer, codec, request );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -589,7 +589,7 @@ public class AddRequestTest extends AbstractCodecServiceTest
         request.setEntry( addRequest.getEntry() );
         request.setMessageId( addRequest.getMessageId() );
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, request );
+        LdapEncoder.encodeMessage( buffer, codec, request );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -677,7 +677,7 @@ public class AddRequestTest extends AbstractCodecServiceTest
         request.setMessageId( addRequest.getMessageId() );
         request.addControl( new ManageDsaITImpl() );
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, request );
+        LdapEncoder.encodeMessage( buffer, codec, request );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
         
@@ -689,7 +689,7 @@ public class AddRequestTest extends AbstractCodecServiceTest
         request2.setMessageId( addRequest.getMessageId() );
         request2.addControl( new ManageDsaITImpl() );
 
-        LdapEncoder.encodeMessageReverse( asn1Buffer, codec, request2 );
+        LdapEncoder.encodeMessage( asn1Buffer, codec, request2 );
 
         assertArrayEquals( stream.array(), asn1Buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java
index 58968b9..dcee35b 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddResponseTest.java
@@ -97,7 +97,7 @@ public class AddResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, addResponse );
+        LdapEncoder.encodeMessage( buffer, codec, addResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -193,7 +193,7 @@ public class AddResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, addResponse );
+        LdapEncoder.encodeMessage( buffer, codec, addResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java
index 63de5ed..15c4c67 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestPerfTest.java
@@ -89,7 +89,7 @@ public class BindRequestPerfTest extends AbstractCodecServiceTest
             for ( int i = 0; i < nbLoops; i++ )
             {
                 // Check the encoding
-                LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+                LdapEncoder.encodeMessage( buffer, codec, bindRequest );
                 buffer.clear();
             }
 
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java
index 7624a89..ee91f25 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindRequestTest.java
@@ -205,7 +205,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -341,7 +341,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -397,7 +397,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -460,7 +460,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -521,7 +521,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -755,7 +755,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -845,7 +845,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
 
@@ -936,7 +936,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
 
         assertArrayEquals(
             new byte[]
@@ -1010,7 +1010,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
         assertArrayEquals( 
             new byte[]
             {
@@ -1085,7 +1085,7 @@ public class BindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, bindRequest );
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
 
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java
index b1e83cd..695213b 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/bind/BindResponseTest.java
@@ -99,7 +99,7 @@ public class BindResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindResponse );
+        LdapEncoder.encodeMessage( buffer, codec, bindResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -176,7 +176,7 @@ public class BindResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindResponse );
+        LdapEncoder.encodeMessage( buffer, codec, bindResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -229,7 +229,7 @@ public class BindResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindResponse );
+        LdapEncoder.encodeMessage( buffer, codec, bindResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
 }
@@ -301,7 +301,7 @@ public class BindResponseTest extends AbstractCodecServiceTest
         // Check the reverse encoding
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindResponse );
+        LdapEncoder.encodeMessage( buffer, codec, bindResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -356,7 +356,7 @@ public class BindResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, bindResponse );
+        LdapEncoder.encodeMessage( buffer, codec, bindResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java
index 45f6c56..c499413 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareRequestTest.java
@@ -105,7 +105,7 @@ public class CompareRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, compareRequest );
+        LdapEncoder.encodeMessage( buffer, codec, compareRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -351,7 +351,7 @@ public class CompareRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, compareRequest );
+        LdapEncoder.encodeMessage( buffer, codec, compareRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -418,7 +418,7 @@ public class CompareRequestTest extends AbstractCodecServiceTest
         // Check the encoding
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, compareRequest );
+        LdapEncoder.encodeMessage( buffer, codec, compareRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java
index fee14e5..38c67cb 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/compare/CompareResponseTest.java
@@ -100,7 +100,7 @@ public class CompareResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, compareResponse );
+        LdapEncoder.encodeMessage( buffer, codec, compareResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -169,7 +169,7 @@ public class CompareResponseTest extends AbstractCodecServiceTest
         // Check the encoding
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, compareResponse );
+        LdapEncoder.encodeMessage( buffer, codec, compareResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java
index b9531f8..8ed3ad9 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelRequestTest.java
@@ -95,7 +95,7 @@ public class DelRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, delRequest );
+        LdapEncoder.encodeMessage( buffer, codec, delRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -226,7 +226,7 @@ public class DelRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, delRequest );
+        LdapEncoder.encodeMessage( buffer, codec, delRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java
index 678832d..3582a9f 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/del/DelResponseTest.java
@@ -102,7 +102,7 @@ public class DelResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, delResponse );
+        LdapEncoder.encodeMessage( buffer, codec, delResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -200,7 +200,7 @@ public class DelResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, delResponse );
+        LdapEncoder.encodeMessage( buffer, codec, delResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java
index 37bf78d..14f9566 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/intermediate/IntermediateResponseTest.java
@@ -97,7 +97,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -168,7 +168,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -239,7 +239,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -387,7 +387,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -437,7 +437,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( 
             new byte[]
@@ -493,7 +493,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -540,7 +540,7 @@ public class IntermediateResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, intermediateResponse );
+        LdapEncoder.encodeMessage( buffer, codec, intermediateResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java
index 263f4ed..69e80c0 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyRequestTest.java
@@ -149,7 +149,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -308,7 +308,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -410,7 +410,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -504,7 +504,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -948,7 +948,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1025,7 +1025,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1095,7 +1095,7 @@ public class ModifyRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java
index ebba13d..b7fec69 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modify/ModifyResponseTest.java
@@ -99,7 +99,7 @@ public class ModifyResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyResponse );
+        LdapEncoder.encodeMessage( buffer, codec, modifyResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -168,7 +168,7 @@ public class ModifyResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyResponse );
+        LdapEncoder.encodeMessage( buffer, codec, modifyResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java
index 7f96494..f309254 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNRequestTest.java
@@ -103,7 +103,7 @@ public class ModifyDNRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -319,7 +319,7 @@ public class ModifyDNRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -369,7 +369,7 @@ public class ModifyDNRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -436,7 +436,7 @@ public class ModifyDNRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnRequest );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java
index b2e1f7a..a212447 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/modifyDn/ModifyDNResponseTest.java
@@ -99,7 +99,7 @@ public class ModifyDNResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnResponse );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -168,7 +168,7 @@ public class ModifyDNResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, modifyDnResponse );
+        LdapEncoder.encodeMessage( buffer, codec, modifyDnResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
index e19ccf7..a5f2440 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
@@ -174,7 +174,7 @@ public class SearchRequestMatchingRuleAssertionTest extends AbstractCodecService
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -365,7 +365,7 @@ public class SearchRequestMatchingRuleAssertionTest extends AbstractCodecService
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java
index e2e29d2..09c486f 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestSubstringTest.java
@@ -183,7 +183,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -289,7 +289,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -382,7 +382,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -477,7 +477,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -575,7 +575,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -670,7 +670,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -769,7 +769,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertTrue( Arrays.equals( stream.array(), buffer.getBytes().array() ) );
     }
@@ -863,7 +863,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -962,7 +962,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1055,7 +1055,7 @@ public class SearchRequestSubstringTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java
index 1658a74..e3f569f 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java
@@ -252,7 +252,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -396,7 +396,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -535,7 +535,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -617,7 +617,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check the encoding
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( new byte[]
             {
@@ -731,7 +731,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( new byte[]
             {
@@ -858,7 +858,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -987,7 +987,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1114,7 +1114,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( asn1BERJava6, buffer.getBytes().array() );
     }
@@ -1275,7 +1275,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1354,7 +1354,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -1559,7 +1559,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -2466,7 +2466,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -2543,7 +2543,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -2861,7 +2861,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -2944,7 +2944,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3036,7 +3036,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3142,7 +3142,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3240,7 +3240,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3353,7 +3353,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3466,7 +3466,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3591,7 +3591,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3716,7 +3716,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3837,7 +3837,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -3970,7 +3970,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -4089,7 +4089,7 @@ public class SearchRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchRequest );
+        LdapEncoder.encodeMessage( buffer, codec, searchRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java
index 8bb589f..ef2dc86 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultDoneTest.java
@@ -98,7 +98,7 @@ public class SearchResultDoneTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultDone );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultDone );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -172,7 +172,7 @@ public class SearchResultDoneTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultDone );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultDone );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -248,7 +248,7 @@ public class SearchResultDoneTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultDone );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultDone );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java
index b4583df..f4910df 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultEntryTest.java
@@ -122,7 +122,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertTrue( Arrays.equals( stream.array(), buffer.getBytes().array() ) );
     }
@@ -205,7 +205,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         // We can't compare the encodings, the order of the attributes has
         // changed
@@ -300,7 +300,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         // We can't compare the encodings, the order of the attributes has
         // changed
@@ -456,7 +456,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -677,7 +677,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -746,7 +746,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -829,7 +829,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -896,7 +896,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), result.array() );
     }
@@ -981,7 +981,7 @@ public class SearchResultEntryTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        ByteBuffer result = LdapEncoder.encodeMessageReverse( buffer, codec, searchResultEntry );
+        ByteBuffer result = LdapEncoder.encodeMessage( buffer, codec, searchResultEntry );
 
         assertArrayEquals( stream.array(), result.array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java
index d8dd833..3143eaa 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchResultReferenceTest.java
@@ -150,7 +150,7 @@ public class SearchResultReferenceTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultReference );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultReference );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -278,7 +278,7 @@ public class SearchResultReferenceTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultReference );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultReference );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -358,7 +358,7 @@ public class SearchResultReferenceTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, searchResultReference );
+        LdapEncoder.encodeMessage( buffer, codec, searchResultReference );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/unbind/UnBindRequestTest.java b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/unbind/UnBindRequestTest.java
index 21b654c..4af8238 100644
--- a/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/unbind/UnBindRequestTest.java
+++ b/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/unbind/UnBindRequestTest.java
@@ -82,7 +82,7 @@ public class UnBindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, unbindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, unbindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -133,7 +133,7 @@ public class UnBindRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, unbindRequest );
+        LdapEncoder.encodeMessage( buffer, codec, unbindRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java
index 5e68f91..fc14fff 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedRequestTest.java
@@ -113,7 +113,7 @@ public class ExtendedRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, cancelRequest );
+        LdapEncoder.encodeMessage( buffer, codec, cancelRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -180,7 +180,7 @@ public class ExtendedRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, cancelRequest );
+        LdapEncoder.encodeMessage( buffer, codec, cancelRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -245,7 +245,7 @@ public class ExtendedRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, startTlsRequest );
+        LdapEncoder.encodeMessage( buffer, codec, startTlsRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -382,7 +382,7 @@ public class ExtendedRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, startTlsRequest );
+        LdapEncoder.encodeMessage( buffer, codec, startTlsRequest );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -432,7 +432,7 @@ public class ExtendedRequestTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, startTlsRequest );
+        LdapEncoder.encodeMessage( buffer, codec, startTlsRequest );
 
         assertArrayEquals( 
             new byte[]
diff --git a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java
index f3d4572..205328c 100644
--- a/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java
+++ b/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ExtendedResponseTest.java
@@ -124,7 +124,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -208,7 +208,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -260,7 +260,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -335,7 +335,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -495,7 +495,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -573,7 +573,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( stream.array(), buffer.getBytes().array() );
     }
@@ -629,7 +629,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( 
             new byte[]
@@ -727,7 +727,7 @@ public class ExtendedResponseTest extends AbstractCodecServiceTest
         // Check encode reverse
         Asn1Buffer buffer = new Asn1Buffer();
 
-        LdapEncoder.encodeMessageReverse( buffer, codec, extendedResponse );
+        LdapEncoder.encodeMessage( buffer, codec, extendedResponse );
 
         assertArrayEquals( 
             new byte[]
diff --git a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
index 70093e2..444cb01 100644
--- a/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
+++ b/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolEncoder.java
@@ -81,7 +81,7 @@ public class LdapProtocolEncoder implements ProtocolEncoder
         
         try
         { 
-            LdapEncoder.encodeMessageReverse( asn1Buffer, codec, ( Message ) message );
+            LdapEncoder.encodeMessage( asn1Buffer, codec, ( Message ) message );
         }
         catch ( EncoderException e )
         {