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 2015/01/10 10:22:13 UTC

svn commit: r1650727 [2/3] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/ ldap/codec/core/src/main/java/org/apache/directory/api/ldap/...

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java?rev=1650727&r1=1650726&r2=1650727&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java Sat Jan 10 09:22:12 2015
@@ -128,7 +128,7 @@ import org.apache.directory.api.ldap.cod
 import org.apache.directory.api.ldap.codec.actions.searchResultReference.InitSearchResultReference;
 import org.apache.directory.api.ldap.codec.actions.searchResultReference.StoreReference;
 import org.apache.directory.api.ldap.codec.actions.unbindRequest.InitUnbindRequest;
-import org.apache.directory.api.ldap.codec.api.LdapConstants;
+import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
 import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.api.ldap.codec.api.MessageDecorator;
 import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
@@ -242,11 +242,11 @@ public final class LdapMessageGrammar<E>
         // --------------------------------------------------------------------------------------------
         // LdapMessage ::= ... UnBindRequest ...
         // unbindRequest ::= [APPLICATION 2] NULL
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.UNBIND_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.UNBIND_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.UNBIND_REQUEST_STATE,
-                LdapConstants.UNBIND_REQUEST_TAG,
+                LdapCodecConstants.UNBIND_REQUEST_TAG,
                 new InitUnbindRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -256,11 +256,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.UNBIND_REQUEST_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.UNBIND_REQUEST_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.UNBIND_REQUEST_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -270,11 +270,11 @@ public final class LdapMessageGrammar<E>
         // delRequest ::= [APPLICATION 10] LDAPDN
         //
         // We store the Dn to bve deleted into the DelRequest object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.DEL_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.DEL_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.DEL_REQUEST_STATE,
-                LdapConstants.DEL_REQUEST_TAG,
+                LdapCodecConstants.DEL_REQUEST_TAG,
                 new InitDelRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -284,11 +284,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.DEL_REQUEST_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.DEL_REQUEST_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.DEL_REQUEST_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -298,11 +298,11 @@ public final class LdapMessageGrammar<E>
         // AbandonRequest ::= [APPLICATION 16] MessageID
         //
         // Create the AbandonRequest object, and store the ID in it
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.ABANDON_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.ABANDON_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.ABANDON_REQUEST_STATE,
-                LdapConstants.ABANDON_REQUEST_TAG,
+                LdapCodecConstants.ABANDON_REQUEST_TAG,
                 new InitAbandonRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -312,11 +312,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.ABANDON_REQUEST_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ABANDON_REQUEST_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ABANDON_REQUEST_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -326,11 +326,11 @@ public final class LdapMessageGrammar<E>
         // BindRequest ::= [APPLICATION 0] SEQUENCE { ...
         //
         // We have to allocate a BindRequest
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.BIND_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.BIND_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.BIND_REQUEST_STATE,
-                LdapConstants.BIND_REQUEST_TAG,
+                LdapCodecConstants.BIND_REQUEST_TAG,
                 new InitBindRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -376,11 +376,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // We have to create an Authentication Object to store the credentials.
-        super.transitions[LdapStatesEnum.NAME_STATE.ordinal()][LdapConstants.BIND_REQUEST_SIMPLE_TAG] =
+        super.transitions[LdapStatesEnum.NAME_STATE.ordinal()][LdapCodecConstants.BIND_REQUEST_SIMPLE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NAME_STATE,
                 LdapStatesEnum.SIMPLE_STATE,
-                LdapConstants.BIND_REQUEST_SIMPLE_TAG,
+                LdapCodecConstants.BIND_REQUEST_SIMPLE_TAG,
                 new StoreSimpleAuth() );
 
         // --------------------------------------------------------------------------------------------
@@ -390,11 +390,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.SIMPLE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.SIMPLE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.SIMPLE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -410,11 +410,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // We have to create an Authentication Object to store the credentials.
-        super.transitions[LdapStatesEnum.NAME_STATE.ordinal()][LdapConstants.BIND_REQUEST_SASL_TAG] =
+        super.transitions[LdapStatesEnum.NAME_STATE.ordinal()][LdapCodecConstants.BIND_REQUEST_SASL_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NAME_STATE,
                 LdapStatesEnum.SASL_STATE,
-                LdapConstants.BIND_REQUEST_SASL_TAG,
+                LdapCodecConstants.BIND_REQUEST_SASL_TAG,
                 new InitSaslBind() );
 
         // --------------------------------------------------------------------------------------------
@@ -454,11 +454,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.MECHANISM_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.MECHANISM_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MECHANISM_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -468,11 +468,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.CREDENTIALS_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.CREDENTIALS_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.CREDENTIALS_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -481,11 +481,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... BindResponse ...
         // BindResponse ::= [APPLICATION 1] SEQUENCE { ...
         // We have to switch to the BindResponse grammar
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.BIND_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.BIND_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.BIND_RESPONSE_STATE,
-                LdapConstants.BIND_RESPONSE_TAG,
+                LdapCodecConstants.BIND_RESPONSE_TAG,
                 new InitBindResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -547,11 +547,11 @@ public final class LdapMessageGrammar<E>
         //     serverSaslCreds [7] OCTET STRING OPTIONAL }
         //
         // Stores the sasl credentials
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapConstants.SERVER_SASL_CREDENTIAL_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapCodecConstants.SERVER_SASL_CREDENTIAL_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_BR_STATE,
                 LdapStatesEnum.SERVER_SASL_CREDENTIALS_STATE,
-                LdapConstants.SERVER_SASL_CREDENTIAL_TAG,
+                LdapCodecConstants.SERVER_SASL_CREDENTIAL_TAG,
                 new StoreServerSASLCreds() );
 
         // --------------------------------------------------------------------------------------------
@@ -562,11 +562,11 @@ public final class LdapMessageGrammar<E>
         //     referral   [3] Referral OPTIONNAL }
         //
         // Initialiaze the referrals list
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_BR_STATE,
                 LdapStatesEnum.REFERRALS_BR_STATE,
-                LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
+                LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
                 new InitReferrals() );
 
         // --------------------------------------------------------------------------------------------
@@ -604,11 +604,11 @@ public final class LdapMessageGrammar<E>
         // URI ::= LDAPString
         //
         // Adda new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_BR_STATE.ordinal()][LdapConstants.SERVER_SASL_CREDENTIAL_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_BR_STATE.ordinal()][LdapCodecConstants.SERVER_SASL_CREDENTIAL_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_BR_STATE,
                 LdapStatesEnum.SERVER_SASL_CREDENTIALS_STATE,
-                LdapConstants.SERVER_SASL_CREDENTIAL_TAG,
+                LdapCodecConstants.SERVER_SASL_CREDENTIAL_TAG,
                 new StoreServerSASLCreds() );
 
         // --------------------------------------------------------------------------------------------
@@ -619,11 +619,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Adda new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_BR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_BR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_BR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -634,11 +634,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         //
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_BR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_BR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -648,11 +648,11 @@ public final class LdapMessageGrammar<E>
         //         ... },
         //     controls       [0] Controls OPTIONAL }
         //
-        super.transitions[LdapStatesEnum.SERVER_SASL_CREDENTIALS_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.SERVER_SASL_CREDENTIALS_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.SERVER_SASL_CREDENTIALS_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -695,11 +695,11 @@ public final class LdapMessageGrammar<E>
         //     referral   [3] Referral OPTIONNAL }
         //
         // Initialize the referrals list
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_STATE.ordinal()][LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_STATE.ordinal()][LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_STATE,
                 LdapStatesEnum.REFERRALS_STATE,
-                LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
+                LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
                 new InitReferrals() );
 
         // --------------------------------------------------------------------------------------------
@@ -738,11 +738,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Adda new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -753,11 +753,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         //
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -767,11 +767,11 @@ public final class LdapMessageGrammar<E>
         // SearchResultEntry ::= [APPLICATION 4] SEQUENCE { ...
         //
         // Initialize the searchResultEntry object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.SEARCH_RESULT_ENTRY_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.SEARCH_RESULT_ENTRY_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.SEARCH_RESULT_ENTRY_STATE,
-                LdapConstants.SEARCH_RESULT_ENTRY_TAG,
+                LdapCodecConstants.SEARCH_RESULT_ENTRY_TAG,
                 new InitSearchResultEntry() );
 
         // --------------------------------------------------------------------------------------------
@@ -833,11 +833,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Initialize the controls
-        super.transitions[LdapStatesEnum.ATTRIBUTES_SR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ATTRIBUTES_SR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ATTRIBUTES_SR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -917,11 +917,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Initialize the controls
-        super.transitions[LdapStatesEnum.VALS_SR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.VALS_SR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.VALS_SR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -963,11 +963,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Initialize the controls
-        super.transitions[LdapStatesEnum.ATTRIBUTE_VALUE_SR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ATTRIBUTE_VALUE_SR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ATTRIBUTE_VALUE_SR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -976,11 +976,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... SearchResultDone ...
         // SearchResultDone ::= [APPLICATION 5] SEQUENCE { ...
         //
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.SEARCH_RESULT_DONE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.SEARCH_RESULT_DONE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.SEARCH_RESULT_DONE_STATE,
-                LdapConstants.SEARCH_RESULT_DONE_TAG,
+                LdapCodecConstants.SEARCH_RESULT_DONE_TAG,
                 new InitSearchResultDone() );
 
         // --------------------------------------------------------------------------------------------
@@ -1008,11 +1008,11 @@ public final class LdapMessageGrammar<E>
         // ModifyRequest ::= [APPLICATION 6] SEQUENCE { ...
         //
         // Creates the Modify Request object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.MODIFY_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.MODIFY_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.MODIFY_REQUEST_STATE,
-                LdapConstants.MODIFY_REQUEST_TAG,
+                LdapCodecConstants.MODIFY_REQUEST_TAG,
                 new InitModifyRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -1191,11 +1191,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Nothing to do
-        super.transitions[LdapStatesEnum.VALS_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.VALS_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.VALS_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1251,11 +1251,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Nothing to do
-        super.transitions[LdapStatesEnum.ATTRIBUTE_VALUE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ATTRIBUTE_VALUE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ATTRIBUTE_VALUE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1264,11 +1264,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... ModifyResponse ...
         // ModifyResponse ::= [APPLICATION 7] SEQUENCE { ...
         // We have to switch to the ModifyResponse grammar
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.MODIFY_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.MODIFY_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.MODIFY_RESPONSE_STATE,
-                LdapConstants.MODIFY_RESPONSE_TAG,
+                LdapCodecConstants.MODIFY_RESPONSE_TAG,
                 new InitModifyResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1296,11 +1296,11 @@ public final class LdapMessageGrammar<E>
         // AddRequest ::= [APPLICATION 8] SEQUENCE { ...
         //
         // Initialize the AddRequest object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.ADD_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.ADD_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.ADD_REQUEST_STATE,
-                LdapConstants.ADD_REQUEST_TAG,
+                LdapCodecConstants.ADD_REQUEST_TAG,
                 new InitAddRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -1429,11 +1429,11 @@ public final class LdapMessageGrammar<E>
         // AttributeList ::= SEQUENCE OF SEQUENCE {
         //
         // Initialize the controls
-        super.transitions[LdapStatesEnum.VALUE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.VALUE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.VALUE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1442,11 +1442,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... AddResponse ...
         // AddResponse ::= [APPLICATION 9] LDAPResult
         //
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.ADD_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.ADD_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.ADD_RESPONSE_STATE,
-                LdapConstants.ADD_RESPONSE_TAG,
+                LdapCodecConstants.ADD_RESPONSE_TAG,
                 new InitAddResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1473,11 +1473,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... DelResponse ...
         // DelResponse ::= [APPLICATION 11] LDAPResult
         // We have to switch to the DelResponse grammar
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.DEL_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.DEL_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.DEL_RESPONSE_STATE,
-                LdapConstants.DEL_RESPONSE_TAG,
+                LdapCodecConstants.DEL_RESPONSE_TAG,
                 new InitDelResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1505,11 +1505,11 @@ public final class LdapMessageGrammar<E>
         // ModifyDNRequest ::= [APPLICATION 12] SEQUENCE { ...
         //
         // Create the ModifyDNRequest Object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.MODIFY_DN_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.MODIFY_DN_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.MODIFY_DN_REQUEST_STATE,
-                LdapConstants.MODIFY_DN_REQUEST_TAG,
+                LdapCodecConstants.MODIFY_DN_REQUEST_TAG,
                 new InitModifyDnRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -1569,11 +1569,11 @@ public final class LdapMessageGrammar<E>
         //     newSuperior [0] LDAPDN OPTIONAL }
         //
         // Stores the new superior
-        super.transitions[LdapStatesEnum.DELETE_OLD_RDN_STATE.ordinal()][LdapConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG] =
+        super.transitions[LdapStatesEnum.DELETE_OLD_RDN_STATE.ordinal()][LdapCodecConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.DELETE_OLD_RDN_STATE,
                 LdapStatesEnum.NEW_SUPERIOR_STATE,
-                LdapConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG,
+                LdapCodecConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG,
                 new StoreModifyDnRequestNewSuperior() );
 
         // --------------------------------------------------------------------------------------------
@@ -1584,11 +1584,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Stores the new superior
-        super.transitions[LdapStatesEnum.DELETE_OLD_RDN_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.DELETE_OLD_RDN_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.DELETE_OLD_RDN_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1599,11 +1599,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Stores the new superior
-        super.transitions[LdapStatesEnum.NEW_SUPERIOR_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.NEW_SUPERIOR_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NEW_SUPERIOR_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1613,11 +1613,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Creates the ModifyDNResponse
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.MODIFY_DN_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.MODIFY_DN_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.MODIFY_DN_RESPONSE_STATE,
-                LdapConstants.MODIFY_DN_RESPONSE_TAG,
+                LdapCodecConstants.MODIFY_DN_RESPONSE_TAG,
                 new InitModifyDnResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1649,11 +1649,11 @@ public final class LdapMessageGrammar<E>
         // ...
         //
         // Initialize the Compare Request object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.COMPARE_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.COMPARE_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.COMPARE_REQUEST_STATE,
-                LdapConstants.COMPARE_REQUEST_TAG,
+                LdapCodecConstants.COMPARE_REQUEST_TAG,
                 new InitCompareRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -1731,11 +1731,11 @@ public final class LdapMessageGrammar<E>
         // AssertionValue OCTET STRING
         //
         // Stores the attribute value
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1744,11 +1744,11 @@ public final class LdapMessageGrammar<E>
         // LdapMessage ::= ... CompareResponse ...
         // CompareResponse ::= [APPLICATION 15] LDAPResult
         // We have to switch to the CompareResponse grammar
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.COMPARE_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.COMPARE_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.COMPARE_RESPONSE_STATE,
-                LdapConstants.COMPARE_RESPONSE_TAG,
+                LdapCodecConstants.COMPARE_RESPONSE_TAG,
                 new InitCompareResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1776,11 +1776,11 @@ public final class LdapMessageGrammar<E>
         // SearchResultReference ::= [APPLICATION 19] SEQUENCE OF LDAPURL
         //
         // Initialization of SearchResultReference object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.SEARCH_RESULT_REFERENCE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.SEARCH_RESULT_REFERENCE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.SEARCH_RESULT_REFERENCE_STATE,
-                LdapConstants.SEARCH_RESULT_REFERENCE_TAG,
+                LdapCodecConstants.SEARCH_RESULT_REFERENCE_TAG,
                 new InitSearchResultReference() );
 
         // --------------------------------------------------------------------------------------------
@@ -1819,11 +1819,11 @@ public final class LdapMessageGrammar<E>
         // controls   [0] Controls OPTIONAL }
         //
         // Initialization the controls
-        super.transitions[LdapStatesEnum.REFERENCE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REFERENCE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERENCE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1833,11 +1833,11 @@ public final class LdapMessageGrammar<E>
         // ExtendedRequest ::= [APPLICATION 23] SEQUENCE {
         //
         // Creates the ExtendedRequest object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.EXTENDED_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.EXTENDED_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.EXTENDED_REQUEST_STATE,
-                LdapConstants.EXTENDED_REQUEST_TAG,
+                LdapCodecConstants.EXTENDED_REQUEST_TAG,
                 new InitExtendedRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -1848,11 +1848,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Stores the name
-        super.transitions[LdapStatesEnum.EXTENDED_REQUEST_STATE.ordinal()][LdapConstants.EXTENDED_REQUEST_NAME_TAG] =
+        super.transitions[LdapStatesEnum.EXTENDED_REQUEST_STATE.ordinal()][LdapCodecConstants.EXTENDED_REQUEST_NAME_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.EXTENDED_REQUEST_STATE,
                 LdapStatesEnum.REQUEST_NAME_STATE,
-                LdapConstants.EXTENDED_REQUEST_NAME_TAG,
+                LdapCodecConstants.EXTENDED_REQUEST_NAME_TAG,
                 new StoreExtendedRequestName() );
 
         // --------------------------------------------------------------------------------------------
@@ -1863,11 +1863,11 @@ public final class LdapMessageGrammar<E>
         //     requestValue  [1] OCTET STRING OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.REQUEST_NAME_STATE.ordinal()][LdapConstants.EXTENDED_REQUEST_VALUE_TAG] =
+        super.transitions[LdapStatesEnum.REQUEST_NAME_STATE.ordinal()][LdapCodecConstants.EXTENDED_REQUEST_VALUE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REQUEST_NAME_STATE,
                 LdapStatesEnum.REQUEST_VALUE_STATE,
-                LdapConstants.EXTENDED_REQUEST_VALUE_TAG,
+                LdapCodecConstants.EXTENDED_REQUEST_VALUE_TAG,
                 new StoreExtendedRequestValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -1878,11 +1878,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.REQUEST_NAME_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REQUEST_NAME_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REQUEST_NAME_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1893,11 +1893,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.REQUEST_VALUE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REQUEST_VALUE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REQUEST_VALUE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -1907,11 +1907,11 @@ public final class LdapMessageGrammar<E>
         // ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
         //
         // Creates the ExtendeResponse object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.EXTENDED_RESPONSE_STATE,
-                LdapConstants.EXTENDED_RESPONSE_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_TAG,
                 new InitExtendedResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -1971,11 +1971,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         //
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_ER_STATE,
                 LdapStatesEnum.REFERRALS_ER_STATE,
-                LdapConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
+                LdapCodecConstants.LDAP_RESULT_REFERRAL_SEQUENCE_TAG,
                 new InitReferrals() );
 
         // --------------------------------------------------------------------------------------------
@@ -2013,11 +2013,11 @@ public final class LdapMessageGrammar<E>
         // URI ::= LDAPString
         //
         // Adda new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_ER_STATE,
                 LdapStatesEnum.RESPONSE_NAME_STATE,
-                LdapConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG,
                 new StoreExtendedResponseName() );
 
         // --------------------------------------------------------------------------------------------
@@ -2027,11 +2027,11 @@ public final class LdapMessageGrammar<E>
         // URI ::= LDAPString
         //
         // Add a new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_ER_STATE,
                 LdapStatesEnum.RESPONSE_STATE,
-                LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
                 new StoreExtendedResponseValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -2042,11 +2042,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Adda new Referral
-        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.REFERRAL_ER_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.REFERRAL_ER_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -2058,11 +2058,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         //
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_ER_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -2075,11 +2075,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Stores the response name
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_ER_STATE,
                 LdapStatesEnum.RESPONSE_NAME_STATE,
-                LdapConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_NAME_TAG,
                 new StoreExtendedResponseName() );
 
         // --------------------------------------------------------------------------------------------
@@ -2092,11 +2092,11 @@ public final class LdapMessageGrammar<E>
         //     response       [11] OCTET STRING OPTIONAL}
         //
         // Stores the response
-        super.transitions[LdapStatesEnum.RESPONSE_NAME_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.RESPONSE_NAME_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.RESPONSE_NAME_STATE,
                 LdapStatesEnum.RESPONSE_STATE,
-                LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
                 new StoreExtendedResponseValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -2107,11 +2107,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Init the controls
-        super.transitions[LdapStatesEnum.RESPONSE_NAME_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.RESPONSE_NAME_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.RESPONSE_NAME_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -2124,11 +2124,11 @@ public final class LdapMessageGrammar<E>
         //     response       [11] OCTET STRING OPTIONAL}
         //
         // Stores the response
-        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.ERROR_MESSAGE_ER_STATE.ordinal()][LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ERROR_MESSAGE_ER_STATE,
                 LdapStatesEnum.RESPONSE_STATE,
-                LdapConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
+                LdapCodecConstants.EXTENDED_RESPONSE_RESPONSE_TAG,
                 new StoreExtendedResponseValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -2139,11 +2139,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Init the controls
-        super.transitions[LdapStatesEnum.RESPONSE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.RESPONSE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.RESPONSE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -2153,11 +2153,11 @@ public final class LdapMessageGrammar<E>
         // IntermediateResponse ::= [APPLICATION 25] SEQUENCE {
         //
         // Creates the IntermediateResponse object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.INTERMEDIATE_RESPONSE_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.INTERMEDIATE_RESPONSE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE,
-                LdapConstants.INTERMEDIATE_RESPONSE_TAG,
+                LdapCodecConstants.INTERMEDIATE_RESPONSE_TAG,
                 new InitIntermediateResponse() );
 
         // --------------------------------------------------------------------------------------------
@@ -2168,11 +2168,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Stores the name
-        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE.ordinal()][LdapConstants.INTERMEDIATE_RESPONSE_NAME_TAG] =
+        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE.ordinal()][LdapCodecConstants.INTERMEDIATE_RESPONSE_NAME_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE,
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE,
-                LdapConstants.INTERMEDIATE_RESPONSE_NAME_TAG,
+                LdapCodecConstants.INTERMEDIATE_RESPONSE_NAME_TAG,
                 new StoreIntermediateResponseName() );
 
         // --------------------------------------------------------------------------------------------
@@ -2184,11 +2184,11 @@ public final class LdapMessageGrammar<E>
         //     }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE.ordinal()][LdapConstants.INTERMEDIATE_RESPONSE_VALUE_TAG] =
+        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE.ordinal()][LdapCodecConstants.INTERMEDIATE_RESPONSE_VALUE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_STATE,
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_VALUE_STATE,
-                LdapConstants.INTERMEDIATE_RESPONSE_VALUE_TAG,
+                LdapCodecConstants.INTERMEDIATE_RESPONSE_VALUE_TAG,
                 new StoreIntermediateResponseValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -2199,11 +2199,11 @@ public final class LdapMessageGrammar<E>
         //     responseValue  [1] OCTET STRING OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE.ordinal()][LdapConstants.INTERMEDIATE_RESPONSE_VALUE_TAG] =
+        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE.ordinal()][LdapCodecConstants.INTERMEDIATE_RESPONSE_VALUE_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE,
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_VALUE_STATE,
-                LdapConstants.INTERMEDIATE_RESPONSE_VALUE_TAG,
+                LdapCodecConstants.INTERMEDIATE_RESPONSE_VALUE_TAG,
                 new StoreIntermediateResponseValue() );
 
         // --------------------------------------------------------------------------------------------
@@ -2214,11 +2214,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_NAME_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // --------------------------------------------------------------------------------------------
@@ -2229,11 +2229,11 @@ public final class LdapMessageGrammar<E>
         //     controls       [0] Controls OPTIONAL }
         //
         // Stores the value
-        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_VALUE_STATE.ordinal()][LdapConstants.CONTROLS_TAG] =
+        super.transitions[LdapStatesEnum.INTERMEDIATE_RESPONSE_VALUE_STATE.ordinal()][LdapCodecConstants.CONTROLS_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.INTERMEDIATE_RESPONSE_VALUE_STATE,
                 LdapStatesEnum.CONTROLS_STATE,
-                LdapConstants.CONTROLS_TAG,
+                LdapCodecConstants.CONTROLS_TAG,
                 new InitControls() );
 
         // ============================================================================================
@@ -2363,11 +2363,11 @@ public final class LdapMessageGrammar<E>
         // SearchRequest ::= [APPLICATION 3] SEQUENCE { ...
         //
         // Initialize the searchRequest object
-        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapConstants.SEARCH_REQUEST_TAG] =
+        super.transitions[LdapStatesEnum.MESSAGE_ID_STATE.ordinal()][LdapCodecConstants.SEARCH_REQUEST_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.MESSAGE_ID_STATE,
                 LdapStatesEnum.SEARCH_REQUEST_STATE,
-                LdapConstants.SEARCH_REQUEST_TAG,
+                LdapCodecConstants.SEARCH_REQUEST_TAG,
                 new InitSearchRequest() );
 
         // --------------------------------------------------------------------------------------------
@@ -2549,11 +2549,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init AND filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.AND_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.AND_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.AND_STATE,
-                LdapConstants.AND_FILTER_TAG,
+                LdapCodecConstants.AND_FILTER_TAG,
                 new InitAndFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2570,11 +2570,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init OR filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.OR_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.OR_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.OR_STATE,
-                LdapConstants.OR_FILTER_TAG,
+                LdapCodecConstants.OR_FILTER_TAG,
                 new InitOrFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2591,11 +2591,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.NOT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.NOT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.NOT_STATE,
-                LdapConstants.NOT_FILTER_TAG,
+                LdapCodecConstants.NOT_FILTER_TAG,
                 new InitNotFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2612,11 +2612,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Equality filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.EQUALITY_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.EQUALITY_MATCH_STATE,
-                LdapConstants.EQUALITY_MATCH_FILTER_TAG,
+                LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG,
                 new InitEqualityMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2633,11 +2633,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Substrings filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.SUBSTRINGS_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.SUBSTRINGS_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.SUBSTRING_FILTER_STATE,
-                LdapConstants.SUBSTRINGS_FILTER_TAG,
+                LdapCodecConstants.SUBSTRINGS_FILTER_TAG,
                 new InitSubstringsFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2654,11 +2654,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Greater Or Equal filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.GREATER_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.GREATER_OR_EQUAL_STATE,
-                LdapConstants.GREATER_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG,
                 new InitGreaterOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2675,11 +2675,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Less Or Equal filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.LESS_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.LESS_OR_EQUAL_STATE,
-                LdapConstants.LESS_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG,
                 new InitLessOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2696,11 +2696,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Present Match filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.PRESENT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.PRESENT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.PRESENT_STATE,
-                LdapConstants.PRESENT_FILTER_TAG,
+                LdapCodecConstants.PRESENT_FILTER_TAG,
                 new InitPresentFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2717,11 +2717,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.APPROX_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.APPROX_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.APPROX_MATCH_STATE,
-                LdapConstants.APPROX_MATCH_FILTER_TAG,
+                LdapCodecConstants.APPROX_MATCH_FILTER_TAG,
                 new InitApproxMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2738,11 +2738,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Extensible Match filter
-        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.TYPES_ONLY_STATE.ordinal()][LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.TYPES_ONLY_STATE,
                 LdapStatesEnum.EXTENSIBLE_MATCH_STATE,
-                LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG,
+                LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG,
                 new InitExtensibleMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2758,11 +2758,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init AND filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.AND_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.AND_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.AND_STATE,
-                LdapConstants.AND_FILTER_TAG,
+                LdapCodecConstants.AND_FILTER_TAG,
                 new InitAndFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2779,11 +2779,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init OR filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.OR_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.OR_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.OR_STATE,
-                LdapConstants.OR_FILTER_TAG,
+                LdapCodecConstants.OR_FILTER_TAG,
                 new InitOrFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2800,11 +2800,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.NOT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.NOT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.NOT_STATE,
-                LdapConstants.NOT_FILTER_TAG,
+                LdapCodecConstants.NOT_FILTER_TAG,
                 new InitNotFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2821,11 +2821,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.EQUALITY_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.EQUALITY_MATCH_STATE,
-                LdapConstants.EQUALITY_MATCH_FILTER_TAG,
+                LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG,
                 new InitEqualityMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2842,11 +2842,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Substrings filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.SUBSTRINGS_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.SUBSTRINGS_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.SUBSTRING_FILTER_STATE,
-                LdapConstants.SUBSTRINGS_FILTER_TAG,
+                LdapCodecConstants.SUBSTRINGS_FILTER_TAG,
                 new InitSubstringsFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2863,11 +2863,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Greater Or Equal filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.GREATER_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.GREATER_OR_EQUAL_STATE,
-                LdapConstants.GREATER_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG,
                 new InitGreaterOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2884,11 +2884,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Less Or Equal filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.LESS_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.LESS_OR_EQUAL_STATE,
-                LdapConstants.LESS_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG,
                 new InitLessOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2905,11 +2905,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.PRESENT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.PRESENT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.PRESENT_STATE,
-                LdapConstants.PRESENT_FILTER_TAG,
+                LdapCodecConstants.PRESENT_FILTER_TAG,
                 new InitPresentFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2926,11 +2926,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.APPROX_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.APPROX_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.APPROX_MATCH_STATE,
-                LdapConstants.APPROX_MATCH_FILTER_TAG,
+                LdapCodecConstants.APPROX_MATCH_FILTER_TAG,
                 new InitApproxMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2947,11 +2947,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.AND_STATE.ordinal()][LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.AND_STATE,
                 LdapStatesEnum.EXTENSIBLE_MATCH_STATE,
-                LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG,
+                LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG,
                 new InitExtensibleMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2967,11 +2967,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init AND filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.AND_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.AND_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.AND_STATE,
-                LdapConstants.AND_FILTER_TAG,
+                LdapCodecConstants.AND_FILTER_TAG,
                 new InitAndFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -2988,11 +2988,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init OR filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.OR_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.OR_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.OR_STATE,
-                LdapConstants.OR_FILTER_TAG,
+                LdapCodecConstants.OR_FILTER_TAG,
                 new InitOrFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3009,11 +3009,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.NOT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.NOT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.NOT_STATE,
-                LdapConstants.NOT_FILTER_TAG,
+                LdapCodecConstants.NOT_FILTER_TAG,
                 new InitNotFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3030,11 +3030,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.EQUALITY_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.EQUALITY_MATCH_STATE,
-                LdapConstants.EQUALITY_MATCH_FILTER_TAG,
+                LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG,
                 new InitEqualityMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3051,11 +3051,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Substrings filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.SUBSTRINGS_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.SUBSTRINGS_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.SUBSTRING_FILTER_STATE,
-                LdapConstants.SUBSTRINGS_FILTER_TAG,
+                LdapCodecConstants.SUBSTRINGS_FILTER_TAG,
                 new InitSubstringsFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3072,11 +3072,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Greater Or Equal filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.GREATER_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.GREATER_OR_EQUAL_STATE,
-                LdapConstants.GREATER_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG,
                 new InitGreaterOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3093,11 +3093,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Less Or Equal filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.LESS_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.LESS_OR_EQUAL_STATE,
-                LdapConstants.LESS_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG,
                 new InitLessOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3114,11 +3114,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.PRESENT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.PRESENT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.PRESENT_STATE,
-                LdapConstants.PRESENT_FILTER_TAG,
+                LdapCodecConstants.PRESENT_FILTER_TAG,
                 new InitPresentFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3135,11 +3135,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.APPROX_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.APPROX_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.APPROX_MATCH_STATE,
-                LdapConstants.APPROX_MATCH_FILTER_TAG,
+                LdapCodecConstants.APPROX_MATCH_FILTER_TAG,
                 new InitApproxMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3156,11 +3156,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.OR_STATE.ordinal()][LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.OR_STATE,
                 LdapStatesEnum.EXTENSIBLE_MATCH_STATE,
-                LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG,
+                LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG,
                 new InitExtensibleMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3176,11 +3176,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init AND filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.AND_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.AND_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.AND_STATE,
-                LdapConstants.AND_FILTER_TAG,
+                LdapCodecConstants.AND_FILTER_TAG,
                 new InitAndFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3197,11 +3197,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init OR filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.OR_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.OR_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.OR_STATE,
-                LdapConstants.OR_FILTER_TAG,
+                LdapCodecConstants.OR_FILTER_TAG,
                 new InitOrFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3218,11 +3218,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.NOT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.NOT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.NOT_STATE,
-                LdapConstants.NOT_FILTER_TAG,
+                LdapCodecConstants.NOT_FILTER_TAG,
                 new InitNotFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3239,11 +3239,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.EQUALITY_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.EQUALITY_MATCH_STATE,
-                LdapConstants.EQUALITY_MATCH_FILTER_TAG,
+                LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG,
                 new InitEqualityMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3260,11 +3260,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Substrings filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.SUBSTRINGS_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.SUBSTRINGS_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.SUBSTRING_FILTER_STATE,
-                LdapConstants.SUBSTRINGS_FILTER_TAG,
+                LdapCodecConstants.SUBSTRINGS_FILTER_TAG,
                 new InitSubstringsFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3281,11 +3281,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Greater Or Equal filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.GREATER_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.GREATER_OR_EQUAL_STATE,
-                LdapConstants.GREATER_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG,
                 new InitGreaterOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3302,11 +3302,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Less Or Equal filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.LESS_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.LESS_OR_EQUAL_STATE,
-                LdapConstants.LESS_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG,
                 new InitLessOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3323,11 +3323,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init present filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.PRESENT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.PRESENT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.PRESENT_STATE,
-                LdapConstants.PRESENT_FILTER_TAG,
+                LdapCodecConstants.PRESENT_FILTER_TAG,
                 new InitPresentFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3344,11 +3344,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Approx Match filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.APPROX_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.APPROX_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.APPROX_MATCH_STATE,
-                LdapConstants.APPROX_MATCH_FILTER_TAG,
+                LdapCodecConstants.APPROX_MATCH_FILTER_TAG,
                 new InitApproxMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3365,11 +3365,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init extensible match filter
-        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.NOT_STATE.ordinal()][LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.NOT_STATE,
                 LdapStatesEnum.EXTENSIBLE_MATCH_STATE,
-                LdapConstants.EXTENSIBLE_MATCH_FILTER_TAG,
+                LdapCodecConstants.EXTENSIBLE_MATCH_FILTER_TAG,
                 new InitExtensibleMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3425,11 +3425,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init AND filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.AND_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.AND_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.AND_STATE,
-                LdapConstants.AND_FILTER_TAG,
+                LdapCodecConstants.AND_FILTER_TAG,
                 new InitAndFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3446,11 +3446,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init OR filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.OR_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.OR_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.OR_STATE,
-                LdapConstants.OR_FILTER_TAG,
+                LdapCodecConstants.OR_FILTER_TAG,
                 new InitOrFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3467,11 +3467,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.NOT_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.NOT_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.NOT_STATE,
-                LdapConstants.NOT_FILTER_TAG,
+                LdapCodecConstants.NOT_FILTER_TAG,
                 new InitNotFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3488,11 +3488,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init NOT filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.EQUALITY_MATCH_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.EQUALITY_MATCH_STATE,
-                LdapConstants.EQUALITY_MATCH_FILTER_TAG,
+                LdapCodecConstants.EQUALITY_MATCH_FILTER_TAG,
                 new InitEqualityMatchFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3509,11 +3509,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Substrings filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.SUBSTRINGS_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.SUBSTRINGS_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.SUBSTRING_FILTER_STATE,
-                LdapConstants.SUBSTRINGS_FILTER_TAG,
+                LdapCodecConstants.SUBSTRINGS_FILTER_TAG,
                 new InitSubstringsFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3530,11 +3530,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Greater Or Equal filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.GREATER_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.GREATER_OR_EQUAL_STATE,
-                LdapConstants.GREATER_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.GREATER_OR_EQUAL_FILTER_TAG,
                 new InitGreaterOrEqualFilter() );
 
         // --------------------------------------------------------------------------------------------
@@ -3551,11 +3551,11 @@ public final class LdapMessageGrammar<E>
         //     ...
         //
         // Init Less Or Equal filter
-        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapConstants.LESS_OR_EQUAL_FILTER_TAG] =
+        super.transitions[LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE.ordinal()][LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG] =
             new GrammarTransition(
                 LdapStatesEnum.ASSERTION_VALUE_FILTER_STATE,
                 LdapStatesEnum.LESS_OR_EQUAL_STATE,
-                LdapConstants.LESS_OR_EQUAL_FILTER_TAG,
+                LdapCodecConstants.LESS_OR_EQUAL_FILTER_TAG,

[... 1108 lines stripped ...]