From 753375c584b189d2ebd677e27439e3fa9f655ffa Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Tue, 24 Mar 2026 12:25:24 +0300
Subject: [PATCH 1/8] IGNITE-28307 Message Id deduplication

---
 .../message/CalciteMessageFactory.java        |   9 +-
 .../query/calcite/message/MessageType.java    |  54 +--
 .../internal/MessageSerializerGenerator.java  |  69 ++-
 .../query/index/IndexKeyTypeMessage.java      |   1 +
 .../communication/GridIoMessageFactory.java   | 402 +++++++++---------
 .../GridIoSecurityAwareMessage.java           |   1 +
 .../IgniteMessageFactoryImpl.java             |   4 +
 .../communication/SessionChannelMessage.java  |   1 +
 .../discovery/DiscoveryMessageFactory.java    | 209 +++++----
 .../binary/BinaryMetadataVersionInfo.java     |   1 +
 .../TransactionAttributesAwareRequest.java    |   1 +
 ...omicApplicationAttributesAwareRequest.java |   1 +
 .../CachePartitionFullCountersMap.java        |   1 +
 .../CachePartitionPartialCountersMap.java     |   1 +
 .../preloader/CachePartitionsToReloadMap.java |   1 +
 .../preloader/GridDhtPartitionFullMap.java    |   1 +
 .../dht/preloader/GridDhtPartitionMap.java    |   1 +
 .../dht/preloader/GroupPartitionIdPair.java   |   1 +
 .../IgniteDhtDemandedPartitionsMap.java       |   1 +
 .../IgniteDhtPartitionCountersMap.java        |   1 +
 ...IgniteDhtPartitionHistorySuppliersMap.java |   1 +
 .../IgniteDhtPartitionsToReloadMap.java       |   1 +
 .../distributed/dht/preloader/IntLongMap.java |   1 +
 .../preloader/PartitionReservationsMap.java   |   1 +
 .../dht/preloader/PartitionsToReload.java     |   1 +
 .../IncrementalSnapshotAwareMessage.java      |   1 +
 .../snapshot/SnapshotFilesFailureMessage.java |   1 +
 .../snapshot/SnapshotFilesRequestMessage.java |   1 +
 .../cluster/CacheMetricsMessage.java          |   1 +
 .../cluster/ClusterMetricsUpdateMessage.java  |   1 +
 .../cluster/NodeFullMetricsMessage.java       |   1 +
 .../cluster/NodeMetricsMessage.java           |   1 +
 .../query/messages/GridQueryKillRequest.java  |   1 +
 .../query/messages/GridQueryKillResponse.java |   1 +
 .../stat/messages/StatisticsColumnData.java   |   1 +
 .../messages/StatisticsDecimalMessage.java    |   1 +
 .../stat/messages/StatisticsKeyMessage.java   |   1 +
 .../stat/messages/StatisticsObjectData.java   |   1 +
 .../stat/messages/StatisticsRequest.java      |   1 +
 .../stat/messages/StatisticsResponse.java     |   1 +
 .../internal/util/GridPartitionStateMap.java  |   1 +
 .../util/distributed/SingleNodeMessage.java   |   1 +
 .../extensions/communication/Message.java     |   1 +
 .../communication/MessageFactory.java         |  18 +
 .../communication/MessageSerializer.java      |   7 +
 .../tcp/TcpCommunicationSpi.java              |   4 +
 .../tcp/internal/GridNioServerWrapper.java    |   2 +-
 .../distributed/MessagesPluginProvider.java   |   4 +-
 .../msg/GridH2ValueMessageFactory.java        |  56 +--
 49 files changed, 475 insertions(+), 400 deletions(-)

diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
index f78b7e39959fd..7341d60038f8f 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
@@ -28,13 +28,8 @@ public class CalciteMessageFactory implements MessageFactoryProvider {
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override public void registerAll(MessageFactory factory) {
-        for (MessageType type : MessageType.values()) {
-            // TODO: Temporary check — remove once all inheritors have migrated to the new serialization framework
-            if (type.serializer() != null)
-                factory.register(type.directType(), (Supplier)type.factory(), type.serializer());
-            else
-                factory.register(type.directType(), (Supplier)type.factory());
-        }
+        for (MessageType type : MessageType.values())
+            factory.register((Supplier)type.factory(), type.serializer());
     }
 
     /**
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
index 44438a8d4892b..001b7ac00832d 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
@@ -31,82 +31,68 @@
  */
 public enum MessageType {
     /** */
-    QUERY_START_REQUEST(300, QueryStartRequest::new, new QueryStartRequestSerializer()),
+    QUERY_START_REQUEST(QueryStartRequest::new, new QueryStartRequestSerializer(300)),
 
     /** */
-    QUERY_START_RESPONSE(301, QueryStartResponse::new, new QueryStartResponseSerializer()),
+    QUERY_START_RESPONSE(QueryStartResponse::new, new QueryStartResponseSerializer(301)),
 
     /** */
-    QUERY_ERROR_MESSAGE(302, CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
+    QUERY_ERROR_MESSAGE(CalciteErrorMessage::new, new CalciteErrorMessageSerializer(302)),
 
     /** */
-    QUERY_BATCH_MESSAGE(303, QueryBatchMessage::new, new QueryBatchMessageSerializer()),
+    QUERY_BATCH_MESSAGE(QueryBatchMessage::new, new QueryBatchMessageSerializer(303)),
 
     /** */
-    QUERY_ACKNOWLEDGE_MESSAGE(304, QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
+    QUERY_ACKNOWLEDGE_MESSAGE(QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer(304)),
 
     /** */
-    QUERY_INBOX_CANCEL_MESSAGE(305, InboxCloseMessage::new, new InboxCloseMessageSerializer()),
+    QUERY_INBOX_CANCEL_MESSAGE(InboxCloseMessage::new, new InboxCloseMessageSerializer(305)),
 
     /** */
-    QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new, new QueryCloseMessageSerializer()),
+    QUERY_CLOSE_MESSAGE(QueryCloseMessage::new, new QueryCloseMessageSerializer(306)),
 
     /** */
-    GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new, new GenericValueMessageSerializer()),
+    GENERIC_VALUE_MESSAGE(GenericValueMessage::new, new GenericValueMessageSerializer(307)),
 
     /** */
-    FRAGMENT_MAPPING(350, FragmentMapping::new, new FragmentMappingSerializer()),
+    FRAGMENT_MAPPING(FragmentMapping::new, new FragmentMappingSerializer(350)),
 
     /** */
-    COLOCATION_GROUP(351, ColocationGroup::new, new ColocationGroupSerializer()),
+    COLOCATION_GROUP(ColocationGroup::new, new ColocationGroupSerializer(351)),
 
     /** */
-    FRAGMENT_DESCRIPTION(352, FragmentDescription::new, new FragmentDescriptionSerializer()),
+    FRAGMENT_DESCRIPTION(FragmentDescription::new, new FragmentDescriptionSerializer(352)),
 
     /** */
-    QUERY_TX_ENTRY(353, QueryTxEntry::new, new QueryTxEntrySerializer());
-
-    /** */
-    private final int directType;
+    QUERY_TX_ENTRY(QueryTxEntry::new, new QueryTxEntrySerializer(353));
 
     /** */
     private final Supplier<CalciteMessage> factory;
 
     /** */
-    private MessageSerializer serializer;
-
-    /**
-     * @param directType Message direct type.
-     * @param factory Message factory.
-     */
-    MessageType(int directType, Supplier<CalciteMessage> factory) {
-        this.directType = directType;
-        this.factory = factory;
-    }
+    private final MessageSerializer serializer;
 
     /**
-     * @param directType Message direct type.
      * @param factory Message factory.
      * @param serializer Message serializer.
      */
-    MessageType(int directType, Supplier<CalciteMessage> factory, MessageSerializer serializer) {
-        this.directType = directType;
+    MessageType(Supplier<CalciteMessage> factory, MessageSerializer serializer) {
         this.factory = factory;
         this.serializer = serializer;
     }
 
     /**
-     * @return Message direct type;
+     * @return Message factory.
      */
-    public short directType() {
-        return (short)directType;
+    public Supplier<CalciteMessage> factory() {
+        return factory;
     }
 
     /**
-     * @return Message factory.
+     * @return Message direct type.
      */
-    public Supplier<CalciteMessage> factory() {
-        return factory;
+    public short directType() {
+        return serializer.directType();
     }
 
     /**
diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
index fef259eec6a08..18e4a9fab0816 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
@@ -170,6 +170,8 @@ private String generateSerializerCode(String serClsName) throws IOException {
             fields.add("private final ClassLoader clsLdr;");
         }
 
+        fields.add("private final short directType;");
+
         try (Writer writer = new StringWriter()) {
             writeClassHeader(writer, env.getElementUtils().getPackageOf(type).toString(), serClsName);
 
@@ -189,6 +191,24 @@ private String generateSerializerCode(String serClsName) throws IOException {
 
             writer.write(TAB + "}" + NL);
 
+            ++indent;
+
+            writer.write(NL);
+            writer.write(identedLine("@Override public short directType() {"));
+            writer.write(NL);
+
+            ++indent;
+
+            writer.write(identedLine("return directType;"));
+            writer.write(NL);
+
+            --indent;
+
+            writer.write(identedLine("}"));
+            writer.write(NL);
+
+            --indent;
+
             writer.write("}");
 
             writer.write(NL);
@@ -199,22 +219,37 @@ private String generateSerializerCode(String serClsName) throws IOException {
 
     /** */
     private void writeConstructor(Writer writer, String serClsName) throws IOException {
-        if (!marshallableMessage())
-            return;
-
         ++indent;
 
-        writer.write(identedLine(METHOD_JAVADOC));
-        writer.write(NL);
-        writer.write(identedLine("public " + serClsName + "(Marshaller marshaller, ClassLoader clsLdr) {"));
+        if (marshallableMessage()) {
+            writer.write(identedLine(METHOD_JAVADOC));
+            writer.write(NL);
+            writer.write(identedLine("public " + serClsName + "(Marshaller marshaller, ClassLoader clsLdr, int directType) {"));
 
-        writer.write(NL);
+            writer.write(NL);
 
-        ++indent;
+            ++indent;
 
-        writer.write(identedLine("this.marshaller = marshaller;"));
-        writer.write(NL);
-        writer.write(identedLine("this.clsLdr = clsLdr;"));
+            writer.write(identedLine("this.marshaller = marshaller;"));
+            writer.write(NL);
+            writer.write(identedLine("this.clsLdr = clsLdr;"));
+            writer.write(NL);
+            writer.write(identedLine("this.directType = (short)directType;"));
+            writer.write(NL);
+        }
+        else {
+            writer.write(identedLine(METHOD_JAVADOC));
+            writer.write(NL);
+            writer.write(identedLine("public " + serClsName + "(int directType) {"));
+
+            writer.write(NL);
+
+            ++indent;
+
+            writer.write(identedLine("this.directType = (short)directType;"));
+            writer.write(NL);
+
+        }
 
         --indent;
 
@@ -249,7 +284,7 @@ private void generateMethods(List<VariableElement> fields) throws Exception {
      * <pre>
      *     public boolean writeTo(Message m, MessageWriter writer) {
      *         if (!writer.isHeaderWritten()) {
-     *             if (!writer.writeHeader(msg.directType()))
+     *             if (!writer.writeHeader(directType))
      *                 return false;
      *
      *             writer.onHeaderWritten();
@@ -275,7 +310,7 @@ private void start(Collection<String> code, boolean write) {
 
             indent++;
 
-            returnFalseIfWriteFailed(code, "writer.writeHeader", "directType()");
+            returnFalseIfWriteFailed(code, "writer.writeHeader");
 
             if (write && marshallableMessage()) {
                 imports.add("org.apache.ignite.IgniteCheckedException");
@@ -531,14 +566,12 @@ private String typeNameToFieldName(String typeName) {
     /**
      * Generate code of writing header.
      * <pre>
-     * if (!writer.writeHeader(msg.directType()))
+     * if (!writer.writeHeader(directType))
      *     return false;
      * </pre>
      */
-    private void returnFalseIfWriteFailed(Collection<String> code, String accessor, @Nullable String... args) {
-        String argsStr = String.join(", ", args);
-
-        code.add(identedLine("if (!%s(msg.%s))", accessor, argsStr));
+    private void returnFalseIfWriteFailed(Collection<String> code, String accessor) {
+        code.add(identedLine("if (!%s(directType))", accessor));
 
         indent++;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
index b21289fcc04be..460a0f5814aa5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
@@ -28,6 +28,7 @@
 /** Message wrapper for {@link IndexKeyType}. */
 public class IndexKeyTypeMessage implements MarshallableMessage {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 516;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 978f4e0f584ad..50e20f61cd36b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -396,217 +396,215 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         // -54 is reserved for SQL.
         // We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
         factory.register(CompressedMessage.TYPE_CODE, CompressedMessage::new);
-        factory.register((short)-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)-65, TxInfo::new, new TxInfoSerializer());
-        factory.register((short)-64, TxEntriesInfo::new, new TxEntriesInfoSerializer());
-        factory.register((short)-63, ExchangeInfo::new, new ExchangeInfoSerializer());
-        factory.register((short)-62, IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer());
-        factory.register((short)-61, IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer());
-        factory.register((short)-53, SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer());
-        factory.register((short)-51, NearCacheUpdates::new, new NearCacheUpdatesSerializer());
-        factory.register((short)-50, GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer());
-        factory.register((short)-49, UpdateErrors::new, new UpdateErrorsSerializer());
-        factory.register((short)-48, GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
-        factory.register((short)-45, GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
+        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr, -66));
+        factory.register(TxInfo::new, new TxInfoSerializer(-65));
+        factory.register(TxEntriesInfo::new, new TxEntriesInfoSerializer(-64));
+        factory.register(ExchangeInfo::new, new ExchangeInfoSerializer(-63));
+        factory.register(IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer(-62));
+        factory.register(IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer(-61));
+        factory.register(SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer(-53));
+        factory.register(NearCacheUpdates::new, new NearCacheUpdatesSerializer(-51));
+        factory.register(GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer(-50));
+        factory.register(UpdateErrors::new, new UpdateErrorsSerializer(-49));
+        factory.register(GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer(-48));
+        factory.register(GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer(-45));
         factory.register((short)-43, IgniteIoTestMessage::new);
-        factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
-        factory.register((short)-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
-        factory.register((short)-26, TxLockList::new, new TxLockListSerializer());
-        factory.register((short)-25, TxLock::new, new TxLockSerializer());
-        factory.register((short)-24, TxLocksRequest::new, new TxLocksRequestSerializer());
-        factory.register((short)-23, TxLocksResponse::new, new TxLocksResponseSerializer());
-        factory.register(TcpCommunicationSpi.NODE_ID_MSG_TYPE, NodeIdMessage::new, new NodeIdMessageSerializer());
-        factory.register(TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE, RecoveryLastReceivedMessage::new,
-            new RecoveryLastReceivedMessageSerializer());
-        factory.register(TcpCommunicationSpi.HANDSHAKE_MSG_TYPE, HandshakeMessage::new, new HandshakeMessageSerializer());
-        factory.register(TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE, HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer());
-        factory.register((short)0, GridJobCancelRequest::new, new GridJobCancelRequestSerializer());
-        factory.register((short)1, GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer());
-        factory.register((short)2, GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer());
-        factory.register((short)3, GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer());
-        factory.register((short)4, GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer());
-        factory.register((short)5, GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer());
-        factory.register((short)6, GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer());
-        factory.register((short)7, GridCheckpointRequest::new, new GridCheckpointRequestSerializer());
-        factory.register((short)8, GridIoMessage::new,
-            new GridIoMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)9, GridIoUserMessage::new, new GridIoUserMessageSerializer());
-        factory.register((short)10, GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer());
-        factory.register((short)11, GridDeploymentRequest::new, new GridDeploymentRequestSerializer());
-        factory.register((short)12, GridDeploymentResponse::new, new GridDeploymentResponseSerializer());
-        factory.register((short)13, GridEventStorageMessage::new,
-            new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)16, GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer());
-        factory.register((short)17, GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer());
-        factory.register((short)18, IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer());
-        factory.register((short)19, IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer());
-        factory.register((short)20, GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer());
-        factory.register((short)21, GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer());
-        factory.register((short)22, GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer());
-        factory.register((short)23, GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer());
-        factory.register((short)24, GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer());
-        factory.register((short)25, GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer());
-        factory.register((short)26, GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer());
+        factory.register(GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer(-36));
+        factory.register(GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer(-27));
+        factory.register(TxLockList::new, new TxLockListSerializer(-26));
+        factory.register(TxLock::new, new TxLockSerializer(-25));
+        factory.register(TxLocksRequest::new, new TxLocksRequestSerializer(-24));
+        factory.register(TxLocksResponse::new, new TxLocksResponseSerializer(-23));
+        factory.register(NodeIdMessage::new, new NodeIdMessageSerializer(TcpCommunicationSpi.NODE_ID_MSG_TYPE));
+        factory.register(RecoveryLastReceivedMessage::new,
+            new RecoveryLastReceivedMessageSerializer(TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE));
+        factory.register(HandshakeMessage::new, new HandshakeMessageSerializer(TcpCommunicationSpi.HANDSHAKE_MSG_TYPE));
+        factory.register(HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer(TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE));
+        factory.register(GridJobCancelRequest::new, new GridJobCancelRequestSerializer(0));
+        factory.register(GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer(1));
+        factory.register(GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer(2));
+        factory.register(GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer(3));
+        factory.register(GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer(4));
+        factory.register(GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer(5));
+        factory.register(GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer(6));
+        factory.register(GridCheckpointRequest::new, new GridCheckpointRequestSerializer(7));
+        factory.register(GridIoMessage::new, new GridIoMessageMarshallableSerializer(marsh, clsLdr, 8));
+        factory.register(GridIoUserMessage::new, new GridIoUserMessageSerializer(9));
+        factory.register(GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer(10));
+        factory.register(GridDeploymentRequest::new, new GridDeploymentRequestSerializer(11));
+        factory.register(GridDeploymentResponse::new, new GridDeploymentResponseSerializer(12));
+        factory.register(GridEventStorageMessage::new, new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr, 13));
+        factory.register(GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer(16));
+        factory.register(GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer(17));
+        factory.register(IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer(18));
+        factory.register(IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer(19));
+        factory.register(GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer(20));
+        factory.register(GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer(21));
+        factory.register(GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer(22));
+        factory.register(GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer(23));
+        factory.register(GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer(24));
+        factory.register(GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer(25));
+        factory.register(GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer(26));
         // Type 27 is former GridDistributedUnlockRequest
-        factory.register((short)28, GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer());
-        factory.register((short)29, GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer());
-        factory.register((short)30, GridDhtLockRequest::new, new GridDhtLockRequestSerializer());
-        factory.register((short)31, GridDhtLockResponse::new, new GridDhtLockResponseSerializer());
-        factory.register((short)32, GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer());
-        factory.register((short)33, GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer());
-        factory.register((short)34, GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer());
-        factory.register((short)35, GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer());
-        factory.register((short)36, GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer());
-        factory.register((short)37, GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer());
-        factory.register((short)38, GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer());
-        factory.register((short)39, GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer());
-        factory.register((short)40, GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer());
-        factory.register((short)41, GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer());
-        factory.register((short)42, GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer());
-        factory.register((short)43, GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer());
-        factory.register((short)45, GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer());
-        factory.register((short)46, GridDhtPartitionsFullMessage::new,
-            new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)47, GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer());
-        factory.register((short)48, GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer());
-        factory.register((short)49, GridNearGetRequest::new, new GridNearGetRequestSerializer());
-        factory.register((short)50, GridNearGetResponse::new, new GridNearGetResponseSerializer());
-        factory.register((short)51, GridNearLockRequest::new, new GridNearLockRequestSerializer());
-        factory.register((short)52, GridNearLockResponse::new, new GridNearLockResponseSerializer());
-        factory.register((short)53, GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer());
-        factory.register((short)54, GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer());
-        factory.register((short)55, GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer());
-        factory.register((short)56, GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer());
-        factory.register((short)57, GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer());
-        factory.register((short)58, GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer());
-        factory.register((short)59, GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer());
-        factory.register((short)61, GridContinuousMessage::new, new GridContinuousMessageSerializer());
-        factory.register((short)62, DataStreamerRequest::new, new DataStreamerRequestSerializer());
-        factory.register((short)63, DataStreamerResponse::new, new DataStreamerResponseSerializer());
-        factory.register((short)76, GridTaskResultRequest::new, new GridTaskResultRequestSerializer());
-        factory.register((short)77, GridTaskResultResponse::new, new GridTaskResultResponseSerializer());
-        factory.register((short)78, MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer());
-        factory.register((short)79, MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer());
-        factory.register((short)80, MetadataRequestMessage::new, new MetadataRequestMessageSerializer());
-        factory.register((short)81, MetadataResponseMessage::new, new MetadataResponseMessageSerializer());
-        factory.register((short)82, JobStealingRequest::new, new JobStealingRequestSerializer());
-        factory.register((short)84, GridByteArrayList::new, new GridByteArrayListSerializer());
-        factory.register((short)86, GridCacheVersion::new, new GridCacheVersionSerializer());
-        factory.register((short)87, GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer());
-        factory.register((short)88, GridCacheReturn::new, new GridCacheReturnSerializer());
-        factory.register((short)91, GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer());
-        factory.register((short)92, CacheEntryInfoCollection::new, new CacheEntryInfoCollectionSerializer());
-        factory.register((short)93, CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer());
-        factory.register((short)94, IgniteTxKey::new, new IgniteTxKeySerializer());
-        factory.register((short)95, DataStreamerEntry::new, new DataStreamerEntrySerializer());
-        factory.register((short)96, CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)97, CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
-        factory.register((short)98, CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)100, IgniteTxEntry::new, new IgniteTxEntrySerializer());
-        factory.register((short)101, TxEntryValueHolder::new, new TxEntryValueHolderSerializer());
-        factory.register((short)102, CacheVersionedValue::new, new CacheVersionedValueSerializer());
-        factory.register((short)103, GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer());
-        factory.register((short)104, GridCacheVersionEx::new, new GridCacheVersionExSerializer());
-        factory.register((short)106, GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer());
-        factory.register((short)107, GridQueryFailResponse::new, new GridQueryFailResponseSerializer());
-        factory.register((short)108, GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer());
-        factory.register((short)109, GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer());
-        factory.register((short)112, GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer());
-        factory.register((short)113, IndexKeyDefinition::new, new IndexKeyDefinitionSerializer());
-        factory.register((short)114, GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer());
-        factory.register((short)115, UUIDCollectionMessage::new, new UUIDCollectionMessageSerializer());
-        factory.register((short)116, GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer());
-        factory.register((short)117, GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer());
-        factory.register((short)118, CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer());
+        factory.register(GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer(28));
+        factory.register(GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer(29));
+        factory.register(GridDhtLockRequest::new, new GridDhtLockRequestSerializer(30));
+        factory.register(GridDhtLockResponse::new, new GridDhtLockResponseSerializer(31));
+        factory.register(GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer(32));
+        factory.register(GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer(33));
+        factory.register(GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer(34));
+        factory.register(GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer(35));
+        factory.register(GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer(36));
+        factory.register(GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer(37));
+        factory.register(GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer(38));
+        factory.register(GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer(39));
+        factory.register(GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer(40));
+        factory.register(GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer(41));
+        factory.register(GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer(42));
+        factory.register(GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer(43));
+        factory.register(GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer(45));
+        factory.register(GridDhtPartitionsFullMessage::new, new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr, 46));
+        factory.register(GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer(47));
+        factory.register(GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer(48));
+        factory.register(GridNearGetRequest::new, new GridNearGetRequestSerializer(49));
+        factory.register(GridNearGetResponse::new, new GridNearGetResponseSerializer(50));
+        factory.register(GridNearLockRequest::new, new GridNearLockRequestSerializer(51));
+        factory.register(GridNearLockResponse::new, new GridNearLockResponseSerializer(52));
+        factory.register(GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer(53));
+        factory.register(GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer(54));
+        factory.register(GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer(55));
+        factory.register(GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer(56));
+        factory.register(GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer(57));
+        factory.register(GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer(58));
+        factory.register(GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer(59));
+        factory.register(GridContinuousMessage::new, new GridContinuousMessageSerializer(61));
+        factory.register(DataStreamerRequest::new, new DataStreamerRequestSerializer(62));
+        factory.register(DataStreamerResponse::new, new DataStreamerResponseSerializer(63));
+        factory.register(GridTaskResultRequest::new, new GridTaskResultRequestSerializer(76));
+        factory.register(GridTaskResultResponse::new, new GridTaskResultResponseSerializer(77));
+        factory.register(MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer(78));
+        factory.register(MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer(79));
+        factory.register(MetadataRequestMessage::new, new MetadataRequestMessageSerializer(80));
+        factory.register(MetadataResponseMessage::new, new MetadataResponseMessageSerializer(81));
+        factory.register(JobStealingRequest::new, new JobStealingRequestSerializer(82));
+        factory.register(GridByteArrayList::new, new GridByteArrayListSerializer(84));
+        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer(86));
+        factory.register(GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer(87));
+        factory.register(GridCacheReturn::new, new GridCacheReturnSerializer(88));
+        factory.register(GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer(91));
+        factory.register(CacheEntryInfoCollection::new, new CacheEntryInfoCollectionSerializer(92));
+        factory.register(CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer(93));
+        factory.register(IgniteTxKey::new, new IgniteTxKeySerializer(94));
+        factory.register(DataStreamerEntry::new, new DataStreamerEntrySerializer(95));
+        factory.register(CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr, 96));
+        factory.register(CacheEvictionEntry::new, new CacheEvictionEntrySerializer(97));
+        factory.register(CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr, 98));
+        factory.register(IgniteTxEntry::new, new IgniteTxEntrySerializer(100));
+        factory.register(TxEntryValueHolder::new, new TxEntryValueHolderSerializer(101));
+        factory.register(CacheVersionedValue::new, new CacheVersionedValueSerializer(102));
+        factory.register(GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer(103));
+        factory.register(GridCacheVersionEx::new, new GridCacheVersionExSerializer(104));
+        factory.register(GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer(106));
+        factory.register(GridQueryFailResponse::new, new GridQueryFailResponseSerializer(107));
+        factory.register(GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer(108));
+        factory.register(GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer(109));
+        factory.register(GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer(112));
+        factory.register(IndexKeyDefinition::new, new IndexKeyDefinitionSerializer(113));
+        factory.register(GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer(114));
+        factory.register(UUIDCollectionMessage::new, new UUIDCollectionMessageSerializer(115));
+        factory.register(GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer(116));
+        factory.register(GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer(117));
+        factory.register(CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer(118));
 
         // [120..123] - DR
-        factory.register((short)125, GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer());
-        factory.register((short)126, GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer());
-        factory.register((short)127, GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer());
-        factory.register((short)128, CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer());
-        factory.register((short)129, WalStateAckMessage::new, new WalStateAckMessageSerializer());
-        factory.register((short)130, UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer());
-        factory.register((short)131, UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer());
-        factory.register((short)132, UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer());
-        factory.register(ClusterMetricsUpdateMessage.TYPE_CODE, ClusterMetricsUpdateMessage::new,
-            new ClusterMetricsUpdateMessageSerializer());
-        factory.register((short)134, ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer());
-        factory.register((short)135, LatchAckMessage::new, new LatchAckMessageSerializer());
-        factory.register(CacheMetricsMessage.TYPE_CODE, CacheMetricsMessage::new, new CacheMetricsMessageSerializer());
-        factory.register(NodeMetricsMessage.TYPE_CODE, NodeMetricsMessage::new, new NodeMetricsMessageSerializer());
-        factory.register(NodeFullMetricsMessage.TYPE_CODE, NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer());
-        factory.register((short)157, PartitionUpdateCountersMessage::new,
-            new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)162, GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
-        factory.register((short)163, GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer());
-        factory.register((short)167, ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
-        factory.register((short)168, ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
-        factory.register((short)169, ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer());
-        factory.register(GridQueryKillRequest.TYPE_CODE, GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
-        factory.register(GridQueryKillResponse.TYPE_CODE, GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
-        factory.register(GridIoSecurityAwareMessage.TYPE_CODE, GridIoSecurityAwareMessage::new,
-            new GridIoSecurityAwareMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(SessionChannelMessage.TYPE_CODE, SessionChannelMessage::new, new SessionChannelMessageSerializer());
-        factory.register(SingleNodeMessage.TYPE_CODE, SingleNodeMessage::new, new SingleNodeMessageSerializer());
-        factory.register((short)177, TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer());
-        factory.register(SnapshotFilesRequestMessage.TYPE_CODE, SnapshotFilesRequestMessage::new,
-            new SnapshotFilesRequestMessageSerializer());
-        factory.register(SnapshotFilesFailureMessage.TYPE_CODE, SnapshotFilesFailureMessage::new,
-            new SnapshotFilesFailureMessageSerializer());
-        factory.register((short)180, AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer());
-        factory.register((short)181, TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer());
+        factory.register(GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer(125));
+        factory.register(GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer(126));
+        factory.register(GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer(127));
+        factory.register(CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer(128));
+        factory.register(WalStateAckMessage::new, new WalStateAckMessageSerializer(129));
+        factory.register(UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer(130));
+        factory.register(UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer(131));
+        factory.register(UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer(132));
+        factory.register(ClusterMetricsUpdateMessage::new,
+            new ClusterMetricsUpdateMessageSerializer(ClusterMetricsUpdateMessage.TYPE_CODE));
+        factory.register(ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer(134));
+        factory.register(LatchAckMessage::new, new LatchAckMessageSerializer(135));
+        factory.register(CacheMetricsMessage::new, new CacheMetricsMessageSerializer(CacheMetricsMessage.TYPE_CODE));
+        factory.register(NodeMetricsMessage::new, new NodeMetricsMessageSerializer(NodeMetricsMessage.TYPE_CODE));
+        factory.register(NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer(NodeFullMetricsMessage.TYPE_CODE));
+        factory.register(PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr, 157));
+        factory.register(GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer(162));
+        factory.register(GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer(163));
+        factory.register(ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer(167));
+        factory.register(ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer(168));
+        factory.register(ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer(169));
+        factory.register(GridQueryKillRequest::new, new GridQueryKillRequestSerializer(GridQueryKillRequest.TYPE_CODE));
+        factory.register(GridQueryKillResponse::new, new GridQueryKillResponseSerializer(GridQueryKillResponse.TYPE_CODE));
+        factory.register(GridIoSecurityAwareMessage::new,
+            new GridIoSecurityAwareMessageMarshallableSerializer(marsh, clsLdr, GridIoSecurityAwareMessage.TYPE_CODE));
+        factory.register(SessionChannelMessage::new, new SessionChannelMessageSerializer(SessionChannelMessage.TYPE_CODE));
+        factory.register(SingleNodeMessage::new, new SingleNodeMessageSerializer(SingleNodeMessage.TYPE_CODE));
+        factory.register(TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer(177));
+        factory.register(SnapshotFilesRequestMessage::new,
+            new SnapshotFilesRequestMessageSerializer(SnapshotFilesRequestMessage.TYPE_CODE));
+        factory.register(SnapshotFilesFailureMessage::new,
+            new SnapshotFilesFailureMessageSerializer(SnapshotFilesFailureMessage.TYPE_CODE));
+        factory.register(AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer(180));
+        factory.register(TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer(181));
 
         // Incremental snapshot.
-        factory.register(IncrementalSnapshotAwareMessage.TYPE_CODE, IncrementalSnapshotAwareMessage::new,
-            new IncrementalSnapshotAwareMessageSerializer());
+        factory.register(IncrementalSnapshotAwareMessage::new,
+            new IncrementalSnapshotAwareMessageSerializer(IncrementalSnapshotAwareMessage.TYPE_CODE));
 
         // Index statistics.
-        factory.register(StatisticsKeyMessage.TYPE_CODE, StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer());
-        factory.register(StatisticsDecimalMessage.TYPE_CODE, StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer());
-        factory.register(StatisticsObjectData.TYPE_CODE, StatisticsObjectData::new, new StatisticsObjectDataSerializer());
-        factory.register(StatisticsColumnData.TYPE_CODE, StatisticsColumnData::new, new StatisticsColumnDataSerializer());
-        factory.register(StatisticsRequest.TYPE_CODE, StatisticsRequest::new, new StatisticsRequestSerializer());
-        factory.register(StatisticsResponse.TYPE_CODE, StatisticsResponse::new, new StatisticsResponseSerializer());
+        factory.register(StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer(StatisticsKeyMessage.TYPE_CODE));
+        factory.register(StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer(StatisticsDecimalMessage.TYPE_CODE));
+        factory.register(StatisticsObjectData::new, new StatisticsObjectDataSerializer(StatisticsObjectData.TYPE_CODE));
+        factory.register(StatisticsColumnData::new, new StatisticsColumnDataSerializer(StatisticsColumnData.TYPE_CODE));
+        factory.register(StatisticsRequest::new, new StatisticsRequestSerializer(StatisticsRequest.TYPE_CODE));
+        factory.register(StatisticsResponse::new, new StatisticsResponseSerializer(StatisticsResponse.TYPE_CODE));
 
-        factory.register(CachePartitionPartialCountersMap.TYPE_CODE, CachePartitionPartialCountersMap::new,
-            new CachePartitionPartialCountersMapSerializer());
-        factory.register(IgniteDhtDemandedPartitionsMap.TYPE_CODE, IgniteDhtDemandedPartitionsMap::new,
-            new IgniteDhtDemandedPartitionsMapSerializer());
-        factory.register(BinaryMetadataVersionInfo.TYPE_CODE, BinaryMetadataVersionInfo::new,
-            new BinaryMetadataVersionInfoSerializer());
-        factory.register(CachePartitionFullCountersMap.TYPE_CODE, CachePartitionFullCountersMap::new,
-            new CachePartitionFullCountersMapSerializer());
-        factory.register(IgniteDhtPartitionCountersMap.TYPE_CODE, IgniteDhtPartitionCountersMap::new,
-            new IgniteDhtPartitionCountersMapSerializer());
-        factory.register(GroupPartitionIdPair.TYPE_CODE, GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
-        factory.register(PartitionReservationsMap.TYPE_CODE, PartitionReservationsMap::new, new PartitionReservationsMapSerializer());
-        factory.register(IgniteDhtPartitionHistorySuppliersMap.TYPE_CODE, IgniteDhtPartitionHistorySuppliersMap::new,
-            new IgniteDhtPartitionHistorySuppliersMapSerializer());
-        factory.register(PartitionsToReload.TYPE_CODE, PartitionsToReload::new, new PartitionsToReloadSerializer());
-        factory.register(CachePartitionsToReloadMap.TYPE_CODE, CachePartitionsToReloadMap::new, new CachePartitionsToReloadMapSerializer());
-        factory.register(IgniteDhtPartitionsToReloadMap.TYPE_CODE, IgniteDhtPartitionsToReloadMap::new,
-            new IgniteDhtPartitionsToReloadMapSerializer());
-        factory.register(IntLongMap.TYPE_CODE, IntLongMap::new, new IntLongMapSerializer());
-        factory.register(IndexKeyTypeMessage.TYPE_CODE, IndexKeyTypeMessage::new,
-            new IndexKeyTypeMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(GridPartitionStateMap.TYPE_CODE, GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
-        factory.register(GridDhtPartitionMap.TYPE_CODE, GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
-        factory.register(GridDhtPartitionFullMap.TYPE_CODE, GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
-        factory.register((short)520, SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
-        factory.register((short)521, SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
-        factory.register((short)522, DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
-        factory.register((short)523, SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
-        factory.register((short)524, IncrementalSnapshotVerifyResult::new,
-            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)525, SnapshotRestoreOperationResponse::new,
-            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)526, SnapshotMetadataResponse::new, new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)527, SnapshotCheckPartitionHashesResponse::new,
-            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
-        factory.register((short)529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
-        factory.register((short)530, SnapshotPartitionsVerifyHandlerResponse::new,
-            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
+        factory.register(CachePartitionPartialCountersMap::new,
+            new CachePartitionPartialCountersMapSerializer(CachePartitionPartialCountersMap.TYPE_CODE));
+        factory.register(IgniteDhtDemandedPartitionsMap::new,
+            new IgniteDhtDemandedPartitionsMapSerializer(IgniteDhtDemandedPartitionsMap.TYPE_CODE));
+        factory.register(BinaryMetadataVersionInfo::new,
+            new BinaryMetadataVersionInfoSerializer(BinaryMetadataVersionInfo.TYPE_CODE));
+        factory.register(CachePartitionFullCountersMap::new,
+            new CachePartitionFullCountersMapSerializer(CachePartitionFullCountersMap.TYPE_CODE));
+        factory.register(IgniteDhtPartitionCountersMap::new,
+            new IgniteDhtPartitionCountersMapSerializer(IgniteDhtPartitionCountersMap.TYPE_CODE));
+        factory.register(GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer(GroupPartitionIdPair.TYPE_CODE));
+        factory.register(PartitionReservationsMap::new, new PartitionReservationsMapSerializer(PartitionReservationsMap.TYPE_CODE));
+        factory.register(IgniteDhtPartitionHistorySuppliersMap::new,
+            new IgniteDhtPartitionHistorySuppliersMapSerializer(IgniteDhtPartitionHistorySuppliersMap.TYPE_CODE));
+        factory.register(PartitionsToReload::new, new PartitionsToReloadSerializer(PartitionsToReload.TYPE_CODE));
+        factory.register(CachePartitionsToReloadMap::new,
+            new CachePartitionsToReloadMapSerializer(CachePartitionsToReloadMap.TYPE_CODE));
+        factory.register(IgniteDhtPartitionsToReloadMap::new,
+            new IgniteDhtPartitionsToReloadMapSerializer(IgniteDhtPartitionsToReloadMap.TYPE_CODE));
+        factory.register(IntLongMap::new, new IntLongMapSerializer(IntLongMap.TYPE_CODE));
+        factory.register(IndexKeyTypeMessage::new,
+            new IndexKeyTypeMessageMarshallableSerializer(marsh, clsLdr, IndexKeyTypeMessage.TYPE_CODE));
+        factory.register(GridPartitionStateMap::new, new GridPartitionStateMapSerializer(GridPartitionStateMap.TYPE_CODE));
+        factory.register(GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer(GridDhtPartitionMap.TYPE_CODE));
+        factory.register(GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer(GridDhtPartitionFullMap.TYPE_CODE));
+        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer(520));
+        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer(521));
+        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer(522));
+        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer(523));
+        factory.register(IncrementalSnapshotVerifyResult::new,
+            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr, 524));
+        factory.register(SnapshotRestoreOperationResponse::new,
+            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr, 525));
+        factory.register(SnapshotMetadataResponse::new,
+            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr, 526));
+        factory.register(SnapshotCheckPartitionHashesResponse::new,
+            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr, 527));
+        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer(528));
+        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer(529));
+        factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
+            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr, 530));
 
         // [-3..119] [124..129] [-23..-28] [-36..-55] [183..188] - this
         // [120..123] - DR
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
index 3e35894a13623..4e8b86c26c058 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
@@ -26,6 +26,7 @@
  */
 public class GridIoSecurityAwareMessage extends GridIoMessage {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 174;
 
     /** Security subject ID that will be used during message processing on a remote node. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index 9ae810a60533b..baf681158008e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -63,6 +63,10 @@ public class IgniteMessageFactoryImpl implements MessageFactory {
 
             return msg.readFrom(buf, reader);
         }
+
+        @Override public short directType() {
+            throw new UnsupportedOperationException("Default serializer does not support custom direct type");
+        }
     };
 
     /** Message suppliers. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
index 1afab64ee6d8f..4bbe5cb19a205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
@@ -29,6 +29,7 @@
  */
 public class SessionChannelMessage implements Message {
     /** Initial channel message type (value is {@code 175}). */
+    @Deprecated
     public static final short TYPE_CODE = 175;
 
     /** Channel session unique identifier. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index e30853967bb82..c32d43c7ab2c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -216,119 +216,112 @@ public DiscoveryMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
 
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
-        factory.register((short)-200, TcpDiscoveryCollectionMessage::new,
-            new TcpDiscoveryCollectionMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(TcpDiscoveryCollectionMessage::new,
+            new TcpDiscoveryCollectionMessageMarshallableSerializer(marsh, clsLdr, -200));
 
-        factory.register((short)-115, SchemaAlterTableAddColumnOperation::new,
-            new SchemaAlterTableAddColumnOperationSerializer());
-        factory.register((short)-114, SchemaIndexCreateOperation::new,
-            new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)-113, SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer());
-        factory.register((short)-112, SchemaAlterTableDropColumnOperation::new,
-            new SchemaAlterTableDropColumnOperationSerializer());
-        factory.register((short)-111, SchemaAddQueryEntityOperation::new,
-            new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)-110, QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)-109, User::new, new UserSerializer());
-        factory.register((short)-108, UserManagementOperation::new, new UserManagementOperationSerializer());
-        factory.register((short)-107, NodeSpecificData::new, new NodeSpecificDataSerializer());
-        factory.register((short)-106, DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer());
-        factory.register((short)-105, TcpDiscoveryNodeFullMetricsMessage::new,
-            new TcpDiscoveryNodeFullMetricsMessageSerializer());
-        factory.register((short)-104, TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer());
-        factory.register((short)-103, TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer());
-        factory.register((short)-102, TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer());
-        factory.register((short)-101, InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer());
-        factory.register((short)-100, InetAddressMessage::new, new InetAddressMessageSerializer());
-        factory.register((short)-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(SchemaAlterTableAddColumnOperation::new, new SchemaAlterTableAddColumnOperationSerializer(-115));
+        factory.register(SchemaIndexCreateOperation::new, new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr, -114));
+        factory.register(SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer(-113));
+        factory.register(SchemaAlterTableDropColumnOperation::new, new SchemaAlterTableDropColumnOperationSerializer(-112));
+        factory.register(SchemaAddQueryEntityOperation::new, new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr, -111));
+        factory.register(QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr, -110));
+        factory.register(User::new, new UserSerializer(-109));
+        factory.register(UserManagementOperation::new, new UserManagementOperationSerializer(-108));
+        factory.register(NodeSpecificData::new, new NodeSpecificDataSerializer(-107));
+        factory.register(DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer(-106));
+        factory.register(TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer(-105));
+        factory.register(TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer(-104));
+        factory.register(TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer(-103));
+        factory.register(TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer(-102));
+        factory.register(InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer(-101));
+        factory.register(InetAddressMessage::new, new InetAddressMessageSerializer(-100));
+        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr, -66));
 
         // TcpDiscoveryAbstractMessage
-        factory.register((short)0, TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer());
-        factory.register((short)1, TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer());
-        factory.register((short)2, TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
-        factory.register((short)3, TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
-        factory.register((short)4, TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
-        factory.register((short)5, TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
-        factory.register((short)6, TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer());
-        factory.register((short)7, TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer());
-        factory.register((short)8, TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer());
-        factory.register((short)9, TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer());
-        factory.register((short)10, TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer());
-        factory.register((short)11, TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer());
-        factory.register((short)12, TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer());
-        factory.register((short)13, TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer());
-        factory.register((short)14, TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer());
-        factory.register((short)15, TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer());
-        factory.register((short)16, TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)17, TcpDiscoveryNodeFailedMessage::new,
-            new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)18, TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer());
-        factory.register((short)19, TcpDiscoveryNodeAddFinishedMessage::new,
-            new TcpDiscoveryNodeAddFinishedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)20, TcpDiscoveryJoinRequestMessage::new,
-            new TcpDiscoveryJoinRequestMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)21, TcpDiscoveryCustomEventMessage::new,
-            new TcpDiscoveryCustomEventMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)22, TcpDiscoveryServerOnlyCustomEventMessage::new,
-            new TcpDiscoveryServerOnlyCustomEventMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)23, TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer());
-        factory.register((short)24, DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer());
-        factory.register((short)25, DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer());
-        factory.register((short)26, DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer());
-        factory.register((short)27, DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer());
-        factory.register((short)28, TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer());
-        factory.register((short)29, TcpDiscoveryNodeAddedMessage::new,
-            new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)30, FullMessage::new, new FullMessageSerializer());
-        factory.register((short)31, InitMessage::new, new InitMessageSerializer());
-        factory.register((short)32, SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer());
-        factory.register((short)33, SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer());
-        factory.register((short)34, SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer());
-        factory.register((short)35, MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer());
-        factory.register((short)36, SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer());
-        factory.register((short)37, SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer());
-        factory.register((short)38, ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer());
+        factory.register(TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer(0));
+        factory.register(TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer(1));
+        factory.register(TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer(2));
+        factory.register(TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer(3));
+        factory.register(TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer(4));
+        factory.register(TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer(5));
+        factory.register(TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer(6));
+        factory.register(TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer(7));
+        factory.register(TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer(8));
+        factory.register(TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer(9));
+        factory.register(TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer(10));
+        factory.register(TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer(11));
+        factory.register(TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer(12));
+        factory.register(TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer(13));
+        factory.register(TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer(14));
+        factory.register(TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer(15));
+        factory.register(TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr, 16));
+        factory.register(TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr, 17));
+        factory.register(TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer(18));
+        factory.register(TcpDiscoveryNodeAddFinishedMessage::new,
+            new TcpDiscoveryNodeAddFinishedMessageMarshallableSerializer(marsh, clsLdr, 19));
+        factory.register(TcpDiscoveryJoinRequestMessage::new,
+            new TcpDiscoveryJoinRequestMessageMarshallableSerializer(marsh, clsLdr, 20));
+        factory.register(TcpDiscoveryCustomEventMessage::new,
+            new TcpDiscoveryCustomEventMessageMarshallableSerializer(marsh, clsLdr, 21));
+        factory.register(TcpDiscoveryServerOnlyCustomEventMessage::new,
+            new TcpDiscoveryServerOnlyCustomEventMessageMarshallableSerializer(marsh, clsLdr, 22));
+        factory.register(TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer(23));
+        factory.register(DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer(24));
+        factory.register(DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer(25));
+        factory.register(DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer(26));
+        factory.register(DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer(27));
+        factory.register(TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer(28));
+        factory.register(TcpDiscoveryNodeAddedMessage::new, new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr, 29));
+        factory.register(FullMessage::new, new FullMessageSerializer(30));
+        factory.register(InitMessage::new, new InitMessageSerializer(31));
+        factory.register(SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer(32));
+        factory.register(SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer(33));
+        factory.register(SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer(34));
+        factory.register(MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer(35));
+        factory.register(SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer(36));
+        factory.register(SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer(37));
+        factory.register(ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer(38));
 
-        factory.register((short)86, GridCacheVersion::new, new GridCacheVersionSerializer());
+        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer(86));
 
         // DiscoveryCustomMessage
-        factory.register((short)500, CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer());
-        factory.register((short)501, SecurityAwareCustomMessageWrapper::new,
-            new SecurityAwareCustomMessageWrapperMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)502, MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer());
-        factory.register((short)503, MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer());
-        factory.register((short)504, SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer());
-        factory.register((short)505, SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer());
-        factory.register((short)506, WalStateFinishMessage::new, new WalStateFinishMessageSerializer());
-        factory.register((short)507, WalStateProposeMessage::new, new WalStateProposeMessageSerializer());
-        factory.register((short)508, MetadataUpdateAcceptedMessage::new,
-            new MetadataUpdateAcceptedMessageSerializer());
-        factory.register((short)509, TxTimeoutOnPartitionMapExchangeChangeMessage::new,
-            new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer());
-        factory.register((short)510, UserAcceptedMessage::new, new UserAcceptedMessageSerializer());
-        factory.register((short)511, UserProposedMessage::new, new UserProposedMessageSerializer());
-        factory.register((short)512, ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer());
-        factory.register((short)513, StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer());
-        factory.register((short)514, StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer());
-        factory.register((short)515, CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer());
-        factory.register((short)516, ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
-        factory.register((short)517, MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
-        factory.register((short)518, MappingProposedMessage::new, new MappingProposedMessageSerializer());
-        factory.register((short)519, MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
-        factory.register((short)520, SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
-        factory.register((short)521, SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
-        factory.register((short)522, DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
-        factory.register((short)523, SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
-        factory.register((short)524, IncrementalSnapshotVerifyResult::new,
-            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)525, SnapshotRestoreOperationResponse::new,
-            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)526, SnapshotMetadataResponse::new, new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)527, SnapshotCheckPartitionHashesResponse::new,
-            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register((short)528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
-        factory.register((short)529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
-        factory.register((short)530, SnapshotPartitionsVerifyHandlerResponse::new,
-            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
+        factory.register(CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer(500));
+        factory.register(SecurityAwareCustomMessageWrapper::new,
+            new SecurityAwareCustomMessageWrapperMarshallableSerializer(marsh, clsLdr, 501));
+        factory.register(MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer(502));
+        factory.register(MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer(503));
+        factory.register(SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer(504));
+        factory.register(SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer(505));
+        factory.register(WalStateFinishMessage::new, new WalStateFinishMessageSerializer(506));
+        factory.register(WalStateProposeMessage::new, new WalStateProposeMessageSerializer(507));
+        factory.register(MetadataUpdateAcceptedMessage::new, new MetadataUpdateAcceptedMessageSerializer(508));
+        factory.register(TxTimeoutOnPartitionMapExchangeChangeMessage::new,
+            new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer(509));
+        factory.register(UserAcceptedMessage::new, new UserAcceptedMessageSerializer(510));
+        factory.register(UserProposedMessage::new, new UserProposedMessageSerializer(511));
+        factory.register(ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer(512));
+        factory.register(StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer(513));
+        factory.register(StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer(514));
+        factory.register(CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer(515));
+        factory.register(ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer(516));
+        factory.register(MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer(517));
+        factory.register(MappingProposedMessage::new, new MappingProposedMessageSerializer(518));
+        factory.register(MarshallerMappingItem::new, new MarshallerMappingItemSerializer(519));
+        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer(520));
+        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer(521));
+        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer(522));
+        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer(523));
+        factory.register(IncrementalSnapshotVerifyResult::new,
+            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr, 524));
+        factory.register(SnapshotRestoreOperationResponse::new,
+            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr, 525));
+        factory.register(SnapshotMetadataResponse::new,
+            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr, 526));
+        factory.register(SnapshotCheckPartitionHashesResponse::new,
+            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr, 527));
+        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer(528));
+        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer(529));
+        factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
+            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr, 530));
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
index a609e4b24a0a1..9cd34ebb06ca6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
@@ -33,6 +33,7 @@
  */
 public final class BinaryMetadataVersionInfo implements Serializable, Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 505;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
index 30c023ff918f3..748b5b5277acd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
@@ -27,6 +27,7 @@
 /** Wraps transaction prepare request with application attributes. */
 public class TransactionAttributesAwareRequest extends GridCacheMessage {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 181;
 
     /** Original transaction prepare message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
index 2b5eec5284d0c..c5e566ecb919b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
@@ -26,6 +26,7 @@
 /** Wraps atomic updates with application attributes. */
 public class AtomicApplicationAttributesAwareRequest extends GridCacheIdMessage {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 180;
 
     /** Original update message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
index 6ac0fb6767caa..afd4d537448c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
@@ -29,6 +29,7 @@
  */
 public class CachePartitionFullCountersMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 506;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
index c91be0a94e92d..f9cd659d9aff4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
@@ -31,6 +31,7 @@
  */
 public class CachePartitionPartialCountersMap implements Serializable, Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 500;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
index 049cb682b85b5..f9560b93085ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
@@ -26,6 +26,7 @@
 /** Partition reload map for cache. */
 public class CachePartitionsToReloadMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 512;
 
     /** Partition reload map for cache. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
index 44e710d13ae00..42430bb990328 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
@@ -40,6 +40,7 @@
 public class GridDhtPartitionFullMap
     extends AbstractMap<UUID, GridDhtPartitionMap> implements Comparable<GridDhtPartitionFullMap>, Externalizable, Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 519;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
index 7bda312f9b650..b6ac06937d585 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
@@ -36,6 +36,7 @@
  */
 public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 518;
 
     /** Node ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
index 80102e83af0e6..29bc5eb720b11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
@@ -24,6 +24,7 @@
 /** Pair of group ID and partition ID. */
 public class GroupPartitionIdPair implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 508;
 
     /** Group ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
index 3c718f58c3cb0..dc690a910d802 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
@@ -35,6 +35,7 @@
  */
 public class IgniteDhtDemandedPartitionsMap implements Serializable, Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 501;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
index 8c3e1029bb4af..b65718776b945 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
@@ -28,6 +28,7 @@
  */
 public class IgniteDhtPartitionCountersMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 507;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
index 5bfc1ab8cb3ab..5f93bb4f669bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
@@ -34,6 +34,7 @@
  */
 public class IgniteDhtPartitionHistorySuppliersMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 510;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
index e71ee6869194d..46de799239020 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
@@ -33,6 +33,7 @@
  */
 public class IgniteDhtPartitionsToReloadMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 513;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
index c8614f08a8cca..21793df14514a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
@@ -28,6 +28,7 @@
  */
 public class IntLongMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 514;
 
     /** Map. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
index 14eb95f0cf60d..924ff52d8bcb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
@@ -26,6 +26,7 @@
 /** Map for storing GroupPartitionIdPair and their respective history counter values. */
 public class PartitionReservationsMap implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 509;
 
     /** Mapping between GroupPartitionIdPair objects and their respective history counter values. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
index 63faa89841eb3..38f4d56637614 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
@@ -25,6 +25,7 @@
 /** Partitions to reload. */
 public class PartitionsToReload implements Message {
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 511;
 
     /** Set of partitions to reload. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
index 30526aa14b1d7..896b08a4c4b92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
@@ -29,6 +29,7 @@
  */
 public class IncrementalSnapshotAwareMessage extends GridCacheMessage {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 400;
 
     /** Original transaction message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
index 71ac90131efcc..54b9ba9b1de66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
@@ -26,6 +26,7 @@
  */
 public class SnapshotFilesFailureMessage extends AbstractSnapshotMessage {
     /** Snapshot response message type (value is {@code 179}). */
+    @Deprecated
     public static final short TYPE_CODE = 179;
 
     /** Exception message which is occurred during snapshot request processing. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
index cbf7770bbae87..912380293b03c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
@@ -35,6 +35,7 @@
  */
 public class SnapshotFilesRequestMessage extends AbstractSnapshotMessage {
     /** Snapshot request message type (value is {@code 178}). */
+    @Deprecated
     public static final short TYPE_CODE = 178;
 
     /** Snapshot operation request ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
index e8e98ae20b245..a7bbdc80ab77d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
@@ -27,6 +27,7 @@
 /** Cache metrics message. */
 public class CacheMetricsMessage implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 136;
 
     /** Number of reads. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
index 051f5f28fc717..7f44bcd3ecd0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
@@ -31,6 +31,7 @@
 /** */
 public final class ClusterMetricsUpdateMessage implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 133;
 
     /** Single node metrics message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
index fe5f1671404dd..d5a0300a5bdb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
@@ -29,6 +29,7 @@
 /** Node compound metrics message. */
 public class NodeFullMetricsMessage implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 138;
 
     /** Node metrics wrapper message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
index 6cef552e80617..423fcc1e0092e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
@@ -34,6 +34,7 @@
 /** */
 public class NodeMetricsMessage implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 137;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
index d66085774c6a1..6e0c4e58b4765 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
@@ -27,6 +27,7 @@
  */
 public class GridQueryKillRequest implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 172;
 
     /** Request id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index f906e7e011916..687760c5baf03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -27,6 +27,7 @@
  */
 public class GridQueryKillResponse implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 173;
 
     /** Error text. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
index 5ef7339a70872..89021e7bee3b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
@@ -29,6 +29,7 @@ public class StatisticsColumnData implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 186;
 
     /** Min value in column. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
index 3ed48fc1d194d..992d9276e3baf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
@@ -32,6 +32,7 @@ public class StatisticsDecimalMessage implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 184;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
index 17e5eb44ad3fa..c9a8f7c967ae7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
@@ -32,6 +32,7 @@ public class StatisticsKeyMessage implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 183;
 
     /** Object schema. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
index f7118b53cab29..01e1faa12575b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
@@ -31,6 +31,7 @@ public class StatisticsObjectData implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 185;
 
     /** Statistics key. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
index 68be1c1ee216a..747e54fd6c7f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
@@ -30,6 +30,7 @@
  */
 public class StatisticsRequest implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 187;
 
     /** Gathering id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
index da2bb20d6ed31..e691c7616eff2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
@@ -27,6 +27,7 @@
  */
 public class StatisticsResponse implements Message {
     /** */
+    @Deprecated
     public static final short TYPE_CODE = 188;
 
     /** Request id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
index 6db6f53ec6274..3b025e1f9b0a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
@@ -38,6 +38,7 @@ public class GridPartitionStateMap extends AbstractMap<Integer, GridDhtPartition
     public static final GridPartitionStateMap EMPTY = new GridPartitionStateMap(0);
 
     /** Type code. */
+    @Deprecated
     public static final short TYPE_CODE = 517;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
index 3457d980c47c7..bc98035237d42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
@@ -35,6 +35,7 @@
  */
 public class SingleNodeMessage<R extends Message> implements Message {
     /** Initial channel message type (value is {@code 176}). */
+    @Deprecated
     public static final short TYPE_CODE = 176;
 
     /** Process id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index 3f9bcdce402a9..a2693d3da0e5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -57,5 +57,6 @@ public default boolean readFrom(ByteBuffer buf, MessageReader reader) {
      *
      * @return Message type.
      */
+    @Deprecated
     public short directType();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index 320a7a4cfbadc..eabf13ab52d4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -51,6 +51,24 @@ public interface MessageFactory {
      */
     public void register(short directType, Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException;
 
+    /**
+     * Register message factory using the direct type obtained from the serializer via {@link MessageSerializer#directType()}.
+     * This is a convenience method equivalent to {@link #register(short, Supplier, MessageSerializer)} where the direct
+     * type is derived from the serializer itself.
+     *
+     * <p>All messages must be registered during construction of class which implements this interface. Any invocation
+     * of this method after initialization is done must throw {@link IllegalStateException} exception.
+     *
+     * @param supplier Message factory.
+     * @param serializer Message serializer that also provides the direct type for registration.
+     * @throws IgniteException In case of attempt to register message with direct type which is already registered.
+     * @throws IllegalStateException On any invocation of this method when class which implements this interface
+     * is already constructed.
+     */
+    default void register(Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException {
+        register(serializer.directType(), supplier, serializer);
+    }
+
     /**
      * Creates new message instance of provided type.
      *
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
index 90df0601693c3..c46d7e60c0b4f 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
@@ -38,4 +38,11 @@ public interface MessageSerializer<M extends Message> {
      * @return Whether message was fully read.
      */
     public boolean readFrom(M msg, MessageReader reader);
+
+    /**
+     * Gets message type.
+     *
+     * @return Message type.
+     */
+    short directType();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 02efe024225d6..0cff60431700d 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -265,15 +265,19 @@ public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
     public static final int DFLT_CONN_PER_NODE = 1;
 
     /** Node ID message type. */
+    @Deprecated
     public static final short NODE_ID_MSG_TYPE = -1;
 
     /** Recovery last received ID message type. */
+    @Deprecated
     public static final short RECOVERY_LAST_ID_MSG_TYPE = -2;
 
     /** Handshake message type. */
+    @Deprecated
     public static final short HANDSHAKE_MSG_TYPE = -3;
 
     /** Handshake wait message type. */
+    @Deprecated
     public static final short HANDSHAKE_WAIT_MSG_TYPE = -28;
 
     /** Communication metrics group name. */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index 97a048a508ddd..c49efdc64e921 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -833,7 +833,7 @@ public GridNioServer<Message> resetNioServer() throws IgniteCheckedException {
                     @Override public MessageSerializer serializer(short type) {
                         // Enable sending wait message for a communication peer while context isn't initialized.
                         if (impl == null && type == HANDSHAKE_WAIT_MSG_TYPE)
-                            return new HandshakeWaitMessageSerializer();
+                            return new HandshakeWaitMessageSerializer(HANDSHAKE_WAIT_MSG_TYPE);
 
                         return get().serializer(type);
                     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
index 203d91ad0f9ec..0ef97ffc58de3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
@@ -34,8 +34,8 @@
 public class MessagesPluginProvider extends AbstractTestPluginProvider {
     /** */
     private static final MessageFactoryProvider FACTORY_PROVIDER = f -> {
-        f.register((short)10_000, TestIntegerMessage::new, new TestIntegerMessageSerializer());
-        f.register((short)10_001, TestUuidMessage::new, new TestUuidMessageSerializer());
+        f.register(TestIntegerMessage::new, new TestIntegerMessageSerializer(10_000));
+        f.register(TestUuidMessage::new, new TestUuidMessageSerializer(10_001));
     };
 
     /** {@inheritDoc} */
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
index a10653c3744dc..451d46bf1167e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
@@ -37,34 +37,34 @@
 public class GridH2ValueMessageFactory implements MessageFactoryProvider {
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
-        factory.register((short)-4, () -> GridH2Null.INSTANCE, new GridH2NullSerializer());
-        factory.register((short)-5, GridH2Boolean::new, new GridH2BooleanSerializer());
-        factory.register((short)-6, GridH2Byte::new, new GridH2ByteSerializer());
-        factory.register((short)-7, GridH2Short::new, new GridH2ShortSerializer());
-        factory.register((short)-8, GridH2Integer::new, new GridH2IntegerSerializer());
-        factory.register((short)-9, GridH2Long::new, new GridH2LongSerializer());
-        factory.register((short)-10, GridH2Decimal::new, new GridH2DecimalSerializer());
-        factory.register((short)-11, GridH2Double::new, new GridH2DoubleSerializer());
-        factory.register((short)-12, GridH2Float::new, new GridH2FloatSerializer());
-        factory.register((short)-13, GridH2Time::new, new GridH2TimeSerializer());
-        factory.register((short)-14, GridH2Date::new, new GridH2DateSerializer());
-        factory.register((short)-15, GridH2Timestamp::new, new GridH2TimestampSerializer());
-        factory.register((short)-16, GridH2Bytes::new, new GridH2BytesSerializer());
-        factory.register((short)-17, GridH2String::new, new GridH2StringSerializer());
-        factory.register((short)-18, GridH2Array::new, new GridH2ArraySerializer());
-        factory.register((short)-19, GridH2JavaObject::new, new GridH2JavaObjectSerializer());
-        factory.register((short)-20, GridH2Uuid::new, new GridH2UuidSerializer());
-        factory.register((short)-21, GridH2Geometry::new, new GridH2GeometrySerializer());
-        factory.register((short)-22, GridH2CacheObject::new, new GridH2CacheObjectSerializer());
-        factory.register((short)-30, GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer());
-        factory.register((short)-31, GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer());
-        factory.register((short)-32, GridH2RowMessage::new, new GridH2RowMessageSerializer());
-        factory.register((short)-33, GridH2QueryRequest::new, new GridH2QueryRequestSerializer());
-        factory.register((short)-34, GridH2RowRange::new, new GridH2RowRangeSerializer());
-        factory.register((short)-35, GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer());
-        factory.register((short)-54, QueryTable::new, new QueryTableSerializer());
-        factory.register((short)-55, GridH2DmlRequest::new, new GridH2DmlRequestSerializer());
-        factory.register((short)-56, GridH2DmlResponse::new, new GridH2DmlResponseSerializer());
+        factory.register(() -> GridH2Null.INSTANCE, new GridH2NullSerializer(-4));
+        factory.register(GridH2Boolean::new, new GridH2BooleanSerializer(-5));
+        factory.register(GridH2Byte::new, new GridH2ByteSerializer(-6));
+        factory.register(GridH2Short::new, new GridH2ShortSerializer(-7));
+        factory.register(GridH2Integer::new, new GridH2IntegerSerializer(-8));
+        factory.register(GridH2Long::new, new GridH2LongSerializer(-9));
+        factory.register(GridH2Decimal::new, new GridH2DecimalSerializer(-10));
+        factory.register(GridH2Double::new, new GridH2DoubleSerializer(-11));
+        factory.register(GridH2Float::new, new GridH2FloatSerializer(-12));
+        factory.register(GridH2Time::new, new GridH2TimeSerializer(-13));
+        factory.register(GridH2Date::new, new GridH2DateSerializer(-14));
+        factory.register(GridH2Timestamp::new, new GridH2TimestampSerializer(-15));
+        factory.register(GridH2Bytes::new, new GridH2BytesSerializer(-16));
+        factory.register(GridH2String::new, new GridH2StringSerializer(-17));
+        factory.register(GridH2Array::new, new GridH2ArraySerializer(-18));
+        factory.register(GridH2JavaObject::new, new GridH2JavaObjectSerializer(-19));
+        factory.register(GridH2Uuid::new, new GridH2UuidSerializer(-20));
+        factory.register(GridH2Geometry::new, new GridH2GeometrySerializer(-21));
+        factory.register(GridH2CacheObject::new, new GridH2CacheObjectSerializer(-22));
+        factory.register(GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer(-30));
+        factory.register(GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer(-31));
+        factory.register(GridH2RowMessage::new, new GridH2RowMessageSerializer(-32));
+        factory.register(GridH2QueryRequest::new, new GridH2QueryRequestSerializer(-33));
+        factory.register(GridH2RowRange::new, new GridH2RowRangeSerializer(-34));
+        factory.register(GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer(-35));
+        factory.register(QueryTable::new, new QueryTableSerializer(-54));
+        factory.register(GridH2DmlRequest::new, new GridH2DmlRequestSerializer(-55));
+        factory.register(GridH2DmlResponse::new, new GridH2DmlResponseSerializer(-56));
     }
 
     /**

From c1ed8f5f6ce8ecf83d8eea50e9c2ce8caeeb0e15 Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Tue, 24 Mar 2026 23:04:56 +0300
Subject: [PATCH 2/8] Remove deprecated

---
 .../internal/cache/query/index/IndexKeyTypeMessage.java       | 1 -
 .../managers/communication/GridIoSecurityAwareMessage.java    | 1 -
 .../managers/communication/SessionChannelMessage.java         | 1 -
 .../processors/cache/binary/BinaryMetadataVersionInfo.java    | 1 -
 .../distributed/dht/TransactionAttributesAwareRequest.java    | 1 -
 .../dht/atomic/AtomicApplicationAttributesAwareRequest.java   | 1 -
 .../dht/preloader/CachePartitionFullCountersMap.java          | 1 -
 .../dht/preloader/CachePartitionPartialCountersMap.java       | 1 -
 .../distributed/dht/preloader/CachePartitionsToReloadMap.java | 1 -
 .../distributed/dht/preloader/GridDhtPartitionFullMap.java    | 1 -
 .../cache/distributed/dht/preloader/GridDhtPartitionMap.java  | 1 -
 .../cache/distributed/dht/preloader/GroupPartitionIdPair.java | 1 -
 .../dht/preloader/IgniteDhtDemandedPartitionsMap.java         | 1 -
 .../dht/preloader/IgniteDhtPartitionCountersMap.java          | 1 -
 .../dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java  | 1 -
 .../dht/preloader/IgniteDhtPartitionsToReloadMap.java         | 1 -
 .../cache/distributed/dht/preloader/IntLongMap.java           | 1 -
 .../distributed/dht/preloader/PartitionReservationsMap.java   | 1 -
 .../cache/distributed/dht/preloader/PartitionsToReload.java   | 1 -
 .../persistence/snapshot/IncrementalSnapshotAwareMessage.java | 1 -
 .../persistence/snapshot/SnapshotFilesFailureMessage.java     | 1 -
 .../persistence/snapshot/SnapshotFilesRequestMessage.java     | 1 -
 .../internal/processors/cluster/CacheMetricsMessage.java      | 1 -
 .../processors/cluster/ClusterMetricsUpdateMessage.java       | 1 -
 .../internal/processors/cluster/NodeFullMetricsMessage.java   | 1 -
 .../internal/processors/cluster/NodeMetricsMessage.java       | 1 -
 .../processors/query/messages/GridQueryKillRequest.java       | 1 -
 .../processors/query/messages/GridQueryKillResponse.java      | 1 -
 .../processors/query/stat/messages/StatisticsColumnData.java  | 1 -
 .../query/stat/messages/StatisticsDecimalMessage.java         | 1 -
 .../processors/query/stat/messages/StatisticsKeyMessage.java  | 1 -
 .../processors/query/stat/messages/StatisticsObjectData.java  | 1 -
 .../processors/query/stat/messages/StatisticsRequest.java     | 1 -
 .../processors/query/stat/messages/StatisticsResponse.java    | 1 -
 .../apache/ignite/internal/util/GridPartitionStateMap.java    | 1 -
 .../ignite/internal/util/distributed/SingleNodeMessage.java   | 1 -
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java     | 4 ----
 37 files changed, 40 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
index 460a0f5814aa5..b21289fcc04be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java
@@ -28,7 +28,6 @@
 /** Message wrapper for {@link IndexKeyType}. */
 public class IndexKeyTypeMessage implements MarshallableMessage {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 516;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
index 4e8b86c26c058..3e35894a13623 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
@@ -26,7 +26,6 @@
  */
 public class GridIoSecurityAwareMessage extends GridIoMessage {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 174;
 
     /** Security subject ID that will be used during message processing on a remote node. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
index 4bbe5cb19a205..1afab64ee6d8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
@@ -29,7 +29,6 @@
  */
 public class SessionChannelMessage implements Message {
     /** Initial channel message type (value is {@code 175}). */
-    @Deprecated
     public static final short TYPE_CODE = 175;
 
     /** Channel session unique identifier. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
index 9cd34ebb06ca6..a609e4b24a0a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
@@ -33,7 +33,6 @@
  */
 public final class BinaryMetadataVersionInfo implements Serializable, Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 505;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
index 748b5b5277acd..30c023ff918f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
@@ -27,7 +27,6 @@
 /** Wraps transaction prepare request with application attributes. */
 public class TransactionAttributesAwareRequest extends GridCacheMessage {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 181;
 
     /** Original transaction prepare message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
index c5e566ecb919b..2b5eec5284d0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
@@ -26,7 +26,6 @@
 /** Wraps atomic updates with application attributes. */
 public class AtomicApplicationAttributesAwareRequest extends GridCacheIdMessage {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 180;
 
     /** Original update message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
index afd4d537448c0..6ac0fb6767caa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
@@ -29,7 +29,6 @@
  */
 public class CachePartitionFullCountersMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 506;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
index f9cd659d9aff4..c91be0a94e92d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
@@ -31,7 +31,6 @@
  */
 public class CachePartitionPartialCountersMap implements Serializable, Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 500;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
index f9560b93085ba..049cb682b85b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java
@@ -26,7 +26,6 @@
 /** Partition reload map for cache. */
 public class CachePartitionsToReloadMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 512;
 
     /** Partition reload map for cache. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
index 42430bb990328..44e710d13ae00 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
@@ -40,7 +40,6 @@
 public class GridDhtPartitionFullMap
     extends AbstractMap<UUID, GridDhtPartitionMap> implements Comparable<GridDhtPartitionFullMap>, Externalizable, Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 519;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
index b6ac06937d585..7bda312f9b650 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
@@ -36,7 +36,6 @@
  */
 public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 518;
 
     /** Node ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
index 29bc5eb720b11..80102e83af0e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
@@ -24,7 +24,6 @@
 /** Pair of group ID and partition ID. */
 public class GroupPartitionIdPair implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 508;
 
     /** Group ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
index dc690a910d802..3c718f58c3cb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
@@ -35,7 +35,6 @@
  */
 public class IgniteDhtDemandedPartitionsMap implements Serializable, Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 501;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
index b65718776b945..8c3e1029bb4af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
@@ -28,7 +28,6 @@
  */
 public class IgniteDhtPartitionCountersMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 507;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
index 5f93bb4f669bf..5bfc1ab8cb3ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
@@ -34,7 +34,6 @@
  */
 public class IgniteDhtPartitionHistorySuppliersMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 510;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
index 46de799239020..e71ee6869194d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
@@ -33,7 +33,6 @@
  */
 public class IgniteDhtPartitionsToReloadMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 513;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
index 21793df14514a..c8614f08a8cca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
@@ -28,7 +28,6 @@
  */
 public class IntLongMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 514;
 
     /** Map. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
index 924ff52d8bcb7..14eb95f0cf60d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
@@ -26,7 +26,6 @@
 /** Map for storing GroupPartitionIdPair and their respective history counter values. */
 public class PartitionReservationsMap implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 509;
 
     /** Mapping between GroupPartitionIdPair objects and their respective history counter values. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
index 38f4d56637614..63faa89841eb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java
@@ -25,7 +25,6 @@
 /** Partitions to reload. */
 public class PartitionsToReload implements Message {
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 511;
 
     /** Set of partitions to reload. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
index 896b08a4c4b92..30526aa14b1d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
@@ -29,7 +29,6 @@
  */
 public class IncrementalSnapshotAwareMessage extends GridCacheMessage {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 400;
 
     /** Original transaction message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
index 54b9ba9b1de66..71ac90131efcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
@@ -26,7 +26,6 @@
  */
 public class SnapshotFilesFailureMessage extends AbstractSnapshotMessage {
     /** Snapshot response message type (value is {@code 179}). */
-    @Deprecated
     public static final short TYPE_CODE = 179;
 
     /** Exception message which is occurred during snapshot request processing. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
index 912380293b03c..cbf7770bbae87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
@@ -35,7 +35,6 @@
  */
 public class SnapshotFilesRequestMessage extends AbstractSnapshotMessage {
     /** Snapshot request message type (value is {@code 178}). */
-    @Deprecated
     public static final short TYPE_CODE = 178;
 
     /** Snapshot operation request ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
index a7bbdc80ab77d..e8e98ae20b245 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
@@ -27,7 +27,6 @@
 /** Cache metrics message. */
 public class CacheMetricsMessage implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 136;
 
     /** Number of reads. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
index 7f44bcd3ecd0d..051f5f28fc717 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
@@ -31,7 +31,6 @@
 /** */
 public final class ClusterMetricsUpdateMessage implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 133;
 
     /** Single node metrics message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
index d5a0300a5bdb4..fe5f1671404dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
@@ -29,7 +29,6 @@
 /** Node compound metrics message. */
 public class NodeFullMetricsMessage implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 138;
 
     /** Node metrics wrapper message. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
index 423fcc1e0092e..6cef552e80617 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
@@ -34,7 +34,6 @@
 /** */
 public class NodeMetricsMessage implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 137;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
index 6e0c4e58b4765..d66085774c6a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
@@ -27,7 +27,6 @@
  */
 public class GridQueryKillRequest implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 172;
 
     /** Request id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index 687760c5baf03..f906e7e011916 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -27,7 +27,6 @@
  */
 public class GridQueryKillResponse implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 173;
 
     /** Error text. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
index 89021e7bee3b1..5ef7339a70872 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
@@ -29,7 +29,6 @@ public class StatisticsColumnData implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 186;
 
     /** Min value in column. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
index 992d9276e3baf..3ed48fc1d194d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
@@ -32,7 +32,6 @@ public class StatisticsDecimalMessage implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 184;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
index c9a8f7c967ae7..17e5eb44ad3fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
@@ -32,7 +32,6 @@ public class StatisticsKeyMessage implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 183;
 
     /** Object schema. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
index 01e1faa12575b..f7118b53cab29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
@@ -31,7 +31,6 @@ public class StatisticsObjectData implements Message, Serializable {
     private static final long serialVersionUID = 0L;
 
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 185;
 
     /** Statistics key. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
index 747e54fd6c7f8..68be1c1ee216a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
@@ -30,7 +30,6 @@
  */
 public class StatisticsRequest implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 187;
 
     /** Gathering id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
index e691c7616eff2..da2bb20d6ed31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
@@ -27,7 +27,6 @@
  */
 public class StatisticsResponse implements Message {
     /** */
-    @Deprecated
     public static final short TYPE_CODE = 188;
 
     /** Request id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
index 3b025e1f9b0a9..6db6f53ec6274 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
@@ -38,7 +38,6 @@ public class GridPartitionStateMap extends AbstractMap<Integer, GridDhtPartition
     public static final GridPartitionStateMap EMPTY = new GridPartitionStateMap(0);
 
     /** Type code. */
-    @Deprecated
     public static final short TYPE_CODE = 517;
 
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
index bc98035237d42..3457d980c47c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
@@ -35,7 +35,6 @@
  */
 public class SingleNodeMessage<R extends Message> implements Message {
     /** Initial channel message type (value is {@code 176}). */
-    @Deprecated
     public static final short TYPE_CODE = 176;
 
     /** Process id. */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 0cff60431700d..02efe024225d6 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -265,19 +265,15 @@ public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
     public static final int DFLT_CONN_PER_NODE = 1;
 
     /** Node ID message type. */
-    @Deprecated
     public static final short NODE_ID_MSG_TYPE = -1;
 
     /** Recovery last received ID message type. */
-    @Deprecated
     public static final short RECOVERY_LAST_ID_MSG_TYPE = -2;
 
     /** Handshake message type. */
-    @Deprecated
     public static final short HANDSHAKE_MSG_TYPE = -3;
 
     /** Handshake wait message type. */
-    @Deprecated
     public static final short HANDSHAKE_WAIT_MSG_TYPE = -28;
 
     /** Communication metrics group name. */

From c5294839890267d1326ea0d6fb17b02573f34dd5 Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Wed, 25 Mar 2026 09:33:24 +0300
Subject: [PATCH 3/8] Use id from a message

---
 .../query/calcite/message/MessageType.java    |  26 +-
 .../internal/MessageSerializerGenerator.java  |  69 +---
 .../communication/GridIoMessageFactory.java   | 361 +++++++++---------
 .../IgniteMessageFactoryImpl.java             |   3 -
 .../discovery/DiscoveryMessageFactory.java    | 186 ++++-----
 .../extensions/communication/Message.java     |   1 -
 .../communication/MessageFactory.java         |   2 +-
 .../communication/MessageSerializer.java      |   7 -
 .../tcp/internal/GridNioServerWrapper.java    |   2 +-
 .../msg/GridH2ValueMessageFactory.java        |  56 +--
 10 files changed, 334 insertions(+), 379 deletions(-)

diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
index 001b7ac00832d..5100a7f5ec05d 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
@@ -31,40 +31,40 @@
  */
 public enum MessageType {
     /** */
-    QUERY_START_REQUEST(QueryStartRequest::new, new QueryStartRequestSerializer(300)),
+    QUERY_START_REQUEST(QueryStartRequest::new, new QueryStartRequestSerializer()),
 
     /** */
-    QUERY_START_RESPONSE(QueryStartResponse::new, new QueryStartResponseSerializer(301)),
+    QUERY_START_RESPONSE(QueryStartResponse::new, new QueryStartResponseSerializer()),
 
     /** */
-    QUERY_ERROR_MESSAGE(CalciteErrorMessage::new, new CalciteErrorMessageSerializer(302)),
+    QUERY_ERROR_MESSAGE(CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
 
     /** */
-    QUERY_BATCH_MESSAGE(QueryBatchMessage::new, new QueryBatchMessageSerializer(303)),
+    QUERY_BATCH_MESSAGE(QueryBatchMessage::new, new QueryBatchMessageSerializer()),
 
     /** */
-    QUERY_ACKNOWLEDGE_MESSAGE(QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer(304)),
+    QUERY_ACKNOWLEDGE_MESSAGE(QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
 
     /** */
-    QUERY_INBOX_CANCEL_MESSAGE(InboxCloseMessage::new, new InboxCloseMessageSerializer(305)),
+    QUERY_INBOX_CANCEL_MESSAGE(InboxCloseMessage::new, new InboxCloseMessageSerializer()),
 
     /** */
-    QUERY_CLOSE_MESSAGE(QueryCloseMessage::new, new QueryCloseMessageSerializer(306)),
+    QUERY_CLOSE_MESSAGE(QueryCloseMessage::new, new QueryCloseMessageSerializer()),
 
     /** */
-    GENERIC_VALUE_MESSAGE(GenericValueMessage::new, new GenericValueMessageSerializer(307)),
+    GENERIC_VALUE_MESSAGE(GenericValueMessage::new, new GenericValueMessageSerializer()),
 
     /** */
-    FRAGMENT_MAPPING(FragmentMapping::new, new FragmentMappingSerializer(350)),
+    FRAGMENT_MAPPING(FragmentMapping::new, new FragmentMappingSerializer()),
 
     /** */
-    COLOCATION_GROUP(ColocationGroup::new, new ColocationGroupSerializer(351)),
+    COLOCATION_GROUP(ColocationGroup::new, new ColocationGroupSerializer()),
 
     /** */
-    FRAGMENT_DESCRIPTION(FragmentDescription::new, new FragmentDescriptionSerializer(352)),
+    FRAGMENT_DESCRIPTION(FragmentDescription::new, new FragmentDescriptionSerializer()),
 
     /** */
-    QUERY_TX_ENTRY(QueryTxEntry::new, new QueryTxEntrySerializer(353));
+    QUERY_TX_ENTRY(QueryTxEntry::new, new QueryTxEntrySerializer());
 
     /** */
     private final Supplier<CalciteMessage> factory;
@@ -92,7 +92,7 @@ public Supplier<CalciteMessage> factory() {
      * @return Message direct type.
      */
     public short directType() {
-        return serializer.directType();
+        return factory.get().directType();
     }
 
     /**
diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
index 18e4a9fab0816..fef259eec6a08 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
@@ -170,8 +170,6 @@ private String generateSerializerCode(String serClsName) throws IOException {
             fields.add("private final ClassLoader clsLdr;");
         }
 
-        fields.add("private final short directType;");
-
         try (Writer writer = new StringWriter()) {
             writeClassHeader(writer, env.getElementUtils().getPackageOf(type).toString(), serClsName);
 
@@ -191,24 +189,6 @@ private String generateSerializerCode(String serClsName) throws IOException {
 
             writer.write(TAB + "}" + NL);
 
-            ++indent;
-
-            writer.write(NL);
-            writer.write(identedLine("@Override public short directType() {"));
-            writer.write(NL);
-
-            ++indent;
-
-            writer.write(identedLine("return directType;"));
-            writer.write(NL);
-
-            --indent;
-
-            writer.write(identedLine("}"));
-            writer.write(NL);
-
-            --indent;
-
             writer.write("}");
 
             writer.write(NL);
@@ -219,37 +199,22 @@ private String generateSerializerCode(String serClsName) throws IOException {
 
     /** */
     private void writeConstructor(Writer writer, String serClsName) throws IOException {
-        ++indent;
-
-        if (marshallableMessage()) {
-            writer.write(identedLine(METHOD_JAVADOC));
-            writer.write(NL);
-            writer.write(identedLine("public " + serClsName + "(Marshaller marshaller, ClassLoader clsLdr, int directType) {"));
-
-            writer.write(NL);
-
-            ++indent;
+        if (!marshallableMessage())
+            return;
 
-            writer.write(identedLine("this.marshaller = marshaller;"));
-            writer.write(NL);
-            writer.write(identedLine("this.clsLdr = clsLdr;"));
-            writer.write(NL);
-            writer.write(identedLine("this.directType = (short)directType;"));
-            writer.write(NL);
-        }
-        else {
-            writer.write(identedLine(METHOD_JAVADOC));
-            writer.write(NL);
-            writer.write(identedLine("public " + serClsName + "(int directType) {"));
+        ++indent;
 
-            writer.write(NL);
+        writer.write(identedLine(METHOD_JAVADOC));
+        writer.write(NL);
+        writer.write(identedLine("public " + serClsName + "(Marshaller marshaller, ClassLoader clsLdr) {"));
 
-            ++indent;
+        writer.write(NL);
 
-            writer.write(identedLine("this.directType = (short)directType;"));
-            writer.write(NL);
+        ++indent;
 
-        }
+        writer.write(identedLine("this.marshaller = marshaller;"));
+        writer.write(NL);
+        writer.write(identedLine("this.clsLdr = clsLdr;"));
 
         --indent;
 
@@ -284,7 +249,7 @@ private void generateMethods(List<VariableElement> fields) throws Exception {
      * <pre>
      *     public boolean writeTo(Message m, MessageWriter writer) {
      *         if (!writer.isHeaderWritten()) {
-     *             if (!writer.writeHeader(directType))
+     *             if (!writer.writeHeader(msg.directType()))
      *                 return false;
      *
      *             writer.onHeaderWritten();
@@ -310,7 +275,7 @@ private void start(Collection<String> code, boolean write) {
 
             indent++;
 
-            returnFalseIfWriteFailed(code, "writer.writeHeader");
+            returnFalseIfWriteFailed(code, "writer.writeHeader", "directType()");
 
             if (write && marshallableMessage()) {
                 imports.add("org.apache.ignite.IgniteCheckedException");
@@ -566,12 +531,14 @@ private String typeNameToFieldName(String typeName) {
     /**
      * Generate code of writing header.
      * <pre>
-     * if (!writer.writeHeader(directType))
+     * if (!writer.writeHeader(msg.directType()))
      *     return false;
      * </pre>
      */
-    private void returnFalseIfWriteFailed(Collection<String> code, String accessor) {
-        code.add(identedLine("if (!%s(directType))", accessor));
+    private void returnFalseIfWriteFailed(Collection<String> code, String accessor, @Nullable String... args) {
+        String argsStr = String.join(", ", args);
+
+        code.add(identedLine("if (!%s(msg.%s))", accessor, argsStr));
 
         indent++;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 50e20f61cd36b..40cca1502b256 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -360,7 +360,6 @@
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 import org.apache.ignite.spi.collision.jobstealing.JobStealingRequest;
 import org.apache.ignite.spi.collision.jobstealing.JobStealingRequestSerializer;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.communication.tcp.internal.TcpInverseConnectionResponseMessage;
 import org.apache.ignite.spi.communication.tcp.internal.TcpInverseConnectionResponseMessageSerializer;
 import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage;
@@ -396,215 +395,215 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         // -54 is reserved for SQL.
         // We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
         factory.register(CompressedMessage.TYPE_CODE, CompressedMessage::new);
-        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr, -66));
-        factory.register(TxInfo::new, new TxInfoSerializer(-65));
-        factory.register(TxEntriesInfo::new, new TxEntriesInfoSerializer(-64));
-        factory.register(ExchangeInfo::new, new ExchangeInfoSerializer(-63));
-        factory.register(IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer(-62));
-        factory.register(IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer(-61));
-        factory.register(SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer(-53));
-        factory.register(NearCacheUpdates::new, new NearCacheUpdatesSerializer(-51));
-        factory.register(GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer(-50));
-        factory.register(UpdateErrors::new, new UpdateErrorsSerializer(-49));
-        factory.register(GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer(-48));
-        factory.register(GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer(-45));
+        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(TxInfo::new, new TxInfoSerializer());
+        factory.register(TxEntriesInfo::new, new TxEntriesInfoSerializer());
+        factory.register(ExchangeInfo::new, new ExchangeInfoSerializer());
+        factory.register(IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer());
+        factory.register(IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer());
+        factory.register(SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer());
+        factory.register(NearCacheUpdates::new, new NearCacheUpdatesSerializer());
+        factory.register(GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer());
+        factory.register(UpdateErrors::new, new UpdateErrorsSerializer());
+        factory.register(GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
+        factory.register(GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
         factory.register((short)-43, IgniteIoTestMessage::new);
-        factory.register(GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer(-36));
-        factory.register(GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer(-27));
-        factory.register(TxLockList::new, new TxLockListSerializer(-26));
-        factory.register(TxLock::new, new TxLockSerializer(-25));
-        factory.register(TxLocksRequest::new, new TxLocksRequestSerializer(-24));
-        factory.register(TxLocksResponse::new, new TxLocksResponseSerializer(-23));
-        factory.register(NodeIdMessage::new, new NodeIdMessageSerializer(TcpCommunicationSpi.NODE_ID_MSG_TYPE));
+        factory.register(GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
+        factory.register(GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
+        factory.register(TxLockList::new, new TxLockListSerializer());
+        factory.register(TxLock::new, new TxLockSerializer());
+        factory.register(TxLocksRequest::new, new TxLocksRequestSerializer());
+        factory.register(TxLocksResponse::new, new TxLocksResponseSerializer());
+        factory.register(NodeIdMessage::new, new NodeIdMessageSerializer());
         factory.register(RecoveryLastReceivedMessage::new,
-            new RecoveryLastReceivedMessageSerializer(TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE));
-        factory.register(HandshakeMessage::new, new HandshakeMessageSerializer(TcpCommunicationSpi.HANDSHAKE_MSG_TYPE));
-        factory.register(HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer(TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE));
-        factory.register(GridJobCancelRequest::new, new GridJobCancelRequestSerializer(0));
-        factory.register(GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer(1));
-        factory.register(GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer(2));
-        factory.register(GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer(3));
-        factory.register(GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer(4));
-        factory.register(GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer(5));
-        factory.register(GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer(6));
-        factory.register(GridCheckpointRequest::new, new GridCheckpointRequestSerializer(7));
-        factory.register(GridIoMessage::new, new GridIoMessageMarshallableSerializer(marsh, clsLdr, 8));
-        factory.register(GridIoUserMessage::new, new GridIoUserMessageSerializer(9));
-        factory.register(GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer(10));
-        factory.register(GridDeploymentRequest::new, new GridDeploymentRequestSerializer(11));
-        factory.register(GridDeploymentResponse::new, new GridDeploymentResponseSerializer(12));
-        factory.register(GridEventStorageMessage::new, new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr, 13));
-        factory.register(GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer(16));
-        factory.register(GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer(17));
-        factory.register(IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer(18));
-        factory.register(IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer(19));
-        factory.register(GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer(20));
-        factory.register(GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer(21));
-        factory.register(GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer(22));
-        factory.register(GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer(23));
-        factory.register(GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer(24));
-        factory.register(GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer(25));
-        factory.register(GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer(26));
+            new RecoveryLastReceivedMessageSerializer());
+        factory.register(HandshakeMessage::new, new HandshakeMessageSerializer());
+        factory.register(HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer());
+        factory.register(GridJobCancelRequest::new, new GridJobCancelRequestSerializer());
+        factory.register(GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer());
+        factory.register(GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer());
+        factory.register(GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer());
+        factory.register(GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer());
+        factory.register(GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer());
+        factory.register(GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer());
+        factory.register(GridCheckpointRequest::new, new GridCheckpointRequestSerializer());
+        factory.register(GridIoMessage::new, new GridIoMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(GridIoUserMessage::new, new GridIoUserMessageSerializer());
+        factory.register(GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer());
+        factory.register(GridDeploymentRequest::new, new GridDeploymentRequestSerializer());
+        factory.register(GridDeploymentResponse::new, new GridDeploymentResponseSerializer());
+        factory.register(GridEventStorageMessage::new, new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer());
+        factory.register(GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer());
+        factory.register(IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer());
+        factory.register(IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer());
+        factory.register(GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer());
+        factory.register(GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer());
+        factory.register(GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer());
+        factory.register(GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer());
+        factory.register(GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer());
+        factory.register(GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer());
+        factory.register(GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer());
         // Type 27 is former GridDistributedUnlockRequest
-        factory.register(GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer(28));
-        factory.register(GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer(29));
-        factory.register(GridDhtLockRequest::new, new GridDhtLockRequestSerializer(30));
-        factory.register(GridDhtLockResponse::new, new GridDhtLockResponseSerializer(31));
-        factory.register(GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer(32));
-        factory.register(GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer(33));
-        factory.register(GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer(34));
-        factory.register(GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer(35));
-        factory.register(GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer(36));
-        factory.register(GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer(37));
-        factory.register(GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer(38));
-        factory.register(GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer(39));
-        factory.register(GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer(40));
-        factory.register(GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer(41));
-        factory.register(GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer(42));
-        factory.register(GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer(43));
-        factory.register(GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer(45));
-        factory.register(GridDhtPartitionsFullMessage::new, new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr, 46));
-        factory.register(GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer(47));
-        factory.register(GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer(48));
-        factory.register(GridNearGetRequest::new, new GridNearGetRequestSerializer(49));
-        factory.register(GridNearGetResponse::new, new GridNearGetResponseSerializer(50));
-        factory.register(GridNearLockRequest::new, new GridNearLockRequestSerializer(51));
-        factory.register(GridNearLockResponse::new, new GridNearLockResponseSerializer(52));
-        factory.register(GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer(53));
-        factory.register(GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer(54));
-        factory.register(GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer(55));
-        factory.register(GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer(56));
-        factory.register(GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer(57));
-        factory.register(GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer(58));
-        factory.register(GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer(59));
-        factory.register(GridContinuousMessage::new, new GridContinuousMessageSerializer(61));
-        factory.register(DataStreamerRequest::new, new DataStreamerRequestSerializer(62));
-        factory.register(DataStreamerResponse::new, new DataStreamerResponseSerializer(63));
-        factory.register(GridTaskResultRequest::new, new GridTaskResultRequestSerializer(76));
-        factory.register(GridTaskResultResponse::new, new GridTaskResultResponseSerializer(77));
-        factory.register(MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer(78));
-        factory.register(MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer(79));
-        factory.register(MetadataRequestMessage::new, new MetadataRequestMessageSerializer(80));
-        factory.register(MetadataResponseMessage::new, new MetadataResponseMessageSerializer(81));
-        factory.register(JobStealingRequest::new, new JobStealingRequestSerializer(82));
-        factory.register(GridByteArrayList::new, new GridByteArrayListSerializer(84));
-        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer(86));
-        factory.register(GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer(87));
-        factory.register(GridCacheReturn::new, new GridCacheReturnSerializer(88));
-        factory.register(GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer(91));
-        factory.register(CacheEntryInfoCollection::new, new CacheEntryInfoCollectionSerializer(92));
-        factory.register(CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer(93));
-        factory.register(IgniteTxKey::new, new IgniteTxKeySerializer(94));
-        factory.register(DataStreamerEntry::new, new DataStreamerEntrySerializer(95));
-        factory.register(CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr, 96));
-        factory.register(CacheEvictionEntry::new, new CacheEvictionEntrySerializer(97));
-        factory.register(CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr, 98));
-        factory.register(IgniteTxEntry::new, new IgniteTxEntrySerializer(100));
-        factory.register(TxEntryValueHolder::new, new TxEntryValueHolderSerializer(101));
-        factory.register(CacheVersionedValue::new, new CacheVersionedValueSerializer(102));
-        factory.register(GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer(103));
-        factory.register(GridCacheVersionEx::new, new GridCacheVersionExSerializer(104));
-        factory.register(GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer(106));
-        factory.register(GridQueryFailResponse::new, new GridQueryFailResponseSerializer(107));
-        factory.register(GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer(108));
-        factory.register(GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer(109));
-        factory.register(GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer(112));
-        factory.register(IndexKeyDefinition::new, new IndexKeyDefinitionSerializer(113));
-        factory.register(GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer(114));
-        factory.register(UUIDCollectionMessage::new, new UUIDCollectionMessageSerializer(115));
-        factory.register(GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer(116));
-        factory.register(GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer(117));
-        factory.register(CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer(118));
+        factory.register(GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer());
+        factory.register(GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer());
+        factory.register(GridDhtLockRequest::new, new GridDhtLockRequestSerializer());
+        factory.register(GridDhtLockResponse::new, new GridDhtLockResponseSerializer());
+        factory.register(GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer());
+        factory.register(GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer());
+        factory.register(GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer());
+        factory.register(GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer());
+        factory.register(GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer());
+        factory.register(GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer());
+        factory.register(GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer());
+        factory.register(GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer());
+        factory.register(GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer());
+        factory.register(GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer());
+        factory.register(GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer());
+        factory.register(GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer());
+        factory.register(GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer());
+        factory.register(GridDhtPartitionsFullMessage::new, new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer());
+        factory.register(GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer());
+        factory.register(GridNearGetRequest::new, new GridNearGetRequestSerializer());
+        factory.register(GridNearGetResponse::new, new GridNearGetResponseSerializer());
+        factory.register(GridNearLockRequest::new, new GridNearLockRequestSerializer());
+        factory.register(GridNearLockResponse::new, new GridNearLockResponseSerializer());
+        factory.register(GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer());
+        factory.register(GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer());
+        factory.register(GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer());
+        factory.register(GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer());
+        factory.register(GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer());
+        factory.register(GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer());
+        factory.register(GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer());
+        factory.register(GridContinuousMessage::new, new GridContinuousMessageSerializer());
+        factory.register(DataStreamerRequest::new, new DataStreamerRequestSerializer());
+        factory.register(DataStreamerResponse::new, new DataStreamerResponseSerializer());
+        factory.register(GridTaskResultRequest::new, new GridTaskResultRequestSerializer());
+        factory.register(GridTaskResultResponse::new, new GridTaskResultResponseSerializer());
+        factory.register(MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer());
+        factory.register(MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer());
+        factory.register(MetadataRequestMessage::new, new MetadataRequestMessageSerializer());
+        factory.register(MetadataResponseMessage::new, new MetadataResponseMessageSerializer());
+        factory.register(JobStealingRequest::new, new JobStealingRequestSerializer());
+        factory.register(GridByteArrayList::new, new GridByteArrayListSerializer());
+        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer());
+        factory.register(GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer());
+        factory.register(GridCacheReturn::new, new GridCacheReturnSerializer());
+        factory.register(GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer());
+        factory.register(CacheEntryInfoCollection::new, new CacheEntryInfoCollectionSerializer());
+        factory.register(CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer());
+        factory.register(IgniteTxKey::new, new IgniteTxKeySerializer());
+        factory.register(DataStreamerEntry::new, new DataStreamerEntrySerializer());
+        factory.register(CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr));
+        factory.register(CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
+        factory.register(CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr));
+        factory.register(IgniteTxEntry::new, new IgniteTxEntrySerializer());
+        factory.register(TxEntryValueHolder::new, new TxEntryValueHolderSerializer());
+        factory.register(CacheVersionedValue::new, new CacheVersionedValueSerializer());
+        factory.register(GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer());
+        factory.register(GridCacheVersionEx::new, new GridCacheVersionExSerializer());
+        factory.register(GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer());
+        factory.register(GridQueryFailResponse::new, new GridQueryFailResponseSerializer());
+        factory.register(GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer());
+        factory.register(GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer());
+        factory.register(GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer());
+        factory.register(IndexKeyDefinition::new, new IndexKeyDefinitionSerializer());
+        factory.register(GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer());
+        factory.register(UUIDCollectionMessage::new, new UUIDCollectionMessageSerializer());
+        factory.register(GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer());
+        factory.register(GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer());
+        factory.register(CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer());
 
         // [120..123] - DR
-        factory.register(GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer(125));
-        factory.register(GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer(126));
-        factory.register(GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer(127));
-        factory.register(CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer(128));
-        factory.register(WalStateAckMessage::new, new WalStateAckMessageSerializer(129));
-        factory.register(UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer(130));
-        factory.register(UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer(131));
-        factory.register(UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer(132));
+        factory.register(GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer());
+        factory.register(GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer());
+        factory.register(GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer());
+        factory.register(CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer());
+        factory.register(WalStateAckMessage::new, new WalStateAckMessageSerializer());
+        factory.register(UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer());
+        factory.register(UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer());
+        factory.register(UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer());
         factory.register(ClusterMetricsUpdateMessage::new,
-            new ClusterMetricsUpdateMessageSerializer(ClusterMetricsUpdateMessage.TYPE_CODE));
-        factory.register(ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer(134));
-        factory.register(LatchAckMessage::new, new LatchAckMessageSerializer(135));
-        factory.register(CacheMetricsMessage::new, new CacheMetricsMessageSerializer(CacheMetricsMessage.TYPE_CODE));
-        factory.register(NodeMetricsMessage::new, new NodeMetricsMessageSerializer(NodeMetricsMessage.TYPE_CODE));
-        factory.register(NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer(NodeFullMetricsMessage.TYPE_CODE));
-        factory.register(PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr, 157));
-        factory.register(GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer(162));
-        factory.register(GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer(163));
-        factory.register(ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer(167));
-        factory.register(ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer(168));
-        factory.register(ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer(169));
-        factory.register(GridQueryKillRequest::new, new GridQueryKillRequestSerializer(GridQueryKillRequest.TYPE_CODE));
-        factory.register(GridQueryKillResponse::new, new GridQueryKillResponseSerializer(GridQueryKillResponse.TYPE_CODE));
+            new ClusterMetricsUpdateMessageSerializer());
+        factory.register(ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer());
+        factory.register(LatchAckMessage::new, new LatchAckMessageSerializer());
+        factory.register(CacheMetricsMessage::new, new CacheMetricsMessageSerializer());
+        factory.register(NodeMetricsMessage::new, new NodeMetricsMessageSerializer());
+        factory.register(NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer());
+        factory.register(PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
+        factory.register(GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer());
+        factory.register(ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
+        factory.register(ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
+        factory.register(ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer());
+        factory.register(GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
+        factory.register(GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
         factory.register(GridIoSecurityAwareMessage::new,
-            new GridIoSecurityAwareMessageMarshallableSerializer(marsh, clsLdr, GridIoSecurityAwareMessage.TYPE_CODE));
-        factory.register(SessionChannelMessage::new, new SessionChannelMessageSerializer(SessionChannelMessage.TYPE_CODE));
-        factory.register(SingleNodeMessage::new, new SingleNodeMessageSerializer(SingleNodeMessage.TYPE_CODE));
-        factory.register(TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer(177));
+            new GridIoSecurityAwareMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(SessionChannelMessage::new, new SessionChannelMessageSerializer());
+        factory.register(SingleNodeMessage::new, new SingleNodeMessageSerializer());
+        factory.register(TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer());
         factory.register(SnapshotFilesRequestMessage::new,
-            new SnapshotFilesRequestMessageSerializer(SnapshotFilesRequestMessage.TYPE_CODE));
+            new SnapshotFilesRequestMessageSerializer());
         factory.register(SnapshotFilesFailureMessage::new,
-            new SnapshotFilesFailureMessageSerializer(SnapshotFilesFailureMessage.TYPE_CODE));
-        factory.register(AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer(180));
-        factory.register(TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer(181));
+            new SnapshotFilesFailureMessageSerializer());
+        factory.register(AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer());
+        factory.register(TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer());
 
         // Incremental snapshot.
         factory.register(IncrementalSnapshotAwareMessage::new,
-            new IncrementalSnapshotAwareMessageSerializer(IncrementalSnapshotAwareMessage.TYPE_CODE));
+            new IncrementalSnapshotAwareMessageSerializer());
 
         // Index statistics.
-        factory.register(StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer(StatisticsKeyMessage.TYPE_CODE));
-        factory.register(StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer(StatisticsDecimalMessage.TYPE_CODE));
-        factory.register(StatisticsObjectData::new, new StatisticsObjectDataSerializer(StatisticsObjectData.TYPE_CODE));
-        factory.register(StatisticsColumnData::new, new StatisticsColumnDataSerializer(StatisticsColumnData.TYPE_CODE));
-        factory.register(StatisticsRequest::new, new StatisticsRequestSerializer(StatisticsRequest.TYPE_CODE));
-        factory.register(StatisticsResponse::new, new StatisticsResponseSerializer(StatisticsResponse.TYPE_CODE));
+        factory.register(StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer());
+        factory.register(StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer());
+        factory.register(StatisticsObjectData::new, new StatisticsObjectDataSerializer());
+        factory.register(StatisticsColumnData::new, new StatisticsColumnDataSerializer());
+        factory.register(StatisticsRequest::new, new StatisticsRequestSerializer());
+        factory.register(StatisticsResponse::new, new StatisticsResponseSerializer());
 
         factory.register(CachePartitionPartialCountersMap::new,
-            new CachePartitionPartialCountersMapSerializer(CachePartitionPartialCountersMap.TYPE_CODE));
+            new CachePartitionPartialCountersMapSerializer());
         factory.register(IgniteDhtDemandedPartitionsMap::new,
-            new IgniteDhtDemandedPartitionsMapSerializer(IgniteDhtDemandedPartitionsMap.TYPE_CODE));
+            new IgniteDhtDemandedPartitionsMapSerializer());
         factory.register(BinaryMetadataVersionInfo::new,
-            new BinaryMetadataVersionInfoSerializer(BinaryMetadataVersionInfo.TYPE_CODE));
+            new BinaryMetadataVersionInfoSerializer());
         factory.register(CachePartitionFullCountersMap::new,
-            new CachePartitionFullCountersMapSerializer(CachePartitionFullCountersMap.TYPE_CODE));
+            new CachePartitionFullCountersMapSerializer());
         factory.register(IgniteDhtPartitionCountersMap::new,
-            new IgniteDhtPartitionCountersMapSerializer(IgniteDhtPartitionCountersMap.TYPE_CODE));
-        factory.register(GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer(GroupPartitionIdPair.TYPE_CODE));
-        factory.register(PartitionReservationsMap::new, new PartitionReservationsMapSerializer(PartitionReservationsMap.TYPE_CODE));
+            new IgniteDhtPartitionCountersMapSerializer());
+        factory.register(GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
+        factory.register(PartitionReservationsMap::new, new PartitionReservationsMapSerializer());
         factory.register(IgniteDhtPartitionHistorySuppliersMap::new,
-            new IgniteDhtPartitionHistorySuppliersMapSerializer(IgniteDhtPartitionHistorySuppliersMap.TYPE_CODE));
-        factory.register(PartitionsToReload::new, new PartitionsToReloadSerializer(PartitionsToReload.TYPE_CODE));
+            new IgniteDhtPartitionHistorySuppliersMapSerializer());
+        factory.register(PartitionsToReload::new, new PartitionsToReloadSerializer());
         factory.register(CachePartitionsToReloadMap::new,
-            new CachePartitionsToReloadMapSerializer(CachePartitionsToReloadMap.TYPE_CODE));
+            new CachePartitionsToReloadMapSerializer());
         factory.register(IgniteDhtPartitionsToReloadMap::new,
-            new IgniteDhtPartitionsToReloadMapSerializer(IgniteDhtPartitionsToReloadMap.TYPE_CODE));
-        factory.register(IntLongMap::new, new IntLongMapSerializer(IntLongMap.TYPE_CODE));
+            new IgniteDhtPartitionsToReloadMapSerializer());
+        factory.register(IntLongMap::new, new IntLongMapSerializer());
         factory.register(IndexKeyTypeMessage::new,
-            new IndexKeyTypeMessageMarshallableSerializer(marsh, clsLdr, IndexKeyTypeMessage.TYPE_CODE));
-        factory.register(GridPartitionStateMap::new, new GridPartitionStateMapSerializer(GridPartitionStateMap.TYPE_CODE));
-        factory.register(GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer(GridDhtPartitionMap.TYPE_CODE));
-        factory.register(GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer(GridDhtPartitionFullMap.TYPE_CODE));
-        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer(520));
-        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer(521));
-        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer(522));
-        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer(523));
+            new IndexKeyTypeMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
+        factory.register(GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
+        factory.register(GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
+        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
+        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
+        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
+        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
         factory.register(IncrementalSnapshotVerifyResult::new,
-            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr, 524));
+            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotRestoreOperationResponse::new,
-            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr, 525));
+            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotMetadataResponse::new,
-            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr, 526));
+            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotCheckPartitionHashesResponse::new,
-            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr, 527));
-        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer(528));
-        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer(529));
+            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
+        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
+        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
         factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
-            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr, 530));
+            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
 
         // [-3..119] [124..129] [-23..-28] [-36..-55] [183..188] - this
         // [120..123] - DR
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index baf681158008e..ca997a3ec9d6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -64,9 +64,6 @@ public class IgniteMessageFactoryImpl implements MessageFactory {
             return msg.readFrom(buf, reader);
         }
 
-        @Override public short directType() {
-            throw new UnsupportedOperationException("Default serializer does not support custom direct type");
-        }
     };
 
     /** Message suppliers. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index fcb2a1c1b5529..c14e8f3935cc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -225,118 +225,118 @@ public DiscoveryMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
         factory.register(TcpDiscoveryCollectionMessage::new,
-            new TcpDiscoveryCollectionMessageMarshallableSerializer(marsh, clsLdr, -200));
+            new TcpDiscoveryCollectionMessageMarshallableSerializer(marsh, clsLdr));
 
-        factory.register(SchemaAlterTableAddColumnOperation::new, new SchemaAlterTableAddColumnOperationSerializer(-115));
-        factory.register(SchemaIndexCreateOperation::new, new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr, -114));
-        factory.register(SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer(-113));
-        factory.register(SchemaAlterTableDropColumnOperation::new, new SchemaAlterTableDropColumnOperationSerializer(-112));
-        factory.register(SchemaAddQueryEntityOperation::new, new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr, -111));
-        factory.register(QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr, -110));
-        factory.register(User::new, new UserSerializer(-109));
-        factory.register(UserManagementOperation::new, new UserManagementOperationSerializer(-108));
-        factory.register(NodeSpecificData::new, new NodeSpecificDataSerializer(-107));
-        factory.register(DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer(-106));
-        factory.register(TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer(-105));
-        factory.register(TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer(-104));
-        factory.register(TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer(-103));
-        factory.register(TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer(-102));
-        factory.register(InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer(-101));
-        factory.register(InetAddressMessage::new, new InetAddressMessageSerializer(-100));
-        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr, -66));
+        factory.register(SchemaAlterTableAddColumnOperation::new, new SchemaAlterTableAddColumnOperationSerializer());
+        factory.register(SchemaIndexCreateOperation::new, new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr));
+        factory.register(SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer());
+        factory.register(SchemaAlterTableDropColumnOperation::new, new SchemaAlterTableDropColumnOperationSerializer());
+        factory.register(SchemaAddQueryEntityOperation::new, new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr));
+        factory.register(QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr));
+        factory.register(User::new, new UserSerializer());
+        factory.register(UserManagementOperation::new, new UserManagementOperationSerializer());
+        factory.register(NodeSpecificData::new, new NodeSpecificDataSerializer());
+        factory.register(DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer());
+        factory.register(TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer());
+        factory.register(TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer());
+        factory.register(TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer());
+        factory.register(TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer());
+        factory.register(InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer());
+        factory.register(InetAddressMessage::new, new InetAddressMessageSerializer());
+        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
 
         // TcpDiscoveryAbstractMessage
-        factory.register(TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer(0));
-        factory.register(TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer(1));
-        factory.register(TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer(2));
-        factory.register(TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer(3));
-        factory.register(TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer(4));
-        factory.register(TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer(5));
-        factory.register(TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer(6));
-        factory.register(TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer(7));
-        factory.register(TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer(8));
-        factory.register(TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer(9));
-        factory.register(TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer(10));
-        factory.register(TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer(11));
-        factory.register(TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer(12));
-        factory.register(TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer(13));
-        factory.register(TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer(14));
-        factory.register(TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer(15));
-        factory.register(TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr, 16));
-        factory.register(TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr, 17));
-        factory.register(TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer(18));
+        factory.register(TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer());
+        factory.register(TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer());
+        factory.register(TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
+        factory.register(TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
+        factory.register(TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
+        factory.register(TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
+        factory.register(TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer());
+        factory.register(TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer());
+        factory.register(TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer());
+        factory.register(TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer());
+        factory.register(TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer());
+        factory.register(TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer());
+        factory.register(TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer());
+        factory.register(TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer());
+        factory.register(TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer());
+        factory.register(TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer());
+        factory.register(TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer());
         factory.register(TcpDiscoveryNodeAddFinishedMessage::new,
-            new TcpDiscoveryNodeAddFinishedMessageMarshallableSerializer(marsh, clsLdr, 19));
+            new TcpDiscoveryNodeAddFinishedMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(TcpDiscoveryJoinRequestMessage::new,
-            new TcpDiscoveryJoinRequestMessageMarshallableSerializer(marsh, clsLdr, 20));
+            new TcpDiscoveryJoinRequestMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(TcpDiscoveryCustomEventMessage::new,
-            new TcpDiscoveryCustomEventMessageMarshallableSerializer(marsh, clsLdr, 21));
+            new TcpDiscoveryCustomEventMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(TcpDiscoveryServerOnlyCustomEventMessage::new,
-            new TcpDiscoveryServerOnlyCustomEventMessageMarshallableSerializer(marsh, clsLdr, 22));
-        factory.register(TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer(23));
-        factory.register(DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer(24));
-        factory.register(DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer(25));
-        factory.register(DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer(26));
-        factory.register(DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer(27));
-        factory.register(TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer(28));
-        factory.register(TcpDiscoveryNodeAddedMessage::new, new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr, 29));
-        factory.register(FullMessage::new, new FullMessageSerializer(30));
-        factory.register(InitMessage::new, new InitMessageSerializer(31));
-        factory.register(SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer(32));
-        factory.register(SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer(33));
-        factory.register(SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer(34));
-        factory.register(MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer(35));
-        factory.register(SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer(36));
-        factory.register(SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer(37));
-        factory.register(ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer(38));
+            new TcpDiscoveryServerOnlyCustomEventMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer());
+        factory.register(DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer());
+        factory.register(DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer());
+        factory.register(DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer());
+        factory.register(DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer());
+        factory.register(TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer());
+        factory.register(TcpDiscoveryNodeAddedMessage::new, new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(FullMessage::new, new FullMessageSerializer());
+        factory.register(InitMessage::new, new InitMessageSerializer());
+        factory.register(SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer());
+        factory.register(SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer());
+        factory.register(SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer());
+        factory.register(MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer());
+        factory.register(SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer());
+        factory.register(SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer());
+        factory.register(ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer());
 
-        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer(86));
+        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer());
 
         // DiscoveryCustomMessage
-        factory.register(CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer(500));
+        factory.register(CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer());
         factory.register(SecurityAwareCustomMessageWrapper::new,
-            new SecurityAwareCustomMessageWrapperMarshallableSerializer(marsh, clsLdr, 501));
-        factory.register(MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer(502));
-        factory.register(MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer(503));
-        factory.register(SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer(504));
-        factory.register(SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer(505));
-        factory.register(WalStateFinishMessage::new, new WalStateFinishMessageSerializer(506));
-        factory.register(WalStateProposeMessage::new, new WalStateProposeMessageSerializer(507));
-        factory.register(MetadataUpdateAcceptedMessage::new, new MetadataUpdateAcceptedMessageSerializer(508));
+            new SecurityAwareCustomMessageWrapperMarshallableSerializer(marsh, clsLdr));
+        factory.register(MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer());
+        factory.register(MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer());
+        factory.register(SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer());
+        factory.register(SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer());
+        factory.register(WalStateFinishMessage::new, new WalStateFinishMessageSerializer());
+        factory.register(WalStateProposeMessage::new, new WalStateProposeMessageSerializer());
+        factory.register(MetadataUpdateAcceptedMessage::new, new MetadataUpdateAcceptedMessageSerializer());
         factory.register(TxTimeoutOnPartitionMapExchangeChangeMessage::new,
-            new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer(509));
-        factory.register(UserAcceptedMessage::new, new UserAcceptedMessageSerializer(510));
-        factory.register(UserProposedMessage::new, new UserProposedMessageSerializer(511));
-        factory.register(ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer(512));
-        factory.register(StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer(513));
-        factory.register(StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer(514));
-        factory.register(CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer(515));
-        factory.register(ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer(516));
-        factory.register(MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer(517));
-        factory.register(MappingProposedMessage::new, new MappingProposedMessageSerializer(518));
-        factory.register(MarshallerMappingItem::new, new MarshallerMappingItemSerializer(519));
-        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer(520));
-        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer(521));
-        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer(522));
-        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer(523));
+            new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer());
+        factory.register(UserAcceptedMessage::new, new UserAcceptedMessageSerializer());
+        factory.register(UserProposedMessage::new, new UserProposedMessageSerializer());
+        factory.register(ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer());
+        factory.register(StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer());
+        factory.register(StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer());
+        factory.register(CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer());
+        factory.register(ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
+        factory.register(MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
+        factory.register(MappingProposedMessage::new, new MappingProposedMessageSerializer());
+        factory.register(MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
+        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
+        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
+        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
+        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
         factory.register(IncrementalSnapshotVerifyResult::new,
-            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr, 524));
+            new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotRestoreOperationResponse::new,
-            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr, 525));
+            new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotMetadataResponse::new,
-            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr, 526));
+            new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
         factory.register(SnapshotCheckPartitionHashesResponse::new,
-            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr, 527));
-        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer(528));
-        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer(529));
+            new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
+        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
+        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
         factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
-            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr, 530));
-        factory.register(CacheStatisticsClearMessage::new, new CacheStatisticsClearMessageSerializer(531));
+            new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
+        factory.register(CacheStatisticsClearMessage::new, new CacheStatisticsClearMessageSerializer());
         factory.register(ChangeGlobalStateMessage::new,
-            new ChangeGlobalStateMessageMarshallableSerializer(marsh, clsLdr, 532));
+            new ChangeGlobalStateMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(ClientCacheChangeDummyDiscoveryMessage::new,
-            new ClientCacheChangeDummyDiscoveryMessageMarshallableSerializer(marsh, clsLdr, 533));
+            new ClientCacheChangeDummyDiscoveryMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(DynamicCacheChangeBatch::new,
-            new DynamicCacheChangeBatchMarshallableSerializer(marsh, clsLdr, 534));
+            new DynamicCacheChangeBatchMarshallableSerializer(marsh, clsLdr));
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index a2693d3da0e5c..3f9bcdce402a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -57,6 +57,5 @@ public default boolean readFrom(ByteBuffer buf, MessageReader reader) {
      *
      * @return Message type.
      */
-    @Deprecated
     public short directType();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index eabf13ab52d4b..db77f80dc0478 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -66,7 +66,7 @@ public interface MessageFactory {
      * is already constructed.
      */
     default void register(Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException {
-        register(serializer.directType(), supplier, serializer);
+        register(supplier.get().directType(), supplier, serializer);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
index c46d7e60c0b4f..90df0601693c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageSerializer.java
@@ -38,11 +38,4 @@ public interface MessageSerializer<M extends Message> {
      * @return Whether message was fully read.
      */
     public boolean readFrom(M msg, MessageReader reader);
-
-    /**
-     * Gets message type.
-     *
-     * @return Message type.
-     */
-    short directType();
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index c49efdc64e921..97a048a508ddd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -833,7 +833,7 @@ public GridNioServer<Message> resetNioServer() throws IgniteCheckedException {
                     @Override public MessageSerializer serializer(short type) {
                         // Enable sending wait message for a communication peer while context isn't initialized.
                         if (impl == null && type == HANDSHAKE_WAIT_MSG_TYPE)
-                            return new HandshakeWaitMessageSerializer(HANDSHAKE_WAIT_MSG_TYPE);
+                            return new HandshakeWaitMessageSerializer();
 
                         return get().serializer(type);
                     }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
index 451d46bf1167e..d9d14853751ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
@@ -37,34 +37,34 @@
 public class GridH2ValueMessageFactory implements MessageFactoryProvider {
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
-        factory.register(() -> GridH2Null.INSTANCE, new GridH2NullSerializer(-4));
-        factory.register(GridH2Boolean::new, new GridH2BooleanSerializer(-5));
-        factory.register(GridH2Byte::new, new GridH2ByteSerializer(-6));
-        factory.register(GridH2Short::new, new GridH2ShortSerializer(-7));
-        factory.register(GridH2Integer::new, new GridH2IntegerSerializer(-8));
-        factory.register(GridH2Long::new, new GridH2LongSerializer(-9));
-        factory.register(GridH2Decimal::new, new GridH2DecimalSerializer(-10));
-        factory.register(GridH2Double::new, new GridH2DoubleSerializer(-11));
-        factory.register(GridH2Float::new, new GridH2FloatSerializer(-12));
-        factory.register(GridH2Time::new, new GridH2TimeSerializer(-13));
-        factory.register(GridH2Date::new, new GridH2DateSerializer(-14));
-        factory.register(GridH2Timestamp::new, new GridH2TimestampSerializer(-15));
-        factory.register(GridH2Bytes::new, new GridH2BytesSerializer(-16));
-        factory.register(GridH2String::new, new GridH2StringSerializer(-17));
-        factory.register(GridH2Array::new, new GridH2ArraySerializer(-18));
-        factory.register(GridH2JavaObject::new, new GridH2JavaObjectSerializer(-19));
-        factory.register(GridH2Uuid::new, new GridH2UuidSerializer(-20));
-        factory.register(GridH2Geometry::new, new GridH2GeometrySerializer(-21));
-        factory.register(GridH2CacheObject::new, new GridH2CacheObjectSerializer(-22));
-        factory.register(GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer(-30));
-        factory.register(GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer(-31));
-        factory.register(GridH2RowMessage::new, new GridH2RowMessageSerializer(-32));
-        factory.register(GridH2QueryRequest::new, new GridH2QueryRequestSerializer(-33));
-        factory.register(GridH2RowRange::new, new GridH2RowRangeSerializer(-34));
-        factory.register(GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer(-35));
-        factory.register(QueryTable::new, new QueryTableSerializer(-54));
-        factory.register(GridH2DmlRequest::new, new GridH2DmlRequestSerializer(-55));
-        factory.register(GridH2DmlResponse::new, new GridH2DmlResponseSerializer(-56));
+        factory.register(() -> GridH2Null.INSTANCE, new GridH2NullSerializer());
+        factory.register(GridH2Boolean::new, new GridH2BooleanSerializer());
+        factory.register(GridH2Byte::new, new GridH2ByteSerializer());
+        factory.register(GridH2Short::new, new GridH2ShortSerializer());
+        factory.register(GridH2Integer::new, new GridH2IntegerSerializer());
+        factory.register(GridH2Long::new, new GridH2LongSerializer());
+        factory.register(GridH2Decimal::new, new GridH2DecimalSerializer());
+        factory.register(GridH2Double::new, new GridH2DoubleSerializer());
+        factory.register(GridH2Float::new, new GridH2FloatSerializer());
+        factory.register(GridH2Time::new, new GridH2TimeSerializer());
+        factory.register(GridH2Date::new, new GridH2DateSerializer());
+        factory.register(GridH2Timestamp::new, new GridH2TimestampSerializer());
+        factory.register(GridH2Bytes::new, new GridH2BytesSerializer());
+        factory.register(GridH2String::new, new GridH2StringSerializer());
+        factory.register(GridH2Array::new, new GridH2ArraySerializer());
+        factory.register(GridH2JavaObject::new, new GridH2JavaObjectSerializer());
+        factory.register(GridH2Uuid::new, new GridH2UuidSerializer());
+        factory.register(GridH2Geometry::new, new GridH2GeometrySerializer());
+        factory.register(GridH2CacheObject::new, new GridH2CacheObjectSerializer());
+        factory.register(GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer());
+        factory.register(GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer());
+        factory.register(GridH2RowMessage::new, new GridH2RowMessageSerializer());
+        factory.register(GridH2QueryRequest::new, new GridH2QueryRequestSerializer());
+        factory.register(GridH2RowRange::new, new GridH2RowRangeSerializer());
+        factory.register(GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer());
+        factory.register(QueryTable::new, new QueryTableSerializer());
+        factory.register(GridH2DmlRequest::new, new GridH2DmlRequestSerializer());
+        factory.register(GridH2DmlResponse::new, new GridH2DmlResponseSerializer());
     }
 
     /**

From 68f57a74a4bd9066ad6e065b8c66cd4b0138a08d Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Wed, 25 Mar 2026 11:51:48 +0300
Subject: [PATCH 4/8] Fix tests

---
 .../internal/util/distributed/MessagesPluginProvider.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
index 0ef97ffc58de3..f8d6913a944b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
@@ -34,8 +34,8 @@
 public class MessagesPluginProvider extends AbstractTestPluginProvider {
     /** */
     private static final MessageFactoryProvider FACTORY_PROVIDER = f -> {
-        f.register(TestIntegerMessage::new, new TestIntegerMessageSerializer(10_000));
-        f.register(TestUuidMessage::new, new TestUuidMessageSerializer(10_001));
+        f.register(TestIntegerMessage::new, new TestIntegerMessageSerializer());
+        f.register(TestUuidMessage::new, new TestUuidMessageSerializer());
     };
 
     /** {@inheritDoc} */

From 02c51b30751401da1299f0721d6c1b1bdebfcf5a Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Thu, 26 Mar 2026 11:23:25 +0300
Subject: [PATCH 5/8] Fix javadoc

---
 .../managers/communication/GridIoMessageFactory.java       | 7 -------
 .../plugin/extensions/communication/MessageFactory.java    | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 97c48425c970c..8dbea6d9e41e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -481,7 +481,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register(GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer());
         factory.register(GridCacheReturn::new, new GridCacheReturnSerializer());
         factory.register(GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer());
-        factory.register(CacheEntryInfoCollection::new, new CacheEntryInfoCollectionSerializer());
         factory.register(CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer());
         factory.register(IgniteTxKey::new, new IgniteTxKeySerializer());
         factory.register(DataStreamerEntry::new, new DataStreamerEntrySerializer());
@@ -500,7 +499,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register(GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer());
         factory.register(IndexKeyDefinition::new, new IndexKeyDefinitionSerializer());
         factory.register(GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer());
-        factory.register(UUIDCollectionMessage::new, new UUIDCollectionMessageSerializer());
         factory.register(GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer());
         factory.register(GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer());
         factory.register(CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer());
@@ -567,14 +565,9 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register(PartitionReservationsMap::new, new PartitionReservationsMapSerializer());
         factory.register(IgniteDhtPartitionHistorySuppliersMap::new,
             new IgniteDhtPartitionHistorySuppliersMapSerializer());
-        factory.register(PartitionsToReload::new, new PartitionsToReloadSerializer());
-        factory.register(CachePartitionsToReloadMap::new,
-            new CachePartitionsToReloadMapSerializer());
         factory.register(IgniteDhtPartitionsToReloadMap::new,
             new IgniteDhtPartitionsToReloadMapSerializer());
         factory.register(IntLongMap::new, new IntLongMapSerializer());
-        factory.register(IndexKeyTypeMessage::new,
-            new IndexKeyTypeMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
         factory.register(GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
         factory.register(GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index db77f80dc0478..fb516b54db51d 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -52,15 +52,15 @@ public interface MessageFactory {
     public void register(short directType, Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException;
 
     /**
-     * Register message factory using the direct type obtained from the serializer via {@link MessageSerializer#directType()}.
+     * Register message factory using the direct type obtained from the message via {@link Message#directType()}.
      * This is a convenience method equivalent to {@link #register(short, Supplier, MessageSerializer)} where the direct
-     * type is derived from the serializer itself.
+     * type is derived from the message instance itself.
      *
      * <p>All messages must be registered during construction of class which implements this interface. Any invocation
      * of this method after initialization is done must throw {@link IllegalStateException} exception.
      *
      * @param supplier Message factory.
-     * @param serializer Message serializer that also provides the direct type for registration.
+     * @param serializer Message serializer.
      * @throws IgniteException In case of attempt to register message with direct type which is already registered.
      * @throws IllegalStateException On any invocation of this method when class which implements this interface
      * is already constructed.

From c8e540a5e2f2668fc882b48d671b44d2add284e0 Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Fri, 27 Mar 2026 09:23:34 +0300
Subject: [PATCH 6/8] Remove directType and use singleton registration

---
 .../calcite/message/CalciteErrorMessage.java  |   4 -
 .../message/CalciteMessageFactory.java        |   2 +-
 .../query/calcite/message/MessageType.java    |  33 +-
 .../apache/ignite/internal/ExchangeInfo.java  |   4 -
 .../ignite/internal/GridJobCancelRequest.java |   4 -
 .../internal/GridJobExecuteRequest.java       |   4 -
 .../internal/GridJobExecuteResponse.java      |   4 -
 .../internal/GridJobSiblingsRequest.java      |   4 -
 .../internal/GridJobSiblingsResponse.java     |   4 -
 .../internal/GridTaskCancelRequest.java       |   4 -
 .../internal/GridTaskSessionRequest.java      |   4 -
 .../internal/IgniteDiagnosticRequest.java     |   4 -
 .../internal/IgniteDiagnosticResponse.java    |   4 -
 .../apache/ignite/internal/TxEntriesInfo.java |   4 -
 .../org/apache/ignite/internal/TxInfo.java    |   4 -
 .../query/index/IndexQueryResultMeta.java     |   5 -
 .../index/sorted/IndexKeyDefinition.java      |   5 -
 .../index/sorted/IndexKeyTypeSettings.java    |   5 -
 .../checkpoint/GridCheckpointRequest.java     |   4 -
 .../communication/CompressedMessage.java      |   8 -
 .../managers/communication/ErrorMessage.java  |   4 -
 .../managers/communication/GridIoMessage.java |   4 -
 .../communication/GridIoMessageFactory.java   | 352 +++++++++---------
 .../GridIoSecurityAwareMessage.java           |   7 -
 .../communication/GridIoUserMessage.java      |   4 -
 .../communication/IgniteIoTestMessage.java    |   4 -
 .../IgniteMessageFactoryImpl.java             |   2 +
 .../communication/SessionChannelMessage.java  |   7 -
 .../deployment/GridDeploymentInfoBean.java    |   4 -
 .../deployment/GridDeploymentRequest.java     |   4 -
 .../deployment/GridDeploymentResponse.java    |   4 -
 .../discovery/DiscoveryMessageFactory.java    | 186 ++++-----
 .../SecurityAwareCustomMessageWrapper.java    |   4 -
 .../ChangeCacheEncryptionRequest.java         |   4 -
 .../GenerateEncryptionKeyRequest.java         |   4 -
 .../GenerateEncryptionKeyResponse.java        |   4 -
 .../encryption/MasterKeyChangeRequest.java    |   4 -
 .../eventstorage/GridEventStorageMessage.java |   4 -
 .../processors/authentication/User.java       |   4 -
 .../authentication/UserAcceptedMessage.java   |   4 -
 .../UserAuthenticateRequestMessage.java       |   4 -
 .../UserAuthenticateResponseMessage.java      |   4 -
 .../UserManagementOperation.java              |   5 -
 ...serManagementOperationFinishedMessage.java |   4 -
 .../authentication/UserProposedMessage.java   |   4 -
 .../cache/CacheAffinityChangeMessage.java     |   4 -
 .../cache/CacheEntryPredicateAdapter.java     |   5 -
 .../processors/cache/CacheEvictionEntry.java  |   5 -
 .../cache/CacheInvokeDirectResult.java        |   4 -
 .../cache/CacheStatisticsClearMessage.java    |   5 -
 .../CacheStatisticsModeChangeMessage.java     |   4 -
 .../ClientCacheChangeDiscoveryMessage.java    |   4 -
 ...lientCacheChangeDummyDiscoveryMessage.java |   4 -
 .../cache/DynamicCacheChangeBatch.java        |   4 -
 .../processors/cache/GridCacheEntryInfo.java  |   5 -
 .../processors/cache/GridCacheReturn.java     |   4 -
 .../GridChangeGlobalStateMessageResponse.java |   4 -
 ...utOnPartitionMapExchangeChangeMessage.java |   4 -
 .../processors/cache/WalStateAckMessage.java  |   4 -
 .../cache/WalStateFinishMessage.java          |   4 -
 .../cache/WalStateProposeMessage.java         |   4 -
 .../binary/BinaryMetadataVersionInfo.java     |   7 -
 .../binary/MetadataRemoveAcceptedMessage.java |   4 -
 .../binary/MetadataRemoveProposedMessage.java |   4 -
 .../cache/binary/MetadataRequestMessage.java  |   5 -
 .../cache/binary/MetadataResponseMessage.java |   5 -
 .../binary/MetadataUpdateAcceptedMessage.java |   4 -
 .../GridCacheTtlUpdateRequest.java            |   4 -
 .../GridCacheTxRecoveryRequest.java           |   4 -
 .../GridCacheTxRecoveryResponse.java          |   4 -
 .../GridDistributedLockRequest.java           |   4 -
 .../GridDistributedLockResponse.java          |   4 -
 .../GridDistributedTxFinishRequest.java       |   4 -
 .../GridDistributedTxFinishResponse.java      |   4 -
 .../GridDistributedTxPrepareRequest.java      |   4 -
 .../GridDistributedTxPrepareResponse.java     |   5 -
 .../distributed/GridNearUnlockRequest.java    |   4 -
 .../dht/GridDhtAffinityAssignmentRequest.java |   4 -
 .../GridDhtAffinityAssignmentResponse.java    |   4 -
 .../distributed/dht/GridDhtLockRequest.java   |   4 -
 .../distributed/dht/GridDhtLockResponse.java  |   4 -
 .../dht/GridDhtTxFinishRequest.java           |   4 -
 .../dht/GridDhtTxFinishResponse.java          |   4 -
 .../GridDhtTxOnePhaseCommitAckRequest.java    |   4 -
 .../dht/GridDhtTxPrepareRequest.java          |   4 -
 .../dht/GridDhtTxPrepareResponse.java         |   4 -
 .../distributed/dht/GridDhtUnlockRequest.java |   4 -
 .../dht/PartitionUpdateCountersMessage.java   |   4 -
 .../TransactionAttributesAwareRequest.java    |   7 -
 ...omicApplicationAttributesAwareRequest.java |   7 -
 .../GridDhtAtomicDeferredUpdateResponse.java  |   4 -
 .../dht/atomic/GridDhtAtomicNearResponse.java |   4 -
 .../GridDhtAtomicSingleUpdateRequest.java     |   4 -
 .../atomic/GridDhtAtomicUpdateRequest.java    |   4 -
 .../atomic/GridDhtAtomicUpdateResponse.java   |   4 -
 .../GridNearAtomicCheckUpdateRequest.java     |   4 -
 .../GridNearAtomicFullUpdateRequest.java      |   4 -
 ...idNearAtomicSingleUpdateFilterRequest.java |   4 -
 ...idNearAtomicSingleUpdateInvokeRequest.java |   4 -
 .../GridNearAtomicSingleUpdateRequest.java    |   4 -
 .../atomic/GridNearAtomicUpdateResponse.java  |   4 -
 .../dht/atomic/NearCacheUpdates.java          |   4 -
 .../distributed/dht/atomic/UpdateErrors.java  |   4 -
 .../preloader/CacheGroupAffinityMessage.java  |   4 -
 .../CachePartitionFullCountersMap.java        |   7 -
 .../CachePartitionPartialCountersMap.java     |   7 -
 .../preloader/GridDhtForceKeysRequest.java    |   4 -
 .../preloader/GridDhtForceKeysResponse.java   |   4 -
 .../GridDhtPartitionDemandMessage.java        |   4 -
 .../preloader/GridDhtPartitionExchangeId.java |   4 -
 .../preloader/GridDhtPartitionFullMap.java    |   7 -
 .../dht/preloader/GridDhtPartitionMap.java    |   7 -
 .../GridDhtPartitionSupplyMessage.java        |   4 -
 .../GridDhtPartitionsFullMessage.java         |   4 -
 .../GridDhtPartitionsSingleMessage.java       |   4 -
 .../GridDhtPartitionsSingleRequest.java       |   4 -
 .../dht/preloader/GroupPartitionIdPair.java   |   7 -
 .../IgniteDhtDemandedPartitionsMap.java       |   7 -
 .../IgniteDhtPartitionCountersMap.java        |   7 -
 ...IgniteDhtPartitionHistorySuppliersMap.java |   7 -
 .../IgniteDhtPartitionsToReloadMap.java       |   7 -
 .../distributed/dht/preloader/IntLongMap.java |   7 -
 .../preloader/PartitionReservationsMap.java   |   7 -
 .../dht/preloader/latch/LatchAckMessage.java  |   5 -
 .../distributed/near/CacheVersionedValue.java |   4 -
 .../distributed/near/GridNearGetRequest.java  |   4 -
 .../distributed/near/GridNearGetResponse.java |   4 -
 .../distributed/near/GridNearLockRequest.java |   4 -
 .../near/GridNearLockResponse.java            |   4 -
 .../near/GridNearSingleGetRequest.java        |   4 -
 .../near/GridNearSingleGetResponse.java       |   4 -
 .../near/GridNearTxFinishRequest.java         |   4 -
 .../near/GridNearTxFinishResponse.java        |   4 -
 .../near/GridNearTxPrepareRequest.java        |   4 -
 .../near/GridNearTxPrepareResponse.java       |   4 -
 .../DataStreamerUpdatesHandlerResult.java     |   4 -
 .../IncrementalSnapshotAwareMessage.java      |   7 -
 .../IncrementalSnapshotVerifyResult.java      |   4 -
 .../SnapshotCheckHandlersNodeResponse.java    |   4 -
 .../SnapshotCheckHandlersResponse.java        |   4 -
 .../SnapshotCheckPartitionHashesResponse.java |   4 -
 .../snapshot/SnapshotCheckProcessRequest.java |   4 -
 .../snapshot/SnapshotCheckResponse.java       |   4 -
 .../snapshot/SnapshotFilesFailureMessage.java |   7 -
 .../snapshot/SnapshotFilesRequestMessage.java |   7 -
 .../snapshot/SnapshotHandlerResult.java       |   4 -
 .../snapshot/SnapshotMetadataResponse.java    |   4 -
 .../snapshot/SnapshotOperationEndRequest.java |   4 -
 .../snapshot/SnapshotOperationRequest.java    |   4 -
 .../snapshot/SnapshotOperationResponse.java   |   4 -
 ...apshotPartitionsVerifyHandlerResponse.java |   4 -
 .../SnapshotRestoreOperationResponse.java     |   5 -
 .../snapshot/SnapshotRestoreStartRequest.java |   4 -
 .../SnapshotStartDiscoveryMessage.java        |   4 -
 .../cache/query/GridCacheQueryRequest.java    |   4 -
 .../cache/query/GridCacheQueryResponse.java   |   4 -
 .../cache/query/GridCacheSqlQuery.java        |   5 -
 .../CacheContinuousQueryBatchAck.java         |   4 -
 .../continuous/CacheContinuousQueryEntry.java |   4 -
 .../cache/transactions/IgniteTxEntry.java     |   4 -
 .../cache/transactions/IgniteTxKey.java       |   4 -
 .../transactions/TxEntryValueHolder.java      |   4 -
 .../processors/cache/transactions/TxLock.java |   5 -
 .../cache/transactions/TxLockList.java        |   4 -
 .../cache/transactions/TxLocksRequest.java    |   4 -
 .../cache/transactions/TxLocksResponse.java   |   4 -
 .../version/GridCacheRawVersionedEntry.java   |   4 -
 .../cache/version/GridCacheVersion.java       |   4 -
 .../cache/version/GridCacheVersionEx.java     |   4 -
 .../cluster/CacheMetricsMessage.java          |   8 -
 .../ChangeGlobalStateFinishMessage.java       |   4 -
 .../cluster/ChangeGlobalStateMessage.java     |   4 -
 .../cluster/ClusterMetricsUpdateMessage.java  |   7 -
 .../cluster/NodeFullMetricsMessage.java       |   7 -
 .../cluster/NodeMetricsMessage.java           |   8 -
 .../ContinuousRoutineStartResultMessage.java  |   4 -
 .../continuous/GridContinuousMessage.java     |   4 -
 .../StopRoutineAckDiscoveryMessage.java       |   4 -
 .../StopRoutineDiscoveryMessage.java          |   4 -
 .../datastreamer/DataStreamerEntry.java       |   4 -
 .../datastreamer/DataStreamerRequest.java     |   4 -
 .../datastreamer/DataStreamerResponse.java    |   4 -
 .../marshaller/MappingAcceptedMessage.java    |   4 -
 .../marshaller/MappingProposedMessage.java    |   4 -
 .../marshaller/MarshallerMappingItem.java     |   4 -
 .../MissingMappingRequestMessage.java         |   5 -
 .../MissingMappingResponseMessage.java        |   5 -
 .../DistributedMetaStorageCasAckMessage.java  |   4 -
 .../DistributedMetaStorageCasMessage.java     |   4 -
 ...istributedMetaStorageUpdateAckMessage.java |   4 -
 .../DistributedMetaStorageUpdateMessage.java  |   4 -
 .../processors/odbc/ClientMessage.java        |   5 -
 .../internal/processors/query/QueryField.java |   4 -
 .../messages/GridQueryCancelRequest.java      |   4 -
 .../messages/GridQueryFailResponse.java       |   4 -
 .../messages/GridQueryNextPageRequest.java    |   4 -
 .../messages/GridQueryNextPageResponse.java   |   5 -
 .../query/messages/GridQueryKillRequest.java  |   7 -
 .../query/messages/GridQueryKillResponse.java |   7 -
 .../message/SchemaFinishDiscoveryMessage.java |   4 -
 .../message/SchemaOperationStatusMessage.java |   4 -
 .../SchemaProposeDiscoveryMessage.java        |   4 -
 .../SchemaAddQueryEntityOperation.java        |   4 -
 .../SchemaAlterTableAddColumnOperation.java   |   4 -
 .../SchemaAlterTableDropColumnOperation.java  |   4 -
 .../operation/SchemaIndexCreateOperation.java |   4 -
 .../operation/SchemaIndexDropOperation.java   |   4 -
 .../stat/messages/StatisticsColumnData.java   |   8 -
 .../messages/StatisticsDecimalMessage.java    |   7 -
 .../stat/messages/StatisticsKeyMessage.java   |   7 -
 .../stat/messages/StatisticsObjectData.java   |   8 -
 .../stat/messages/StatisticsRequest.java      |   8 -
 .../stat/messages/StatisticsResponse.java     |   8 -
 .../handlers/task/GridTaskResultRequest.java  |   4 -
 .../handlers/task/GridTaskResultResponse.java |   5 -
 .../service/ServiceDeploymentProcessId.java   |   4 -
 .../ServiceSingleNodeDeploymentResult.java    |   4 -
 ...erviceSingleNodeDeploymentResultBatch.java |   4 -
 .../internal/util/GridByteArrayList.java      |   4 -
 .../internal/util/GridPartitionStateMap.java  |   7 -
 .../util/distributed/FullMessage.java         |   4 -
 .../util/distributed/InitMessage.java         |   4 -
 .../util/distributed/SingleNodeMessage.java   |   8 -
 .../extensions/communication/Message.java     |  52 ++-
 .../communication/MessageFactory.java         |  31 +-
 .../jobstealing/JobStealingRequest.java       |   4 -
 .../TcpConnectionRequestDiscoveryMessage.java |   4 -
 .../TcpInverseConnectionResponseMessage.java  |   4 -
 .../tcp/messages/HandshakeMessage.java        |   5 -
 .../tcp/messages/HandshakeWaitMessage.java    |   7 -
 .../tcp/messages/NodeIdMessage.java           |   5 -
 .../messages/RecoveryLastReceivedMessage.java |   5 -
 .../tcp/internal/DiscoveryDataPacket.java     |   4 -
 .../tcp/messages/InetAddressMessage.java      |   4 -
 .../messages/InetSocketAddressMessage.java    |   4 -
 .../tcp/messages/NodeSpecificData.java        |   4 -
 .../TcpDiscoveryAuthFailedMessage.java        |   4 -
 .../TcpDiscoveryCacheMetricsMessage.java      |   4 -
 .../TcpDiscoveryCheckFailedMessage.java       |   4 -
 .../TcpDiscoveryClientAckResponse.java        |   4 -
 ...cpDiscoveryClientMetricsUpdateMessage.java |   4 -
 ...TcpDiscoveryClientNodesMetricsMessage.java |   4 -
 .../TcpDiscoveryClientPingRequest.java        |   4 -
 .../TcpDiscoveryClientPingResponse.java       |   4 -
 .../TcpDiscoveryClientReconnectMessage.java   |   4 -
 .../TcpDiscoveryCollectionMessage.java        |   4 -
 .../TcpDiscoveryConnectionCheckMessage.java   |   4 -
 .../TcpDiscoveryCustomEventMessage.java       |   4 -
 .../messages/TcpDiscoveryDiscardMessage.java  |   4 -
 .../TcpDiscoveryDuplicateIdMessage.java       |   4 -
 .../TcpDiscoveryHandshakeRequest.java         |   4 -
 .../TcpDiscoveryHandshakeResponse.java        |   4 -
 .../TcpDiscoveryJoinRequestMessage.java       |   4 -
 .../TcpDiscoveryLoopbackProblemMessage.java   |   4 -
 .../TcpDiscoveryMetricsUpdateMessage.java     |   4 -
 .../TcpDiscoveryNodeAddFinishedMessage.java   |   4 -
 .../TcpDiscoveryNodeAddedMessage.java         |   4 -
 .../TcpDiscoveryNodeFailedMessage.java        |   4 -
 .../TcpDiscoveryNodeFullMetricsMessage.java   |   4 -
 .../messages/TcpDiscoveryNodeLeftMessage.java |   4 -
 .../TcpDiscoveryNodeMetricsMessage.java       |   4 -
 .../tcp/messages/TcpDiscoveryPingRequest.java |   4 -
 .../messages/TcpDiscoveryPingResponse.java    |   4 -
 .../TcpDiscoveryRingLatencyCheckMessage.java  |   4 -
 ...DiscoveryServerOnlyCustomEventMessage.java |   4 -
 .../TcpDiscoveryStatusCheckMessage.java       |   4 -
 .../direct/TestNestedContainersMessage.java   |   4 -
 .../distributed/MessagesPluginProvider.java   |   4 +-
 .../util/distributed/TestIntegerMessage.java  |   4 -
 .../util/distributed/TestUuidMessage.java     |   4 -
 .../communication/GridTestMessage.java        |   4 -
 .../spi/communication/GridTestMessage.java    |   4 -
 .../TestVolatilePayloadMessage.java           |   5 -
 .../processors/query/h2/QueryTable.java       |   4 -
 .../query/h2/twostep/msg/GridH2Array.java     |   4 -
 .../query/h2/twostep/msg/GridH2Boolean.java   |   4 -
 .../query/h2/twostep/msg/GridH2Byte.java      |   4 -
 .../query/h2/twostep/msg/GridH2Bytes.java     |   4 -
 .../h2/twostep/msg/GridH2CacheObject.java     |   4 -
 .../query/h2/twostep/msg/GridH2Date.java      |   4 -
 .../query/h2/twostep/msg/GridH2Decimal.java   |   4 -
 .../h2/twostep/msg/GridH2DmlRequest.java      |   4 -
 .../h2/twostep/msg/GridH2DmlResponse.java     |   5 -
 .../query/h2/twostep/msg/GridH2Double.java    |   4 -
 .../query/h2/twostep/msg/GridH2Float.java     |   4 -
 .../query/h2/twostep/msg/GridH2Geometry.java  |   4 -
 .../twostep/msg/GridH2IndexRangeRequest.java  |   4 -
 .../twostep/msg/GridH2IndexRangeResponse.java |   4 -
 .../query/h2/twostep/msg/GridH2Integer.java   |   4 -
 .../h2/twostep/msg/GridH2JavaObject.java      |   4 -
 .../query/h2/twostep/msg/GridH2Long.java      |   4 -
 .../query/h2/twostep/msg/GridH2Null.java      |   4 -
 .../h2/twostep/msg/GridH2QueryRequest.java    |   4 -
 .../h2/twostep/msg/GridH2RowMessage.java      |   4 -
 .../query/h2/twostep/msg/GridH2RowRange.java  |   5 -
 .../h2/twostep/msg/GridH2RowRangeBounds.java  |   4 -
 .../query/h2/twostep/msg/GridH2Short.java     |   4 -
 .../query/h2/twostep/msg/GridH2String.java    |   4 -
 .../query/h2/twostep/msg/GridH2Time.java      |   4 -
 .../query/h2/twostep/msg/GridH2Timestamp.java |   4 -
 .../query/h2/twostep/msg/GridH2Uuid.java      |   4 -
 .../msg/GridH2ValueMessageFactory.java        |  56 +--
 302 files changed, 393 insertions(+), 1636 deletions(-)

diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
index 702580e51954b..ba20b2526b5dc 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
@@ -83,10 +83,6 @@ public long fragmentId() {
         return MessageType.QUERY_ERROR_MESSAGE;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return MessageType.QUERY_ERROR_MESSAGE.directType();
-    }
 
     /** {@inheritDoc} */
     @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
index 7341d60038f8f..1d707cf0c8505 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessageFactory.java
@@ -29,7 +29,7 @@ public class CalciteMessageFactory implements MessageFactoryProvider {
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override public void registerAll(MessageFactory factory) {
         for (MessageType type : MessageType.values())
-            factory.register((Supplier)type.factory(), type.serializer());
+            factory.register(type.directType(), (Supplier)type.factory(), type.serializer());
     }
 
     /**
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
index 5100a7f5ec05d..d0ce95c54daa0 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
@@ -31,40 +31,43 @@
  */
 public enum MessageType {
     /** */
-    QUERY_START_REQUEST(QueryStartRequest::new, new QueryStartRequestSerializer()),
+    QUERY_START_REQUEST(300, QueryStartRequest::new, new QueryStartRequestSerializer()),
 
     /** */
-    QUERY_START_RESPONSE(QueryStartResponse::new, new QueryStartResponseSerializer()),
+    QUERY_START_RESPONSE(301, QueryStartResponse::new, new QueryStartResponseSerializer()),
 
     /** */
-    QUERY_ERROR_MESSAGE(CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
+    QUERY_ERROR_MESSAGE(302, CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),
 
     /** */
-    QUERY_BATCH_MESSAGE(QueryBatchMessage::new, new QueryBatchMessageSerializer()),
+    QUERY_BATCH_MESSAGE(303, QueryBatchMessage::new, new QueryBatchMessageSerializer()),
 
     /** */
-    QUERY_ACKNOWLEDGE_MESSAGE(QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
+    QUERY_ACKNOWLEDGE_MESSAGE(304, QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
 
     /** */
-    QUERY_INBOX_CANCEL_MESSAGE(InboxCloseMessage::new, new InboxCloseMessageSerializer()),
+    QUERY_INBOX_CANCEL_MESSAGE(305, InboxCloseMessage::new, new InboxCloseMessageSerializer()),
 
     /** */
-    QUERY_CLOSE_MESSAGE(QueryCloseMessage::new, new QueryCloseMessageSerializer()),
+    QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new, new QueryCloseMessageSerializer()),
 
     /** */
-    GENERIC_VALUE_MESSAGE(GenericValueMessage::new, new GenericValueMessageSerializer()),
+    GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new, new GenericValueMessageSerializer()),
 
     /** */
-    FRAGMENT_MAPPING(FragmentMapping::new, new FragmentMappingSerializer()),
+    FRAGMENT_MAPPING(350, FragmentMapping::new, new FragmentMappingSerializer()),
 
     /** */
-    COLOCATION_GROUP(ColocationGroup::new, new ColocationGroupSerializer()),
+    COLOCATION_GROUP(351, ColocationGroup::new, new ColocationGroupSerializer()),
 
     /** */
-    FRAGMENT_DESCRIPTION(FragmentDescription::new, new FragmentDescriptionSerializer()),
+    FRAGMENT_DESCRIPTION(352, FragmentDescription::new, new FragmentDescriptionSerializer()),
 
     /** */
-    QUERY_TX_ENTRY(QueryTxEntry::new, new QueryTxEntrySerializer());
+    QUERY_TX_ENTRY(353, QueryTxEntry::new, new QueryTxEntrySerializer());
+
+    /** */
+    private final int directType;
 
     /** */
     private final Supplier<CalciteMessage> factory;
@@ -73,10 +76,12 @@ public enum MessageType {
     private final MessageSerializer serializer;
 
     /**
+     * @param directType Direct type.
      * @param factory Message factory.
      * @param serializer Message serializer.
      */
-    MessageType(Supplier<CalciteMessage> factory, MessageSerializer serializer) {
+    MessageType(int directType, Supplier<CalciteMessage> factory, MessageSerializer serializer) {
+        this.directType = directType;
         this.factory = factory;
         this.serializer = serializer;
     }
@@ -92,7 +97,7 @@ public Supplier<CalciteMessage> factory() {
      * @return Message direct type.
      */
     public short directType() {
-        return factory.get().directType();
+        return (short)directType;
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java
index 243752828095e..62c0a0fce7a36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java
@@ -44,10 +44,6 @@ public ExchangeInfo() {
         this.topVer = topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -63;
-    }
 
     /** {@inheritDoc} */
     @Override public void appendInfo(StringBuilder sb, GridKernalContext ctx) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
index f6f77938ae7d4..0a318f1f91c9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -105,10 +105,6 @@ public boolean system() {
         return system;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 0;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 089b1ad209432..37e23f5b8b9a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -442,10 +442,6 @@ public AffinityTopologyVersion topologyVersion() {
         return topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 1;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
index aafe018280760..f97b781de7e36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -305,10 +305,6 @@ private void wrapSerializationError(IgniteCheckedException e, String msg, @Nulla
             U.error(log, msg, e);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 2;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
index d14a449bb5998..4eca55bb2c2a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -65,10 +65,6 @@ public long topicId() {
         return topicId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 3;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
index 5efcf8925f9dd..57f04892d4d8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -84,10 +84,6 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 4;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
index dba1b6af737cf..a0d121b729c22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -54,10 +54,6 @@ public IgniteUuid sessionId() {
         return sesId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 5;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
index 447c4b1112d62..57fdbac05b596 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
@@ -86,10 +86,6 @@ public IgniteUuid jobId() {
         return jobId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 6;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java
index bc733db54c0d1..18276f939b49a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java
@@ -136,10 +136,6 @@ public long futureId() {
         return infos;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -61;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java
index a4c16f691e7ee..3c2aac181e4f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java
@@ -62,10 +62,6 @@ public long futureId() {
         return respInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -62;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java
index 0e67acaed7507..150c8719d306a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java
@@ -53,10 +53,6 @@ public TxEntriesInfo() {
         this.keys = new HashSet<>(keys);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -64;
-    }
 
     /** {@inheritDoc} */
     @Override public void appendInfo(StringBuilder sb, GridKernalContext ctx) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java
index 165ce80b18d19..9158ead811c45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java
@@ -49,10 +49,6 @@ public TxInfo() {
         this.nearVer = nearVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -65;
-    }
 
     /** {@inheritDoc} */
     @Override public void appendInfo(StringBuilder sb, GridKernalContext ctx) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java
index cb0ac8c45338b..24982bb26de2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java
@@ -72,11 +72,6 @@ public IndexQueryResultMeta(SortedIndexDefinition def, int critSize) {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 18;
-    }
-
     /** */
     public IndexKeyTypeSettings keyTypeSettings() {
         return keyTypeSettings;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java
index 0b0d1a0df64f1..6e003c47c0f01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java
@@ -54,11 +54,6 @@ public IndexKeyDefinition(int idxTypeCode, long precision, boolean asc) {
             this.precision = (int)precision;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 113;
-    }
-
     /** */
     public boolean ascending() {
         return asc;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java
index 5e7c367287cf4..ad27cb41528bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java
@@ -40,11 +40,6 @@ public class IndexKeyTypeSettings implements Message {
     @Order(3)
     boolean binaryUnsigned = true;
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 19;
-    }
-
     /** */
     public boolean inlineObjectHash() {
         return inlineObjHash;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
index 4af14a3727da4..b3be0f891bc16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
@@ -83,10 +83,6 @@ public String checkpointSpi() {
         return cpSpi;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 7;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CompressedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CompressedMessage.java
index 95565217f86d8..c7b530a217f2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CompressedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CompressedMessage.java
@@ -37,9 +37,6 @@
  * WARNING: CompressedMessage is not intended for explicit use in messages.
  */
 public class CompressedMessage implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = -101;
-
     /** Chunk size. */
     static final int CHUNK_SIZE = 10 * 1024;
 
@@ -203,11 +200,6 @@ public byte[] uncompressed() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
     /**
      * @param buf Buffer.
      * @return Compressed data.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java
index 990e681215ac7..1819648fcaef7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java
@@ -88,10 +88,6 @@ public ErrorMessage(@Nullable Throwable err) {
         return errorMsg == null ? null : errorMsg.error();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -66;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
index 906df7c9ff677..0b2273777104f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
@@ -179,10 +179,6 @@ public boolean isOrdered() {
         throw new AssertionError();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 8;
-    }
 
     /** {@inheritDoc} */
     @Override public void span(byte[] span) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 8dbea6d9e41e6..1f8f476b7a89e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -384,208 +384,208 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
     @Override public void registerAll(MessageFactory factory) {
         // -54 is reserved for SQL.
         // We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
-        factory.register(CompressedMessage.TYPE_CODE, CompressedMessage::new);
-        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TxInfo::new, new TxInfoSerializer());
-        factory.register(TxEntriesInfo::new, new TxEntriesInfoSerializer());
-        factory.register(ExchangeInfo::new, new ExchangeInfoSerializer());
-        factory.register(IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer());
-        factory.register(IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer());
-        factory.register(SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer());
-        factory.register(NearCacheUpdates::new, new NearCacheUpdatesSerializer());
-        factory.register(GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer());
-        factory.register(UpdateErrors::new, new UpdateErrorsSerializer());
-        factory.register(GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
-        factory.register(GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
+        factory.register(-101, CompressedMessage::new);
+        factory.register(-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(-65, TxInfo::new, new TxInfoSerializer());
+        factory.register(-64, TxEntriesInfo::new, new TxEntriesInfoSerializer());
+        factory.register(-63, ExchangeInfo::new, new ExchangeInfoSerializer());
+        factory.register(-62, IgniteDiagnosticResponse::new, new IgniteDiagnosticResponseSerializer());
+        factory.register(-61, IgniteDiagnosticRequest::new, new IgniteDiagnosticRequestSerializer());
+        factory.register(-53, SchemaOperationStatusMessage::new, new SchemaOperationStatusMessageSerializer());
+        factory.register(-51, NearCacheUpdates::new, new NearCacheUpdatesSerializer());
+        factory.register(-50, GridNearAtomicCheckUpdateRequest::new, new GridNearAtomicCheckUpdateRequestSerializer());
+        factory.register(-49, UpdateErrors::new, new UpdateErrorsSerializer());
+        factory.register(-48, GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
+        factory.register(-45, GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
         factory.register((short)-43, IgniteIoTestMessage::new);
-        factory.register(GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
-        factory.register(GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
-        factory.register(TxLockList::new, new TxLockListSerializer());
-        factory.register(TxLock::new, new TxLockSerializer());
-        factory.register(TxLocksRequest::new, new TxLocksRequestSerializer());
-        factory.register(TxLocksResponse::new, new TxLocksResponseSerializer());
-        factory.register(NodeIdMessage::new, new NodeIdMessageSerializer());
-        factory.register(RecoveryLastReceivedMessage::new,
+        factory.register(-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
+        factory.register(-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
+        factory.register(-26, TxLockList::new, new TxLockListSerializer());
+        factory.register(-25, TxLock::new, new TxLockSerializer());
+        factory.register(-24, TxLocksRequest::new, new TxLocksRequestSerializer());
+        factory.register(-23, TxLocksResponse::new, new TxLocksResponseSerializer());
+        factory.register(-1, NodeIdMessage::new, new NodeIdMessageSerializer());
+        factory.register(-2, RecoveryLastReceivedMessage::new,
             new RecoveryLastReceivedMessageSerializer());
-        factory.register(HandshakeMessage::new, new HandshakeMessageSerializer());
-        factory.register(HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer());
-        factory.register(GridJobCancelRequest::new, new GridJobCancelRequestSerializer());
-        factory.register(GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer());
-        factory.register(GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer());
-        factory.register(GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer());
-        factory.register(GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer());
-        factory.register(GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer());
-        factory.register(GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer());
-        factory.register(GridCheckpointRequest::new, new GridCheckpointRequestSerializer());
-        factory.register(GridIoMessage::new, new GridIoMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(GridIoUserMessage::new, new GridIoUserMessageSerializer());
-        factory.register(GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer());
-        factory.register(GridDeploymentRequest::new, new GridDeploymentRequestSerializer());
-        factory.register(GridDeploymentResponse::new, new GridDeploymentResponseSerializer());
-        factory.register(GridEventStorageMessage::new, new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer());
-        factory.register(GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer());
-        factory.register(IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer());
-        factory.register(IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer());
-        factory.register(GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer());
-        factory.register(GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer());
-        factory.register(GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer());
-        factory.register(GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer());
-        factory.register(GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer());
-        factory.register(GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer());
-        factory.register(GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer());
+        factory.register(-3, HandshakeMessage::new, new HandshakeMessageSerializer());
+        factory.register(-28, HandshakeWaitMessage::new, new HandshakeWaitMessageSerializer());
+        factory.register(0, GridJobCancelRequest::new, new GridJobCancelRequestSerializer());
+        factory.register(1, GridJobExecuteRequest::new, new GridJobExecuteRequestSerializer());
+        factory.register(2, GridJobExecuteResponse::new, new GridJobExecuteResponseSerializer());
+        factory.register(3, GridJobSiblingsRequest::new, new GridJobSiblingsRequestSerializer());
+        factory.register(4, GridJobSiblingsResponse::new, new GridJobSiblingsResponseSerializer());
+        factory.register(5, GridTaskCancelRequest::new, new GridTaskCancelRequestSerializer());
+        factory.register(6, GridTaskSessionRequest::new, new GridTaskSessionRequestSerializer());
+        factory.register(7, GridCheckpointRequest::new, new GridCheckpointRequestSerializer());
+        factory.register(8, GridIoMessage::new, new GridIoMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(9, GridIoUserMessage::new, new GridIoUserMessageSerializer());
+        factory.register(10, GridDeploymentInfoBean::new, new GridDeploymentInfoBeanSerializer());
+        factory.register(11, GridDeploymentRequest::new, new GridDeploymentRequestSerializer());
+        factory.register(12, GridDeploymentResponse::new, new GridDeploymentResponseSerializer());
+        factory.register(13, GridEventStorageMessage::new, new GridEventStorageMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(16, GridCacheTxRecoveryRequest::new, new GridCacheTxRecoveryRequestSerializer());
+        factory.register(17, GridCacheTxRecoveryResponse::new, new GridCacheTxRecoveryResponseSerializer());
+        factory.register(18, IndexQueryResultMeta::new, new IndexQueryResultMetaSerializer());
+        factory.register(19, IndexKeyTypeSettings::new, new IndexKeyTypeSettingsSerializer());
+        factory.register(20, GridCacheTtlUpdateRequest::new, new GridCacheTtlUpdateRequestSerializer());
+        factory.register(21, GridDistributedLockRequest::new, new GridDistributedLockRequestSerializer());
+        factory.register(22, GridDistributedLockResponse::new, new GridDistributedLockResponseSerializer());
+        factory.register(23, GridDistributedTxFinishRequest::new, new GridDistributedTxFinishRequestSerializer());
+        factory.register(24, GridDistributedTxFinishResponse::new, new GridDistributedTxFinishResponseSerializer());
+        factory.register(25, GridDistributedTxPrepareRequest::new, new GridDistributedTxPrepareRequestSerializer());
+        factory.register(26, GridDistributedTxPrepareResponse::new, new GridDistributedTxPrepareResponseSerializer());
         // Type 27 is former GridDistributedUnlockRequest
-        factory.register(GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer());
-        factory.register(GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer());
-        factory.register(GridDhtLockRequest::new, new GridDhtLockRequestSerializer());
-        factory.register(GridDhtLockResponse::new, new GridDhtLockResponseSerializer());
-        factory.register(GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer());
-        factory.register(GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer());
-        factory.register(GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer());
-        factory.register(GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer());
-        factory.register(GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer());
-        factory.register(GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer());
-        factory.register(GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer());
-        factory.register(GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer());
-        factory.register(GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer());
-        factory.register(GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer());
-        factory.register(GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer());
-        factory.register(GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer());
-        factory.register(GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer());
-        factory.register(GridDhtPartitionsFullMessage::new, new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer());
-        factory.register(GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer());
-        factory.register(GridNearGetRequest::new, new GridNearGetRequestSerializer());
-        factory.register(GridNearGetResponse::new, new GridNearGetResponseSerializer());
-        factory.register(GridNearLockRequest::new, new GridNearLockRequestSerializer());
-        factory.register(GridNearLockResponse::new, new GridNearLockResponseSerializer());
-        factory.register(GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer());
-        factory.register(GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer());
-        factory.register(GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer());
-        factory.register(GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer());
-        factory.register(GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer());
-        factory.register(GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer());
-        factory.register(GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer());
-        factory.register(GridContinuousMessage::new, new GridContinuousMessageSerializer());
-        factory.register(DataStreamerRequest::new, new DataStreamerRequestSerializer());
-        factory.register(DataStreamerResponse::new, new DataStreamerResponseSerializer());
-        factory.register(GridTaskResultRequest::new, new GridTaskResultRequestSerializer());
-        factory.register(GridTaskResultResponse::new, new GridTaskResultResponseSerializer());
-        factory.register(MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer());
-        factory.register(MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer());
-        factory.register(MetadataRequestMessage::new, new MetadataRequestMessageSerializer());
-        factory.register(MetadataResponseMessage::new, new MetadataResponseMessageSerializer());
-        factory.register(JobStealingRequest::new, new JobStealingRequestSerializer());
-        factory.register(GridByteArrayList::new, new GridByteArrayListSerializer());
-        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer());
-        factory.register(GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer());
-        factory.register(GridCacheReturn::new, new GridCacheReturnSerializer());
-        factory.register(GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer());
-        factory.register(CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer());
-        factory.register(IgniteTxKey::new, new IgniteTxKeySerializer());
-        factory.register(DataStreamerEntry::new, new DataStreamerEntrySerializer());
-        factory.register(CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr));
-        factory.register(CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
-        factory.register(CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr));
-        factory.register(IgniteTxEntry::new, new IgniteTxEntrySerializer());
-        factory.register(TxEntryValueHolder::new, new TxEntryValueHolderSerializer());
-        factory.register(CacheVersionedValue::new, new CacheVersionedValueSerializer());
-        factory.register(GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer());
-        factory.register(GridCacheVersionEx::new, new GridCacheVersionExSerializer());
-        factory.register(GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer());
-        factory.register(GridQueryFailResponse::new, new GridQueryFailResponseSerializer());
-        factory.register(GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer());
-        factory.register(GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer());
-        factory.register(GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer());
-        factory.register(IndexKeyDefinition::new, new IndexKeyDefinitionSerializer());
-        factory.register(GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer());
-        factory.register(GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer());
-        factory.register(GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer());
-        factory.register(CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer());
+        factory.register(28, GridDhtAffinityAssignmentRequest::new, new GridDhtAffinityAssignmentRequestSerializer());
+        factory.register(29, GridDhtAffinityAssignmentResponse::new, new GridDhtAffinityAssignmentResponseSerializer());
+        factory.register(30, GridDhtLockRequest::new, new GridDhtLockRequestSerializer());
+        factory.register(31, GridDhtLockResponse::new, new GridDhtLockResponseSerializer());
+        factory.register(32, GridDhtTxFinishRequest::new, new GridDhtTxFinishRequestSerializer());
+        factory.register(33, GridDhtTxFinishResponse::new, new GridDhtTxFinishResponseSerializer());
+        factory.register(34, GridDhtTxPrepareRequest::new, new GridDhtTxPrepareRequestSerializer());
+        factory.register(35, GridDhtTxPrepareResponse::new, new GridDhtTxPrepareResponseSerializer());
+        factory.register(36, GridDhtUnlockRequest::new, new GridDhtUnlockRequestSerializer());
+        factory.register(37, GridDhtAtomicDeferredUpdateResponse::new, new GridDhtAtomicDeferredUpdateResponseSerializer());
+        factory.register(38, GridDhtAtomicUpdateRequest::new, new GridDhtAtomicUpdateRequestSerializer());
+        factory.register(39, GridDhtAtomicUpdateResponse::new, new GridDhtAtomicUpdateResponseSerializer());
+        factory.register(40, GridNearAtomicFullUpdateRequest::new, new GridNearAtomicFullUpdateRequestSerializer());
+        factory.register(41, GridNearAtomicUpdateResponse::new, new GridNearAtomicUpdateResponseSerializer());
+        factory.register(42, GridDhtForceKeysRequest::new, new GridDhtForceKeysRequestSerializer());
+        factory.register(43, GridDhtForceKeysResponse::new, new GridDhtForceKeysResponseSerializer());
+        factory.register(45, GridDhtPartitionDemandMessage::new, new GridDhtPartitionDemandMessageSerializer());
+        factory.register(46, GridDhtPartitionsFullMessage::new, new GridDhtPartitionsFullMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(47, GridDhtPartitionsSingleMessage::new, new GridDhtPartitionsSingleMessageSerializer());
+        factory.register(48, GridDhtPartitionsSingleRequest::new, new GridDhtPartitionsSingleRequestSerializer());
+        factory.register(49, GridNearGetRequest::new, new GridNearGetRequestSerializer());
+        factory.register(50, GridNearGetResponse::new, new GridNearGetResponseSerializer());
+        factory.register(51, GridNearLockRequest::new, new GridNearLockRequestSerializer());
+        factory.register(52, GridNearLockResponse::new, new GridNearLockResponseSerializer());
+        factory.register(53, GridNearTxFinishRequest::new, new GridNearTxFinishRequestSerializer());
+        factory.register(54, GridNearTxFinishResponse::new, new GridNearTxFinishResponseSerializer());
+        factory.register(55, GridNearTxPrepareRequest::new, new GridNearTxPrepareRequestSerializer());
+        factory.register(56, GridNearTxPrepareResponse::new, new GridNearTxPrepareResponseSerializer());
+        factory.register(57, GridNearUnlockRequest::new, new GridNearUnlockRequestSerializer());
+        factory.register(58, GridCacheQueryRequest::new, new GridCacheQueryRequestSerializer());
+        factory.register(59, GridCacheQueryResponse::new, new GridCacheQueryResponseSerializer());
+        factory.register(61, GridContinuousMessage::new, new GridContinuousMessageSerializer());
+        factory.register(62, DataStreamerRequest::new, new DataStreamerRequestSerializer());
+        factory.register(63, DataStreamerResponse::new, new DataStreamerResponseSerializer());
+        factory.register(76, GridTaskResultRequest::new, new GridTaskResultRequestSerializer());
+        factory.register(77, GridTaskResultResponse::new, new GridTaskResultResponseSerializer());
+        factory.register(78, MissingMappingRequestMessage::new, new MissingMappingRequestMessageSerializer());
+        factory.register(79, MissingMappingResponseMessage::new, new MissingMappingResponseMessageSerializer());
+        factory.register(80, MetadataRequestMessage::new, new MetadataRequestMessageSerializer());
+        factory.register(81, MetadataResponseMessage::new, new MetadataResponseMessageSerializer());
+        factory.register(82, JobStealingRequest::new, new JobStealingRequestSerializer());
+        factory.register(84, GridByteArrayList::new, new GridByteArrayListSerializer());
+        factory.register(86, GridCacheVersion::new, new GridCacheVersionSerializer());
+        factory.register(87, GridDhtPartitionExchangeId::new, new GridDhtPartitionExchangeIdSerializer());
+        factory.register(88, GridCacheReturn::new, new GridCacheReturnSerializer());
+        factory.register(91, GridCacheEntryInfo::new, new GridCacheEntryInfoSerializer());
+        factory.register(93, CacheInvokeDirectResult::new, new CacheInvokeDirectResultSerializer());
+        factory.register(94, IgniteTxKey::new, new IgniteTxKeySerializer());
+        factory.register(95, DataStreamerEntry::new, new DataStreamerEntrySerializer());
+        factory.register(96, CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr));
+        factory.register(97, CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
+        factory.register(98, CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr));
+        factory.register(100, IgniteTxEntry::new, new IgniteTxEntrySerializer());
+        factory.register(101, TxEntryValueHolder::new, new TxEntryValueHolderSerializer());
+        factory.register(102, CacheVersionedValue::new, new CacheVersionedValueSerializer());
+        factory.register(103, GridCacheRawVersionedEntry::new, new GridCacheRawVersionedEntrySerializer());
+        factory.register(104, GridCacheVersionEx::new, new GridCacheVersionExSerializer());
+        factory.register(106, GridQueryCancelRequest::new, new GridQueryCancelRequestSerializer());
+        factory.register(107, GridQueryFailResponse::new, new GridQueryFailResponseSerializer());
+        factory.register(108, GridQueryNextPageRequest::new, new GridQueryNextPageRequestSerializer());
+        factory.register(109, GridQueryNextPageResponse::new, new GridQueryNextPageResponseSerializer());
+        factory.register(112, GridCacheSqlQuery::new, new GridCacheSqlQuerySerializer());
+        factory.register(113, IndexKeyDefinition::new, new IndexKeyDefinitionSerializer());
+        factory.register(114, GridDhtPartitionSupplyMessage::new, new GridDhtPartitionSupplyMessageSerializer());
+        factory.register(116, GridNearSingleGetRequest::new, new GridNearSingleGetRequestSerializer());
+        factory.register(117, GridNearSingleGetResponse::new, new GridNearSingleGetResponseSerializer());
+        factory.register(118, CacheContinuousQueryBatchAck::new, new CacheContinuousQueryBatchAckSerializer());
 
         // [120..123] - DR
-        factory.register(GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer());
-        factory.register(GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer());
-        factory.register(GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer());
-        factory.register(CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer());
-        factory.register(WalStateAckMessage::new, new WalStateAckMessageSerializer());
-        factory.register(UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer());
-        factory.register(UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer());
-        factory.register(UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer());
-        factory.register(ClusterMetricsUpdateMessage::new,
+        factory.register(125, GridNearAtomicSingleUpdateRequest::new, new GridNearAtomicSingleUpdateRequestSerializer());
+        factory.register(126, GridNearAtomicSingleUpdateInvokeRequest::new, new GridNearAtomicSingleUpdateInvokeRequestSerializer());
+        factory.register(127, GridNearAtomicSingleUpdateFilterRequest::new, new GridNearAtomicSingleUpdateFilterRequestSerializer());
+        factory.register(128, CacheGroupAffinityMessage::new, new CacheGroupAffinityMessageSerializer());
+        factory.register(129, WalStateAckMessage::new, new WalStateAckMessageSerializer());
+        factory.register(130, UserManagementOperationFinishedMessage::new, new UserManagementOperationFinishedMessageSerializer());
+        factory.register(131, UserAuthenticateRequestMessage::new, new UserAuthenticateRequestMessageSerializer());
+        factory.register(132, UserAuthenticateResponseMessage::new, new UserAuthenticateResponseMessageSerializer());
+        factory.register(133, ClusterMetricsUpdateMessage::new,
             new ClusterMetricsUpdateMessageSerializer());
-        factory.register(ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer());
-        factory.register(LatchAckMessage::new, new LatchAckMessageSerializer());
-        factory.register(CacheMetricsMessage::new, new CacheMetricsMessageSerializer());
-        factory.register(NodeMetricsMessage::new, new NodeMetricsMessageSerializer());
-        factory.register(NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer());
-        factory.register(PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
-        factory.register(GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer());
-        factory.register(ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
-        factory.register(ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
-        factory.register(ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer());
-        factory.register(GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
-        factory.register(GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
-        factory.register(GridIoSecurityAwareMessage::new,
+        factory.register(134, ContinuousRoutineStartResultMessage::new, new ContinuousRoutineStartResultMessageSerializer());
+        factory.register(135, LatchAckMessage::new, new LatchAckMessageSerializer());
+        factory.register(136, CacheMetricsMessage::new, new CacheMetricsMessageSerializer());
+        factory.register(137, NodeMetricsMessage::new, new NodeMetricsMessageSerializer());
+        factory.register(138, NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer());
+        factory.register(157, PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(162, GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
+        factory.register(163, GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer());
+        factory.register(167, ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
+        factory.register(168, ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
+        factory.register(169, ServiceSingleNodeDeploymentResult::new, new ServiceSingleNodeDeploymentResultSerializer());
+        factory.register(170, GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
+        factory.register(171, GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
+        factory.register(174, GridIoSecurityAwareMessage::new,
             new GridIoSecurityAwareMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(SessionChannelMessage::new, new SessionChannelMessageSerializer());
-        factory.register(SingleNodeMessage::new, new SingleNodeMessageSerializer());
-        factory.register(TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer());
-        factory.register(SnapshotFilesRequestMessage::new,
+        factory.register(175, SessionChannelMessage::new, new SessionChannelMessageSerializer());
+        factory.register(176, SingleNodeMessage::new, new SingleNodeMessageSerializer());
+        factory.register(177, TcpInverseConnectionResponseMessage::new, new TcpInverseConnectionResponseMessageSerializer());
+        factory.register(178, SnapshotFilesRequestMessage::new,
             new SnapshotFilesRequestMessageSerializer());
-        factory.register(SnapshotFilesFailureMessage::new,
+        factory.register(179, SnapshotFilesFailureMessage::new,
             new SnapshotFilesFailureMessageSerializer());
-        factory.register(AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer());
-        factory.register(TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer());
+        factory.register(180, AtomicApplicationAttributesAwareRequest::new, new AtomicApplicationAttributesAwareRequestSerializer());
+        factory.register(181, TransactionAttributesAwareRequest::new, new TransactionAttributesAwareRequestSerializer());
 
         // Incremental snapshot.
-        factory.register(IncrementalSnapshotAwareMessage::new,
+        factory.register(182, IncrementalSnapshotAwareMessage::new,
             new IncrementalSnapshotAwareMessageSerializer());
 
         // Index statistics.
-        factory.register(StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer());
-        factory.register(StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer());
-        factory.register(StatisticsObjectData::new, new StatisticsObjectDataSerializer());
-        factory.register(StatisticsColumnData::new, new StatisticsColumnDataSerializer());
-        factory.register(StatisticsRequest::new, new StatisticsRequestSerializer());
-        factory.register(StatisticsResponse::new, new StatisticsResponseSerializer());
+        factory.register(183, StatisticsKeyMessage::new, new StatisticsKeyMessageSerializer());
+        factory.register(184, StatisticsDecimalMessage::new, new StatisticsDecimalMessageSerializer());
+        factory.register(185, StatisticsObjectData::new, new StatisticsObjectDataSerializer());
+        factory.register(186, StatisticsColumnData::new, new StatisticsColumnDataSerializer());
+        factory.register(187, StatisticsRequest::new, new StatisticsRequestSerializer());
+        factory.register(188, StatisticsResponse::new, new StatisticsResponseSerializer());
 
-        factory.register(CachePartitionPartialCountersMap::new,
+        factory.register(500, CachePartitionPartialCountersMap::new,
             new CachePartitionPartialCountersMapSerializer());
-        factory.register(IgniteDhtDemandedPartitionsMap::new,
+        factory.register(501, IgniteDhtDemandedPartitionsMap::new,
             new IgniteDhtDemandedPartitionsMapSerializer());
-        factory.register(BinaryMetadataVersionInfo::new,
+        factory.register(505, BinaryMetadataVersionInfo::new,
             new BinaryMetadataVersionInfoSerializer());
-        factory.register(CachePartitionFullCountersMap::new,
+        factory.register(506, CachePartitionFullCountersMap::new,
             new CachePartitionFullCountersMapSerializer());
-        factory.register(IgniteDhtPartitionCountersMap::new,
+        factory.register(507, IgniteDhtPartitionCountersMap::new,
             new IgniteDhtPartitionCountersMapSerializer());
-        factory.register(GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
-        factory.register(PartitionReservationsMap::new, new PartitionReservationsMapSerializer());
-        factory.register(IgniteDhtPartitionHistorySuppliersMap::new,
+        factory.register(508, GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
+        factory.register(509, PartitionReservationsMap::new, new PartitionReservationsMapSerializer());
+        factory.register(510, IgniteDhtPartitionHistorySuppliersMap::new,
             new IgniteDhtPartitionHistorySuppliersMapSerializer());
-        factory.register(IgniteDhtPartitionsToReloadMap::new,
+        factory.register(513, IgniteDhtPartitionsToReloadMap::new,
             new IgniteDhtPartitionsToReloadMapSerializer());
-        factory.register(IntLongMap::new, new IntLongMapSerializer());
-        factory.register(GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
-        factory.register(GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
-        factory.register(GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
-        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
-        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
-        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
-        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
-        factory.register(IncrementalSnapshotVerifyResult::new,
+        factory.register(514, IntLongMap::new, new IntLongMapSerializer());
+        factory.register(517, GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
+        factory.register(518, GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
+        factory.register(519, GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
+        factory.register(520, SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
+        factory.register(521, SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
+        factory.register(522, DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
+        factory.register(523, SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
+        factory.register(524, IncrementalSnapshotVerifyResult::new,
             new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotRestoreOperationResponse::new,
+        factory.register(525, SnapshotRestoreOperationResponse::new,
             new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotMetadataResponse::new,
+        factory.register(526, SnapshotMetadataResponse::new,
             new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotCheckPartitionHashesResponse::new,
+        factory.register(527, SnapshotCheckPartitionHashesResponse::new,
             new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
-        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
-        factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
+        factory.register(528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
+        factory.register(529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
+        factory.register(530, SnapshotPartitionsVerifyHandlerResponse::new,
             new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
 
         // [-3..119] [124..129] [-23..-28] [-36..-55] [183..188] - this
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
index 3e35894a13623..302ed86aac818 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
@@ -25,9 +25,6 @@
  *
  */
 public class GridIoSecurityAwareMessage extends GridIoMessage {
-    /** */
-    public static final short TYPE_CODE = 174;
-
     /** Security subject ID that will be used during message processing on a remote node. */
     @Order(0)
     UUID secSubjId;
@@ -71,8 +68,4 @@ public UUID securitySubjectId() {
         return secSubjId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
index 46338092b3450..e38784037f593 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -201,10 +201,6 @@ public void deployment(GridDeployment dep) {
         return dep;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 9;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
index 304582169186b..a2302730ed373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
@@ -554,10 +554,6 @@ public void senderNodeId(UUID sndNodeId) {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -43;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index ca997a3ec9d6b..eca772bfb392d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -106,6 +106,8 @@ public IgniteMessageFactoryImpl(MessageFactoryProvider[] factories) {
                     "Registration of new message types is forbidden.");
         }
 
+        supplier.get().registerAsDirectType(directType);
+
         int idx = directTypeToIndex(directType);
 
         Supplier<Message> curr = msgSuppliers[idx];
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
index 1afab64ee6d8f..92fce631d80f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
@@ -28,9 +28,6 @@
  * an appropriate channel is opened.
  */
 public class SessionChannelMessage implements Message {
-    /** Initial channel message type (value is {@code 175}). */
-    public static final short TYPE_CODE = 175;
-
     /** Channel session unique identifier. */
     @Order(0)
     IgniteUuid sesId;
@@ -56,10 +53,6 @@ public IgniteUuid sesId() {
         return sesId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index f520f40d28a17..e8ffc6cfd29e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -139,10 +139,6 @@ public GridDeploymentInfoBean(GridDeploymentInfo dep) {
             clsLdrId.equals(((GridDeploymentInfoBean)o).clsLdrId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 10;
-    }
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
index 31484637bed7e..e79d6798ef4e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -139,10 +139,6 @@ public void nodeIds(Collection<UUID> nodeIds) {
         this.nodeIds = nodeIds;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 11;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
index 00e2978130e09..9cb3f70cab4bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
@@ -102,10 +102,6 @@ public void errorMessage(String errMsg) {
         this.errMsg = errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 12;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index c14e8f3935cc8..ea0f8afb3337a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -224,119 +224,119 @@ public DiscoveryMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
 
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
-        factory.register(TcpDiscoveryCollectionMessage::new,
+        factory.register(-200, TcpDiscoveryCollectionMessage::new,
             new TcpDiscoveryCollectionMessageMarshallableSerializer(marsh, clsLdr));
 
-        factory.register(SchemaAlterTableAddColumnOperation::new, new SchemaAlterTableAddColumnOperationSerializer());
-        factory.register(SchemaIndexCreateOperation::new, new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr));
-        factory.register(SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer());
-        factory.register(SchemaAlterTableDropColumnOperation::new, new SchemaAlterTableDropColumnOperationSerializer());
-        factory.register(SchemaAddQueryEntityOperation::new, new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr));
-        factory.register(QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr));
-        factory.register(User::new, new UserSerializer());
-        factory.register(UserManagementOperation::new, new UserManagementOperationSerializer());
-        factory.register(NodeSpecificData::new, new NodeSpecificDataSerializer());
-        factory.register(DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer());
-        factory.register(TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer());
-        factory.register(TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer());
-        factory.register(TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer());
-        factory.register(TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer());
-        factory.register(InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer());
-        factory.register(InetAddressMessage::new, new InetAddressMessageSerializer());
-        factory.register(ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(-115, SchemaAlterTableAddColumnOperation::new, new SchemaAlterTableAddColumnOperationSerializer());
+        factory.register(-114, SchemaIndexCreateOperation::new, new SchemaIndexCreateOperationMarshallableSerializer(marsh, clsLdr));
+        factory.register(-113, SchemaIndexDropOperation::new, new SchemaIndexDropOperationSerializer());
+        factory.register(-112, SchemaAlterTableDropColumnOperation::new, new SchemaAlterTableDropColumnOperationSerializer());
+        factory.register(-111, SchemaAddQueryEntityOperation::new, new SchemaAddQueryEntityOperationMarshallableSerializer(marsh, clsLdr));
+        factory.register(-110, QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr));
+        factory.register(-109, User::new, new UserSerializer());
+        factory.register(-108, UserManagementOperation::new, new UserManagementOperationSerializer());
+        factory.register(-107, NodeSpecificData::new, new NodeSpecificDataSerializer());
+        factory.register(-106, DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer());
+        factory.register(-105, TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer());
+        factory.register(-104, TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer());
+        factory.register(-103, TcpDiscoveryCacheMetricsMessage::new, new TcpDiscoveryCacheMetricsMessageSerializer());
+        factory.register(-102, TcpDiscoveryNodeMetricsMessage::new, new TcpDiscoveryNodeMetricsMessageSerializer());
+        factory.register(-101, InetSocketAddressMessage::new, new InetSocketAddressMessageSerializer());
+        factory.register(-100, InetAddressMessage::new, new InetAddressMessageSerializer());
+        factory.register(-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
 
         // TcpDiscoveryAbstractMessage
-        factory.register(TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer());
-        factory.register(TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer());
-        factory.register(TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
-        factory.register(TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
-        factory.register(TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
-        factory.register(TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
-        factory.register(TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer());
-        factory.register(TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer());
-        factory.register(TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer());
-        factory.register(TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer());
-        factory.register(TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer());
-        factory.register(TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer());
-        factory.register(TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer());
-        factory.register(TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer());
-        factory.register(TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer());
-        factory.register(TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer());
-        factory.register(TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer());
-        factory.register(TcpDiscoveryNodeAddFinishedMessage::new,
+        factory.register(0, TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer());
+        factory.register(1, TcpDiscoveryPingRequest::new, new TcpDiscoveryPingRequestSerializer());
+        factory.register(2, TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
+        factory.register(3, TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
+        factory.register(4, TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
+        factory.register(5, TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
+        factory.register(6, TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer());
+        factory.register(7, TcpDiscoveryRingLatencyCheckMessage::new, new TcpDiscoveryRingLatencyCheckMessageSerializer());
+        factory.register(8, TcpDiscoveryHandshakeRequest::new, new TcpDiscoveryHandshakeRequestSerializer());
+        factory.register(9, TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer());
+        factory.register(10, TcpDiscoveryHandshakeResponse::new, new TcpDiscoveryHandshakeResponseSerializer());
+        factory.register(11, TcpDiscoveryAuthFailedMessage::new, new TcpDiscoveryAuthFailedMessageSerializer());
+        factory.register(12, TcpDiscoveryDuplicateIdMessage::new, new TcpDiscoveryDuplicateIdMessageSerializer());
+        factory.register(13, TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer());
+        factory.register(14, TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer());
+        factory.register(15, TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer());
+        factory.register(16, TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(17, TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(18, TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer());
+        factory.register(19, TcpDiscoveryNodeAddFinishedMessage::new,
             new TcpDiscoveryNodeAddFinishedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpDiscoveryJoinRequestMessage::new,
+        factory.register(20, TcpDiscoveryJoinRequestMessage::new,
             new TcpDiscoveryJoinRequestMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpDiscoveryCustomEventMessage::new,
+        factory.register(21, TcpDiscoveryCustomEventMessage::new,
             new TcpDiscoveryCustomEventMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpDiscoveryServerOnlyCustomEventMessage::new,
+        factory.register(22, TcpDiscoveryServerOnlyCustomEventMessage::new,
             new TcpDiscoveryServerOnlyCustomEventMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer());
-        factory.register(DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer());
-        factory.register(DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer());
-        factory.register(DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer());
-        factory.register(DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer());
-        factory.register(TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer());
-        factory.register(TcpDiscoveryNodeAddedMessage::new, new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(FullMessage::new, new FullMessageSerializer());
-        factory.register(InitMessage::new, new InitMessageSerializer());
-        factory.register(SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer());
-        factory.register(SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer());
-        factory.register(SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer());
-        factory.register(MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer());
-        factory.register(SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer());
-        factory.register(SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer());
-        factory.register(ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer());
+        factory.register(23, TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer());
+        factory.register(24, DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer());
+        factory.register(25, DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer());
+        factory.register(26, DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer());
+        factory.register(27, DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer());
+        factory.register(28, TcpDiscoveryClientReconnectMessage::new, new TcpDiscoveryClientReconnectMessageSerializer());
+        factory.register(29, TcpDiscoveryNodeAddedMessage::new, new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr));
+        factory.register(30, FullMessage::new, new FullMessageSerializer());
+        factory.register(31, InitMessage::new, new InitMessageSerializer());
+        factory.register(32, SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer());
+        factory.register(33, SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer());
+        factory.register(34, SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer());
+        factory.register(35, MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer());
+        factory.register(36, SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer());
+        factory.register(37, SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer());
+        factory.register(38, ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer());
 
-        factory.register(GridCacheVersion::new, new GridCacheVersionSerializer());
+        factory.register(86, GridCacheVersion::new, new GridCacheVersionSerializer());
 
         // DiscoveryCustomMessage
-        factory.register(CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer());
-        factory.register(SecurityAwareCustomMessageWrapper::new,
+        factory.register(500, CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer());
+        factory.register(501, SecurityAwareCustomMessageWrapper::new,
             new SecurityAwareCustomMessageWrapperMarshallableSerializer(marsh, clsLdr));
-        factory.register(MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer());
-        factory.register(MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer());
-        factory.register(SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer());
-        factory.register(SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer());
-        factory.register(WalStateFinishMessage::new, new WalStateFinishMessageSerializer());
-        factory.register(WalStateProposeMessage::new, new WalStateProposeMessageSerializer());
-        factory.register(MetadataUpdateAcceptedMessage::new, new MetadataUpdateAcceptedMessageSerializer());
-        factory.register(TxTimeoutOnPartitionMapExchangeChangeMessage::new,
+        factory.register(502, MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer());
+        factory.register(503, MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer());
+        factory.register(504, SchemaProposeDiscoveryMessage::new, new SchemaProposeDiscoveryMessageSerializer());
+        factory.register(505, SchemaFinishDiscoveryMessage::new, new SchemaFinishDiscoveryMessageSerializer());
+        factory.register(506, WalStateFinishMessage::new, new WalStateFinishMessageSerializer());
+        factory.register(507, WalStateProposeMessage::new, new WalStateProposeMessageSerializer());
+        factory.register(508, MetadataUpdateAcceptedMessage::new, new MetadataUpdateAcceptedMessageSerializer());
+        factory.register(509, TxTimeoutOnPartitionMapExchangeChangeMessage::new,
             new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer());
-        factory.register(UserAcceptedMessage::new, new UserAcceptedMessageSerializer());
-        factory.register(UserProposedMessage::new, new UserProposedMessageSerializer());
-        factory.register(ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer());
-        factory.register(StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer());
-        factory.register(StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer());
-        factory.register(CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer());
-        factory.register(ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
-        factory.register(MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
-        factory.register(MappingProposedMessage::new, new MappingProposedMessageSerializer());
-        factory.register(MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
-        factory.register(SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
-        factory.register(SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
-        factory.register(DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
-        factory.register(SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
-        factory.register(IncrementalSnapshotVerifyResult::new,
+        factory.register(510, UserAcceptedMessage::new, new UserAcceptedMessageSerializer());
+        factory.register(511, UserProposedMessage::new, new UserProposedMessageSerializer());
+        factory.register(512, ChangeGlobalStateFinishMessage::new, new ChangeGlobalStateFinishMessageSerializer());
+        factory.register(513, StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer());
+        factory.register(514, StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer());
+        factory.register(515, CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer());
+        factory.register(516, ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
+        factory.register(517, MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
+        factory.register(518, MappingProposedMessage::new, new MappingProposedMessageSerializer());
+        factory.register(519, MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
+        factory.register(520, SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
+        factory.register(521, SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
+        factory.register(522, DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());
+        factory.register(523, SnapshotCheckResponse::new, new SnapshotCheckResponseSerializer());
+        factory.register(524, IncrementalSnapshotVerifyResult::new,
             new IncrementalSnapshotVerifyResultMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotRestoreOperationResponse::new,
+        factory.register(525, SnapshotRestoreOperationResponse::new,
             new SnapshotRestoreOperationResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotMetadataResponse::new,
+        factory.register(526, SnapshotMetadataResponse::new,
             new SnapshotMetadataResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotCheckPartitionHashesResponse::new,
+        factory.register(527, SnapshotCheckPartitionHashesResponse::new,
             new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
-        factory.register(SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
-        factory.register(SnapshotPartitionsVerifyHandlerResponse::new,
+        factory.register(528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
+        factory.register(529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
+        factory.register(530, SnapshotPartitionsVerifyHandlerResponse::new,
             new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
-        factory.register(CacheStatisticsClearMessage::new, new CacheStatisticsClearMessageSerializer());
-        factory.register(ChangeGlobalStateMessage::new,
+        factory.register(531, CacheStatisticsClearMessage::new, new CacheStatisticsClearMessageSerializer());
+        factory.register(532, ChangeGlobalStateMessage::new,
             new ChangeGlobalStateMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(ClientCacheChangeDummyDiscoveryMessage::new,
+        factory.register(533, ClientCacheChangeDummyDiscoveryMessage::new,
             new ClientCacheChangeDummyDiscoveryMessageMarshallableSerializer(marsh, clsLdr));
-        factory.register(DynamicCacheChangeBatch::new,
+        factory.register(534, DynamicCacheChangeBatch::new,
             new DynamicCacheChangeBatchMarshallableSerializer(marsh, clsLdr));
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java
index 6ec97155d6190..b41d56110ce21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java
@@ -93,10 +93,6 @@ public DiscoveryCustomMessage delegate() {
         return ack == null ? null : new SecurityAwareCustomMessageWrapper(ack, secSubjId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 501;
-    }
 
     /** {@inheritDoc} */
     @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java
index abd75f6c8c7d6..00b00bf7e65df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java
@@ -113,10 +113,6 @@ public byte[] masterKeyDigest() {
         return Objects.equals(reqId, ((ChangeCacheEncryptionRequest)o).reqId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 38;
-    }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
index b6359952bb051..a5e9bd1daaec8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
@@ -60,10 +60,6 @@ public int keyCount() {
         return keyCnt;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 162;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
index 9ab94bbd3ff36..e24c6ef90b4ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
@@ -73,10 +73,6 @@ public byte[] masterKeyDigest() {
         return masterKeyDigest;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 163;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java
index e4f4ce375e46b..a6a85dfee4822 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java
@@ -95,10 +95,6 @@ byte[] digest() {
         return res;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 35;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
index 6b6d4f26b38d8..129cafea67661 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -237,10 +237,6 @@ public void finishUnmarshalFilters(Marshaller marsh, ClassLoader filterClsLdr) t
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 13;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/User.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/User.java
index 877101693d49f..d36303813b6d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/User.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/User.java
@@ -145,8 +145,4 @@ public boolean authorize(String passwd) {
         return S.toString(User.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -109;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java
index bda470bb5fae6..2e29cd0b647fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java
@@ -96,8 +96,4 @@ Throwable error() {
         return S.toString(UserAcceptedMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 510;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
index 0a33a95f63764..532c0d30d56ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
@@ -76,10 +76,6 @@ public IgniteUuid id() {
         return id;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 131;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
index 5c9e8251ef46d..40d6245911c58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
@@ -71,10 +71,6 @@ public IgniteUuid id() {
         return id;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 132;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
index 7d7be64e6f4ac..82d3b939bf58f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperation.java
@@ -104,11 +104,6 @@ public IgniteUuid id() {
         return id.hashCode();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -108;
-    }
-
     /**
      * User action type.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
index d0c32b91b14f1..4df10fcb05c56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
@@ -72,10 +72,6 @@ public String errorMessage() {
         return errorMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 130;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java
index 9478f7130e464..b74bd11b18412 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java
@@ -85,8 +85,4 @@ UserManagementOperation operation() {
         return S.toString(UserProposedMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 511;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinityChangeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinityChangeMessage.java
index 6026449475c0e..8d2647e9666d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinityChangeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinityChangeMessage.java
@@ -208,10 +208,6 @@ public void stopProcess(boolean stopProc) {
         return discoCache.copy(topVer, null);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 515;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index 180d09aa93b8c..1cc84a98a4ff5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -76,11 +76,6 @@ public CacheEntryPredicateAdapter(@Nullable CacheObject val) {
         this.locked = locked;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 98;
-    }
-
     /** */
     public PredicateType type() {
         return type;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
index 53b58fa1ed36a..9425dadae589c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
@@ -58,9 +58,4 @@ public CacheEvictionEntry(KeyCacheObject key, GridCacheVersion ver, boolean near
         this.near = near;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 97;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
index 561378eb850cd..1276c6b63c82c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
@@ -151,10 +151,6 @@ public void finishUnmarshal(GridCacheContext<?, ?> ctx, ClassLoader ldr) throws
             res.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 93;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java
index a30edd8fc27b7..527d8147e6d13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java
@@ -94,11 +94,6 @@ private CacheStatisticsClearMessage(CacheStatisticsClearMessage msg) {
         return initial() ? new CacheStatisticsClearMessage(this) : null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 531;
-    }
-
     /**
      * @return Cache names.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java
index 7864f566c4cb9..e2747dda762ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java
@@ -141,8 +141,4 @@ public UUID requestId() {
         return S.toString(CacheStatisticsModeChangeMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 500;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java
index 5f25c6b7bf934..f4f565fcb5109 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java
@@ -173,10 +173,6 @@ public void updateTimeoutObject(ClientCacheUpdateTimeout updateTimeoutObj) {
         return null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 516;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
index 3317a44166beb..993a0b0c10d4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
@@ -131,10 +131,6 @@ Set<String> cachesToClose() {
             startReqs = U.unmarshal(marsh, startRequestsBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 533;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
index a0f913e3bc07f..4d734578bfa4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
@@ -187,10 +187,6 @@ public void startCaches(boolean startCaches) {
             reqs = U.unmarshal(marsh, requestsBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 534;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index 2a1da2ea5ad83..d8d710f62368f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -175,11 +175,6 @@ public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 91;
-    }
-
     /**
      * @param ctx Context.
      * @param ldr Loader.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index bf222bb04de30..7c78a10a5cf48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -376,10 +376,6 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 88;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
index e790ff7ff705f..af2ca1aa16c5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
@@ -67,10 +67,6 @@ public UUID requestId() {
         return ErrorMessage.error(errMsg);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -45;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean addDeploymentInfo() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java
index 6b1016ab1ef79..f2182833f0776 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java
@@ -120,8 +120,4 @@ public boolean isInit() {
         return S.toString(TxTimeoutOnPartitionMapExchangeChangeMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 509;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
index bd2031b6287f4..2d0e5bae19138 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
@@ -110,10 +110,6 @@ public void senderNodeId(UUID sndNodeId) {
         this.sndNodeId = sndNodeId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 129;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
index 43862e25f5263..36d3874ea7f77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
@@ -78,8 +78,4 @@ public boolean changed() {
         return S.toString(WalStateFinishMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 506;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
index 9d0e6931c3caf..7bdeb150604f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
@@ -97,8 +97,4 @@ public void affinityNode(boolean affNode) {
         return S.toString(WalStateProposeMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 507;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
index a609e4b24a0a1..1c71892fd1795 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java
@@ -32,9 +32,6 @@
  * It can be updated dynamically from different nodes and threads on the same node.
  */
 public final class BinaryMetadataVersionInfo implements Serializable, Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 505;
-
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -166,8 +163,4 @@ public void unmarshalMetadata() throws IgniteCheckedException {
             "]";
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java
index 7b26654040db3..ae547829a9140 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java
@@ -96,8 +96,4 @@ public void duplicated(boolean duplicated) {
         return S.toString(MetadataRemoveAcceptedMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 502;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java
index 580333bcb526f..656570ac57fee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java
@@ -134,8 +134,4 @@ public void setOnCoordinator(boolean onCoordinator) {
         return S.toString(MetadataRemoveProposedMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 503;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
index 143f731de6dab..b2368b25b6035 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
@@ -49,11 +49,6 @@ public MetadataRequestMessage() {
         this.typeId = typeId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 80;
-    }
-
     /**
      * @return Type ID.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
index 13c49a1d53eba..2daedfb0ce955 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
@@ -44,11 +44,6 @@ public MetadataResponseMessage() {
         this.typeId = typeId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 81;
-    }
-
     /**
      * @return Binary metadata version info.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java
index fc9e1e5380b50..fb5d9e7fc0cb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java
@@ -99,10 +99,6 @@ public void duplicated(boolean duplicated) {
         this.duplicated = duplicated;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 508;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index 62f93959ae93c..c83e732f6181a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -183,10 +183,6 @@ public List<GridCacheVersion> nearVersions() {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 20;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
index ffd3ca50b47ec..5298f12b396ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
@@ -131,10 +131,6 @@ public boolean system() {
         return ctx.txRecoveryMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 16;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
index 2c7fe02b70c7d..aae53f4e84c30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
@@ -130,10 +130,6 @@ public void success(boolean success) {
         return ctx.txRecoveryMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 17;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 5b412ad4b130e..b02d75024fec5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -365,10 +365,6 @@ public long timeout() {
         finishUnmarshalCacheObjects(keys, cctx, ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 21;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index 64da50ca22b74..e8d9d1e81ea47 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -212,10 +212,6 @@ protected int valuesSize() {
         finishUnmarshalCacheObjects(vals, ctx.cacheContext(cacheId), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 22;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 4a621ec5915c4..44d89b03bac53 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -265,10 +265,6 @@ public boolean replyRequired() {
         return ctx.txFinishMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 23;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 180d71d38e6cd..ba26f3e15cfb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -93,10 +93,6 @@ public IgniteUuid futureId() {
         return ctx.txFinishMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 24;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index e1ca8e0938ae2..bd427bd47b56f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -452,10 +452,6 @@ private boolean isFlag(int mask) {
         return (flags & mask) != 0;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 25;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 9bfbeb33c3f01..5d2020f743102 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -117,11 +117,6 @@ public void error(@Nullable Throwable err) {
         return ctx.txPrepareMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 26;
-    }
-
     /**
      * @return Error message.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
index ca13107e930c7..2c55bfd642547 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
@@ -95,10 +95,6 @@ public void addKey(KeyCacheObject key) {
         return ctx.txLockMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 57;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index 230a056d52591..a2f61a3c5df77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -100,10 +100,6 @@ public long futureId() {
         return topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 28;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 0395eb77a8306..1b26e288f9c3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -261,10 +261,6 @@ private List<List<UUID>> ids(List<List<ClusterNode>> assignments) {
         return null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 29;
-    }
 
     /**
      * @param ctx Context.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 1e862a71061df..315997cecd8a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -291,10 +291,6 @@ public long accessTtl() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 30;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 2e9a46f870877..42895cf9d6773 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -168,10 +168,6 @@ public void preloadEntries(List<GridCacheEntryInfo> preloadEntries) {
             unmarshalInfos(preloadEntries, ctx.cacheContext(cacheId), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 31;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 36e56f57418dd..6d321c3eb4172 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -198,10 +198,6 @@ public Collection<PartitionUpdateCountersMessage> updateCounters() {
         return updCntrs;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 32;
-    }
 
     /** {@inheritDoc} */
     @Override public int partition() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 8e218befadf9e..352281f9b57c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -159,10 +159,6 @@ public GridCacheReturn returnValue() {
         return retVal;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 33;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
index 3e067f64f9bee..744192bcb175c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
@@ -65,8 +65,4 @@ public Collection<GridCacheVersion> versions() {
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -27;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 1688bc69e5f4d..f8364dca6adb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -391,10 +391,6 @@ public boolean skipCompletedVersion() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 34;
-    }
 
     /** {@inheritDoc} */
     @Override public int partition() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index fa947fc4e54c0..e11e05718e56d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -240,10 +240,6 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 35;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index fdcab75034c8b..8c5fc051a69e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -89,8 +89,4 @@ public void addNearKey(KeyCacheObject key)
         return S.toString(GridDhtUnlockRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 36;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index f5b35d1364e28..c3ffc6f22b602 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -161,10 +161,6 @@ private void ensureSpace(int newSize) {
             data = Arrays.copyOf(data, data.length << 1);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 157;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
index 30c023ff918f3..4cc026c390cda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
@@ -26,9 +26,6 @@
 
 /** Wraps transaction prepare request with application attributes. */
 public class TransactionAttributesAwareRequest extends GridCacheMessage {
-    /** */
-    public static final short TYPE_CODE = 181;
-
     /** Original transaction prepare message. */
     @Order(0)
     GridDistributedTxPrepareRequest payload;
@@ -75,8 +72,4 @@ public Map<String, String> applicationAttributes() {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
index 2b5eec5284d0c..7c37b474dd2b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
@@ -25,9 +25,6 @@
 
 /** Wraps atomic updates with application attributes. */
 public class AtomicApplicationAttributesAwareRequest extends GridCacheIdMessage {
-    /** */
-    public static final short TYPE_CODE = 180;
-
     /** Original update message. */
     @Order(0)
     GridNearAtomicAbstractUpdateRequest payload;
@@ -75,8 +72,4 @@ public Map<String, String> applicationAttributes() {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index fa9947d356061..c75b8f52c6516 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -104,10 +104,6 @@ public void futureIds(GridLongList futIds) {
         return ctx.atomicMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 37;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 5abd304a9184c..c2e929855e51c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -199,10 +199,6 @@ public void futureId(long futId) {
         return CACHE_MSG_IDX;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -48;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean addDeploymentInfo() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index f970473338a0d..20aad2f7dec8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -367,10 +367,6 @@ private void finishUnmarshalObject(@Nullable CacheObject obj, GridCacheContext<?
         prevVal = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -36;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 76309e6e20707..4d06d1705daaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -527,10 +527,6 @@ else if (conflictVers != null)
         prevVals = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 38;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 4787ca83b1963..53d322e084ef1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -185,10 +185,6 @@ public void partition(int partId) {
         return ctx.atomicMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 39;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
index 8ad123b4d3d91..2afb5a21c5b0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
@@ -89,10 +89,6 @@ GridNearAtomicAbstractUpdateRequest updateRequest() {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -50;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 952f1f795611b..62fcf3966d916 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -416,10 +416,6 @@ else if (conflictVers != null)
             keys = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 40;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 3d64a0d3f6e4d..7b072491d4f89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -127,10 +127,6 @@ public GridNearAtomicSingleUpdateFilterRequest() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 127;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 2399bc8b16294..2b2e44f5e7ea7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -198,10 +198,6 @@ public GridNearAtomicSingleUpdateInvokeRequest() {
         entryProc = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 126;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index 362ec935b11a6..25b31b062c7c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -248,10 +248,6 @@ public GridNearAtomicSingleUpdateRequest() {
             key = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 125;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 8cf631496129a..ea5ef2d51407c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -424,10 +424,6 @@ public void partition(int partId) {
         return ctx.atomicMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 41;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
index a41dea67f7de7..2c04599558b9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
@@ -194,10 +194,6 @@ void addSkippedIndex(int keyIdx) {
         return nearVals.get(idx);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -51;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
index 1e860354a5d00..0e42f82082251 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
@@ -125,10 +125,6 @@ void finishUnmarshal(GridCacheMessage msg, GridCacheContext<?, ?> cctx, ClassLoa
         msg.finishUnmarshalCacheObjects(failedKeys, cctx, ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -49;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
index 540e56e5156f6..7a214e60938c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
@@ -241,10 +241,6 @@ public Map<Integer, GridLongList> assignmentsDiff() {
         return assignsDiff;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 128;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
index 6ac0fb6767caa..e19550689cd3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
@@ -28,9 +28,6 @@
  *
  */
 public class CachePartitionFullCountersMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 506;
-
     /** */
     @Order(0)
     long[] initUpdCntrs;
@@ -126,8 +123,4 @@ public long[] updateCounters() {
         return updCntrs;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
index c91be0a94e92d..de0f3ac0d8597 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
@@ -30,9 +30,6 @@
  *
  */
 public class CachePartitionPartialCountersMap implements Serializable, Message {
-    /** */
-    public static final short TYPE_CODE = 500;
-
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -236,8 +233,4 @@ public static Map<Integer, T2<Long, Long>> toCountersMap(CachePartitionPartialCo
         return sb.toString();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index b9409dc804b02..898ad4478f086 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -143,10 +143,6 @@ private int keyCount() {
         return keys.size();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 42;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 2b739c3887728..c59a8cd5c1dbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -223,10 +223,6 @@ public void addInfo(GridCacheEntryInfo info) {
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 43;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index b65bd6e2ab909..e963d1af4c61d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -141,10 +141,6 @@ public void timeout(long timeout) {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 45;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
index 2be15b993071d..cc56b163d6866 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
@@ -200,10 +200,6 @@ public boolean isLeft() {
         return evt == id.evt && topVer.equals(id.topVer) && nodeId.equals(id.nodeId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 87;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
index 44e710d13ae00..7411d21a6702a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java
@@ -39,9 +39,6 @@
  */
 public class GridDhtPartitionFullMap
     extends AbstractMap<UUID, GridDhtPartitionMap> implements Comparable<GridDhtPartitionFullMap>, Externalizable, Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 519;
-
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -343,8 +340,4 @@ public String toFullString() {
         return map.entrySet();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
index 7bda312f9b650..d81d57ece486d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
@@ -35,9 +35,6 @@
  * Partition map from single node.
  */
 public class GridDhtPartitionMap implements Comparable<GridDhtPartitionMap>, Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 518;
-
     /** Node ID. */
     @Order(0)
     protected UUID nodeId;
@@ -280,8 +277,4 @@ public String toFullString() {
         return S.toString(GridDhtPartitionMap.class, this, "top", top, "updateSeq", updateSeq, "size", size());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index f583e8192d947..a800ab4d1f7a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -257,10 +257,6 @@ public int size() {
         return getInfosSafe().size();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 114;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 98403fbf1ba2d..7d68e8d7ea321 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -454,10 +454,6 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
             errs = new HashMap<>();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 46;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index 3129920338e10..9d922a419c5d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -320,10 +320,6 @@ public void exchangeStartTime(long exchangeStartTime) {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 47;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 0dc27e1d2b275..a7eb4c7200dfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -65,10 +65,6 @@ public GridDhtPartitionExchangeId restoreExchangeId() {
         return restoreExchId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 48;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
index 80102e83af0e6..98ad54d0c78cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java
@@ -23,9 +23,6 @@
 
 /** Pair of group ID and partition ID. */
 public class GroupPartitionIdPair implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 508;
-
     /** Group ID. */
     @Order(0)
     int grpId;
@@ -62,10 +59,6 @@ public int partitionId() {
         return partId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
index 3c718f58c3cb0..d43b05bec5bd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java
@@ -34,9 +34,6 @@
  * Map of partitions demanded during rebalancing.
  */
 public class IgniteDhtDemandedPartitionsMap implements Serializable, Message {
-    /** */
-    public static final short TYPE_CODE = 501;
-
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -186,8 +183,4 @@ public Collection<Integer> all() {
         return S.toString(IgniteDhtDemandedPartitionsMap.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
index 8c3e1029bb4af..62d964d682bf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java
@@ -27,9 +27,6 @@
  * Partition counters map.
  */
 public class IgniteDhtPartitionCountersMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 507;
-
     /** */
     @Order(0)
     Map<Integer, CachePartitionFullCountersMap> map;
@@ -59,8 +56,4 @@ public synchronized CachePartitionFullCountersMap get(int cacheId) {
         return cntrMap;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
index 5bfc1ab8cb3ab..ecf8b8fd0f154 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java
@@ -33,9 +33,6 @@
  *
  */
 public class IgniteDhtPartitionHistorySuppliersMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 510;
-
     /** */
     private static final IgniteDhtPartitionHistorySuppliersMap EMPTY = new IgniteDhtPartitionHistorySuppliersMap();
 
@@ -119,8 +116,4 @@ public synchronized void putAll(IgniteDhtPartitionHistorySuppliersMap that) {
         return S.toString(IgniteDhtPartitionHistorySuppliersMap.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
index 7e67e55427809..d8cc8d9674c84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
@@ -33,9 +33,6 @@
  * Partition reload map.
  */
 public class IgniteDhtPartitionsToReloadMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 513;
-
     /** */
     @Order(0)
     Map<UUID, Map<Integer, Set<Integer>>> map;
@@ -75,8 +72,4 @@ public synchronized void put(UUID nodeId, int cacheId, int partId) {
         return S.toString(IgniteDhtPartitionsToReloadMap.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
index c8614f08a8cca..1a5b4998d88b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java
@@ -27,9 +27,6 @@
  * a partition of a given id).
  */
 public class IntLongMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 514;
-
     /** Map. */
     @Order(0)
     @Nullable Map<Integer, Long> map;
@@ -53,8 +50,4 @@ public IntLongMap(@Nullable Map<Integer, Long> map) {
         return map;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
index 14eb95f0cf60d..a1eb2e2ea2318 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java
@@ -25,9 +25,6 @@
 
 /** Map for storing GroupPartitionIdPair and their respective history counter values. */
 public class PartitionReservationsMap implements Message {
-    /** Type code. */
-    public static final short TYPE_CODE = 509;
-
     /** Mapping between GroupPartitionIdPair objects and their respective history counter values. */
     @Order(0)
     Map<GroupPartitionIdPair, Long> map;
@@ -61,8 +58,4 @@ public void put(GroupPartitionIdPair pair, Long counter) {
         map.put(pair, counter);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
index 32e3618603b2a..f3631bbfa8c10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
@@ -76,9 +76,4 @@ public boolean isFinal() {
         return isFinal;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 135;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
index 334c12a4b1d76..af5d90f84d2a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
@@ -94,10 +94,6 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
             val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 102;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 03811aa6e79fe..74ad48394405d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -329,10 +329,6 @@ public long accessTtl() {
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 49;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index 0fec84749f5da..2607a1dac5b3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -249,10 +249,6 @@ public void errorMessage(@Nullable ErrorMessage errMsg) {
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 50;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 80a84d8e32e16..a6f63d1312253 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -296,10 +296,6 @@ public long accessTtl() {
         return txLbl;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 51;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index 16d3777ccc908..d351e73250192 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -267,10 +267,6 @@ public void addValueBytes(
         addValue(val);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 52;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 8d3b160ef7e4a..07ca1355fc0f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -276,10 +276,6 @@ public boolean recovery() {
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 116;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
index c3c73676c980f..a9ac0664ee0dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
@@ -227,10 +227,6 @@ else if (res instanceof GridCacheEntryInfo)
         return addDepInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 117;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index fe9a9e089b398..35af30081afa4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -138,10 +138,6 @@ public void updateMiniId(int miniId) {
         this.miniId = miniId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 53;
-    }
 
     /** {@inheritDoc} */
     @Override public int partition() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 5cb53e7d94605..4dfe3569e3bf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -119,10 +119,6 @@ public void errorMessage(@Nullable ErrorMessage errMsg) {
         this.errMsg = errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 54;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 2fdb9bccf3c02..05b7f6ef918a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -290,10 +290,6 @@ private boolean isFlag(int mask) {
         return (flags & mask) != 0;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 55;
-    }
 
     /** {@inheritDoc} */
     @Override public int partition() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 15be184ccca5e..82084444ac45b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -416,10 +416,6 @@ public void ownedValuesValues(@Nullable Collection<CacheVersionedValue> ownedVal
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 56;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/DataStreamerUpdatesHandlerResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/DataStreamerUpdatesHandlerResult.java
index 06e2f90ac72cc..abca745ae6347 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/DataStreamerUpdatesHandlerResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/DataStreamerUpdatesHandlerResult.java
@@ -42,8 +42,4 @@ public boolean streamerWarning() {
         return streamerWarning;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 522;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
index 30526aa14b1d7..5a0824c9a5d41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
@@ -28,9 +28,6 @@
  * Message that holds a transaction message and incremental snapshot ID.
  */
 public class IncrementalSnapshotAwareMessage extends GridCacheMessage {
-    /** */
-    public static final short TYPE_CODE = 400;
-
     /** Original transaction message. */
     @Order(0)
     GridCacheMessage payload;
@@ -94,10 +91,6 @@ public long snapshotTopologyVersion() {
         payload.finishUnmarshal(ctx, ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean addDeploymentInfo() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
index c08861590e4a7..d614f2071d303 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
@@ -106,8 +106,4 @@ public Collection<GridCacheVersion> partiallyCommittedTxs() {
             partHashRes = U.unmarshal(marsh, partHashResBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 524;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java
index eb9e2a585f3f1..24b75f8cc9f16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java
@@ -43,8 +43,4 @@ public Map<String, SnapshotHandlerResult<Message>> handlerResults() {
         return hndRes;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 529;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
index e35436c5b2239..0254d452af973 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
@@ -44,8 +44,4 @@ public Map<String, Map<String, SnapshotHandlerResult<Message>>> handlerResults()
         return F.viewReadOnly(perMetaResults, SnapshotCheckHandlersNodeResponse::handlerResults);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 528;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckPartitionHashesResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckPartitionHashesResponse.java
index c38ac9e2f9f3a..f5489867ffcfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckPartitionHashesResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckPartitionHashesResponse.java
@@ -62,8 +62,4 @@ public Map<String, Map<PartitionKey, PartitionHashRecord>> perMetaResults() {
             perMetaResults = U.unmarshal(marsh, perMetaResultsBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 527;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcessRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcessRequest.java
index 155c690a03d5b..791a8f559694b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcessRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcessRequest.java
@@ -107,10 +107,6 @@ public int incrementalIndex() {
         return incIdx;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 33;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckResponse.java
index ca70ba2e13b6f..e3c2d12548221 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckResponse.java
@@ -67,8 +67,4 @@ public T result() {
         return (T)result;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 523;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
index 71ac90131efcc..5fd25dc8a448f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
@@ -25,9 +25,6 @@
  * Message indicating a failure occurred during processing snapshot files request.
  */
 public class SnapshotFilesFailureMessage extends AbstractSnapshotMessage {
-    /** Snapshot response message type (value is {@code 179}). */
-    public static final short TYPE_CODE = 179;
-
     /** Exception message which is occurred during snapshot request processing. */
     @Order(0)
     String errMsg;
@@ -56,10 +53,6 @@ public String errorMessage() {
         return errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
index cbf7770bbae87..221fa32644402 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
@@ -34,9 +34,6 @@
  *
  */
 public class SnapshotFilesRequestMessage extends AbstractSnapshotMessage {
-    /** Snapshot request message type (value is {@code 178}). */
-    public static final short TYPE_CODE = 178;
-
     /** Snapshot operation request ID. */
     @Order(0)
     UUID reqId;
@@ -120,10 +117,6 @@ public UUID requestId() {
         return reqId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotHandlerResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotHandlerResult.java
index aa7f93edf2bf6..d734313d05eb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotHandlerResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotHandlerResult.java
@@ -64,8 +64,4 @@ public SnapshotHandlerResult(@Nullable T data, @Nullable Exception err) {
         return (Exception)ErrorMessage.error(errMsg);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 521;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataResponse.java
index 7f396929873ea..d45325ad093ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataResponse.java
@@ -60,8 +60,4 @@ public List<SnapshotMetadata> metadata() {
             metadata = U.unmarshal(marsh, metadataBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 526;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationEndRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationEndRequest.java
index c826b20f5f330..3b24db0c1a8e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationEndRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationEndRequest.java
@@ -79,10 +79,6 @@ public UUID requestId() {
         return warnings;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 36;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationRequest.java
index b6735591320d8..25aa5fb10a57d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationRequest.java
@@ -151,10 +151,6 @@ public boolean configOnly() {
         return configOnly;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 34;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationResponse.java
index f595169d4ae1e..db44f5446abb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotOperationResponse.java
@@ -44,8 +44,4 @@ public SnapshotOperationResponse(Map<String, SnapshotHandlerResult<Message>> hnd
         return hndResults;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 520;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandlerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandlerResponse.java
index d46f63496f349..40ea2671f3946 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandlerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandlerResponse.java
@@ -62,8 +62,4 @@ public Map<PartitionKey, PartitionHashRecord> response() {
             res = U.unmarshal(marsh, resBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 530;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
index f273c90fcb59e..2f658cf168073 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
@@ -85,9 +85,4 @@ public List<SnapshotMetadata> metadata() {
         if (metasBytes != null)
             metas = U.unmarshal(marsh, metasBytes, clsLdr);
     }
-    
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 525;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStartRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStartRequest.java
index b2e10f0ac7b4e..5f8b82713243c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStartRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStartRequest.java
@@ -44,10 +44,6 @@ public UUID requestId() {
         return reqId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 37;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
index 9c3ca28d73e8a..c7611c0b0bee8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
@@ -59,10 +59,6 @@ public SnapshotStartDiscoveryMessage(UUID procId, SnapshotOperationRequest req)
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 32;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 7e99db3bce409..84813c40420c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -659,10 +659,6 @@ public Collection<KeyCacheObject> skipKeys() {
         return part;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 58;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index b858725a6b0c3..180dfaac620fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -272,10 +272,6 @@ public boolean fields() {
         return fields;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 59;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index f1f8a224d90ae..7245a13627b3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -138,11 +138,6 @@ public void parameterIndexes(int[] paramIdxs) {
         return S.toString(GridCacheSqlQuery.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 112;
-    }
-
     /**
      * @return Copy.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
index 8f0b348e833c3..599435513860a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
@@ -88,10 +88,6 @@ public void updateCntrs(Map<Integer, Long> updateCntrs) {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 118;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index 85e2dc147f43f..d8dceadd18eb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -359,10 +359,6 @@ CacheObject oldValue() {
         return depInfo;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 96;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 1c80cfc75e0d5..ef1bbce28a9f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -1092,10 +1092,6 @@ public void clearEntryReadVersion() {
         serReadVer = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 100;
-    }
 
     /** {@inheritDoc} */
     @Override public Class<?> deployClass() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
index 2d47f31d863cb..b50bc340c3ba1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
@@ -110,10 +110,6 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
         return res;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 94;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
index 13601b32a910c..98e5830cb3b46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
@@ -143,8 +143,4 @@ public void unmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws Ignit
         return S.toString(TxEntryValueHolder.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 101;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
index bc80266d7c24d..15e9b2814ef4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
@@ -123,9 +123,4 @@ public boolean requested() {
         return S.toString(TxLock.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -25;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
index c0214cd163ac3..48469761ce5bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
@@ -66,8 +66,4 @@ public boolean isEmpty() {
         return S.toString(TxLockList.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -26;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
index 6d516e303032b..4db908333d72b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
@@ -118,8 +118,4 @@ public Collection<IgniteTxKey> txKeys() {
         txKeysArr = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -24;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
index 961a2265f9ef0..190eeb574bb6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
@@ -209,8 +209,4 @@ public void addKey(IgniteTxKey key) {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -23;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index 88141816abfe9..aa187de679a67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -113,10 +113,6 @@ public GridCacheRawVersionedEntry(KeyCacheObject key,
         return ver;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 103;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index a9798bcca22d8..d5abdd43f4084 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -233,10 +233,6 @@ public IgniteUuid asIgniteUuid() {
         return Integer.compare(nodeOrder(), other.nodeOrder());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 86;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index a29af56d410f2..9d1fe99ffe791 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -86,10 +86,6 @@ public GridCacheVersionEx(int topVer, int nodeOrderDrId, long order, GridCacheVe
         return conflictVersion();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 104;
-    }
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
index e8e98ae20b245..e8c41f6f9784e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java
@@ -26,9 +26,6 @@
 
 /** Cache metrics message. */
 public class CacheMetricsMessage implements Message {
-    /** */
-    public static final short TYPE_CODE = 136;
-
     /** Number of reads. */
     @Order(0)
     public long cacheGets;
@@ -1479,11 +1476,6 @@ public void writeBehindTotalCriticalOverflowCount(int writeBehindTotalCriticalOv
         this.writeBehindTotalCriticalOverflowCnt = writeBehindTotalCriticalOverflowCnt;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
     /** */
     public String toString() {
         return S.toString(CacheMetricsMessage.class, this);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
index c23ca0f9c7f49..37b3e94f20581 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
@@ -118,8 +118,4 @@ public ClusterState state() {
         return S.toString(ChangeGlobalStateFinishMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 512;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
index d5763cbba05b6..7f03b2121609c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
@@ -253,10 +253,6 @@ public UUID requestId() {
             baselineTopology = U.unmarshal(marsh, baselineTopologyBytes, clsLdr);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 532;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
index 051f5f28fc717..10b5e17f93db7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
@@ -30,9 +30,6 @@
 
 /** */
 public final class ClusterMetricsUpdateMessage implements Message {
-    /** */
-    public static final short TYPE_CODE = 133;
-
     /** Single node metrics message. */
     @Order(0)
     @Nullable NodeFullMetricsMessage singleNodeMetricsMsg;
@@ -75,10 +72,6 @@ public boolean singleNodeMetrics() {
         return singleNodeMetricsMsg != null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
index fe5f1671404dd..f34916222d334 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
@@ -28,9 +28,6 @@
 
 /** Node compound metrics message. */
 public class NodeFullMetricsMessage implements Message {
-    /** */
-    public static final short TYPE_CODE = 138;
-
     /** Node metrics wrapper message. */
     @Order(0)
     public NodeMetricsMessage nodeMetricsMsg;
@@ -73,10 +70,6 @@ public void nodeMetricsMessage(NodeMetricsMessage nodeMetricsMsg) {
         this.nodeMetricsMsg = nodeMetricsMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
index 6cef552e80617..e97b5743434c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java
@@ -33,9 +33,6 @@
 
 /** */
 public class NodeMetricsMessage implements Message {
-    /** */
-    public static final short TYPE_CODE = 137;
-
     /** */
     @Order(0)
     public long lastUpdateTime = -1;
@@ -1340,11 +1337,6 @@ private static double currentGcCpuLoad(Map<String, Collection<ClusterNode>> neig
         return curGcCpuLoad;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
     /** */
     public String toString() {
         return S.toString(NodeMetricsMessage.class, this);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
index 9a77b3870193e..1ef8524fd1086 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
@@ -86,10 +86,6 @@ public UUID routineId() {
         return errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 134;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
index 67e9b9f18eaa0..68ac58db08abe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
@@ -144,10 +144,6 @@ public void dataBytes(byte[] dataBytes) {
         return futId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 61;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index 3ffd004bbc268..4710f493609a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -52,8 +52,4 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) {
         return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 513;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index 0783793c66156..39878b81514d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -52,8 +52,4 @@ public StopRoutineDiscoveryMessage(UUID routineId) {
         return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 514;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
index 91f6998b446aa..17353206c0a71 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
@@ -95,10 +95,6 @@ public <K, V> Map.Entry<K, V> toEntry(final GridCacheContext ctx, final boolean
         };
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 95;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
index d25d67ee7cf61..750c748b2ac60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
@@ -281,8 +281,4 @@ public int partition() {
         return S.toString(DataStreamerRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 62;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
index 9abee2888727f..1638f4f369139 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
@@ -113,8 +113,4 @@ public void finishUnmarshal(Marshaller marsh, ClassLoader ldr) throws IgniteChec
         return S.toString(DataStreamerResponse.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 63;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java
index 4f61b77b6e47c..a0d3b7d94de30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java
@@ -69,10 +69,6 @@ public MarshallerMappingItem getMappingItem() {
         return item;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 517;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java
index 2e2a6cb5e69ee..273a40648dea0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java
@@ -142,10 +142,6 @@ String conflictingClassName() {
         return conflictingClsName;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 518;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
index dae5767810d15..94fc829a1e590 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MarshallerMappingItem.java
@@ -109,8 +109,4 @@ public void className(String clsName) {
         return "[platformId: " + platformId + ", typeId:" + typeId + ", clsName: " + clsName + "]";
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 519;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
index 7703f7e45e4a6..88504cedbd358 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
@@ -57,11 +57,6 @@ public MissingMappingRequestMessage() {
         this.typeId = typeId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 78;
-    }
-
     /** */
     public byte platformId() {
         return platformId;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
index 9ce70f900a461..c34ac8d9fd41f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
@@ -55,11 +55,6 @@ public MissingMappingResponseMessage() {
         this.clsName = clsName;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 79;
-    }
-
     /**
      *
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java
index 8c3b7b7e14450..3208255346ca2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java
@@ -48,10 +48,6 @@ public boolean updated() {
         return updated;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 27;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java
index 17532aff37be4..6297dc391387b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java
@@ -70,10 +70,6 @@ public boolean matches() {
         return new DistributedMetaStorageCasAckMessage(requestId(), matches);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 26;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java
index e029014f841a2..21d44ab1a671f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java
@@ -65,10 +65,6 @@ public UUID requestId() {
         return null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 25;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java
index cb44ccc8f7be8..3f4ddd5e0c494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java
@@ -94,10 +94,6 @@ public byte[] value() {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 24;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
index 4e83211deeed8..ec592ad63f1c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
@@ -206,11 +206,6 @@ public boolean readFrom(ByteBuffer buf) throws IOException {
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return Short.MIN_VALUE;
-    }
-
     /**
      * @return Message payload.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryField.java
index a1e725df9b553..89ac9480bfbea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryField.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryField.java
@@ -185,8 +185,4 @@ public int scale() {
         return S.toString(QueryField.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -110;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
index 4e3444bb4e4c8..35027a3e6b5a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
@@ -55,8 +55,4 @@ public long queryRequestId() {
         return S.toString(GridQueryCancelRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 106;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 42f57d3864c74..9b6a19dd5b4d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -97,8 +97,4 @@ public byte failCode() {
         return S.toString(GridQueryFailResponse.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 107;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
index 75bccd9770d51..6785b4697c0d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
@@ -105,8 +105,4 @@ public int pageSize() {
         return S.toString(GridQueryNextPageRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 108;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
index 728e6283128f0..c56237b549bcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
@@ -164,11 +164,6 @@ public Collection<?> plainRows() {
         return plainRows;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 109;
-    }
-
     /**
      * @return Retry topology version.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
index d66085774c6a1..319ed05935a7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
@@ -26,9 +26,6 @@
  * Query kill request.
  */
 public class GridQueryKillRequest implements Message {
-    /** */
-    public static final short TYPE_CODE = 172;
-
     /** Request id. */
     @Order(0)
     long reqId;
@@ -80,10 +77,6 @@ public boolean asyncResponse() {
         return asyncRes;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index f906e7e011916..87de208e55b74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -26,9 +26,6 @@
  * Query kill response.
  */
 public class GridQueryKillResponse implements Message {
-    /** */
-    public static final short TYPE_CODE = 173;
-
     /** Error text. */
     @Order(0)
     String errMsg;
@@ -67,10 +64,6 @@ public String error() {
         return errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java
index 38a12f2dc5825..90caf76263ec5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java
@@ -75,8 +75,4 @@ public boolean nop() {
         return S.toString(SchemaFinishDiscoveryMessage.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 505;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
index 7758f1b686cc4..6830b93baf09a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
@@ -110,10 +110,6 @@ public boolean nop() {
         return nop;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -53;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaProposeDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaProposeDiscoveryMessage.java
index 1cf398d2fd97b..2283fe614b73e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaProposeDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaProposeDiscoveryMessage.java
@@ -110,8 +110,4 @@ public String schemaName() {
         return S.toString(SchemaProposeDiscoveryMessage.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 504;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAddQueryEntityOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAddQueryEntityOperation.java
index 0e5610d8e32cf..3066afad53449 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAddQueryEntityOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAddQueryEntityOperation.java
@@ -109,8 +109,4 @@ public boolean isSqlEscape() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -111;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableAddColumnOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableAddColumnOperation.java
index 819d8c7a628b1..11d77d31c5b1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableAddColumnOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableAddColumnOperation.java
@@ -102,8 +102,4 @@ public String tableName() {
         return S.toString(SchemaAlterTableAddColumnOperation.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -115;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableDropColumnOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableDropColumnOperation.java
index 83da2b300f04c..cf48709e921ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableDropColumnOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAlterTableDropColumnOperation.java
@@ -101,8 +101,4 @@ public String tableName() {
         return S.toString(SchemaAlterTableDropColumnOperation.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -112;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexCreateOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexCreateOperation.java
index 5f97647050b22..3982e05ff34ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexCreateOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexCreateOperation.java
@@ -134,8 +134,4 @@ public int parallel() {
         return S.toString(SchemaIndexCreateOperation.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -114;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexDropOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexDropOperation.java
index 09e396efdedb4..6962fbb0ee5b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexDropOperation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaIndexDropOperation.java
@@ -72,8 +72,4 @@ public boolean ifExists() {
         return S.toString(SchemaIndexDropOperation.class, this, "parent", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -113;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
index 5ef7339a70872..e48fcd9bfb08b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
@@ -28,9 +28,6 @@ public class StatisticsColumnData implements Message, Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** */
-    public static final short TYPE_CODE = 186;
-
     /** Min value in column. */
     @Order(0)
     StatisticsDecimalMessage min;
@@ -172,9 +169,4 @@ public long createdAt() {
         return createdAt;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
index 3ed48fc1d194d..34b3c082e18fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
@@ -31,9 +31,6 @@ public class StatisticsDecimalMessage implements Message, Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** */
-    public static final short TYPE_CODE = 184;
-
     /** */
     @Order(0)
     int scale;
@@ -73,10 +70,6 @@ public BigDecimal value() {
         return new BigDecimal(new BigInteger(b), scale);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
index 17e5eb44ad3fa..f50a38f477b97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
@@ -31,9 +31,6 @@ public class StatisticsKeyMessage implements Message, Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** */
-    public static final short TYPE_CODE = 183;
-
     /** Object schema. */
     @Order(0)
     String schema;
@@ -87,10 +84,6 @@ public List<String> colNames() {
         return colNames;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
index f7118b53cab29..6d01021b1defe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
@@ -30,9 +30,6 @@ public class StatisticsObjectData implements Message, Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** */
-    public static final short TYPE_CODE = 185;
-
     /** Statistics key. */
     @Order(0)
     StatisticsKeyMessage key;
@@ -132,9 +129,4 @@ public StatisticsObjectData() {
         // No-op.
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
index 68be1c1ee216a..375d0b495c354 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
@@ -29,9 +29,6 @@
  * Request for statistics.
  */
 public class StatisticsRequest implements Message {
-    /** */
-    public static final short TYPE_CODE = 187;
-
     /** Gathering id. */
     @Order(0)
     UUID reqId;
@@ -119,9 +116,4 @@ public Map<String, Long> versions() {
         return S.toString(StatisticsRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
index da2bb20d6ed31..5f18521518287 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
@@ -26,9 +26,6 @@
  * Response for statistics request.
  */
 public class StatisticsResponse implements Message {
-    /** */
-    public static final short TYPE_CODE = 188;
-
     /** Request id. */
     @Order(0)
     UUID reqId;
@@ -76,9 +73,4 @@ public StatisticsObjectData data() {
         return S.toString(StatisticsResponse.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
index 08026e764d572..101ce54d43b95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
@@ -63,8 +63,4 @@ public long topicId() {
         return topicId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 76;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
index 0bf6808364083..c7f64ae508ed0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
@@ -96,11 +96,6 @@ public void error(String err) {
         this.err = err;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 77;
-    }
-
     /**
      * Marshals task result to byte array.
      *
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
index b70cb2a67f420..fe6b97ff2807e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
@@ -76,10 +76,6 @@ public ServiceDeploymentProcessId() {
         return reqId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 167;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
index f352c720a2aa9..819aec3639981 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
@@ -76,10 +76,6 @@ public void errors(Collection<byte[]> errors) {
         this.errors = errors;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 169;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
index 76f5c48d90110..f1c998a53c64e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
@@ -71,10 +71,6 @@ public ServiceDeploymentProcessId deploymentId() {
         return depId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 168;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
index f7f272c834816..f5d2ecf0183c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
@@ -244,10 +244,6 @@ public void readAll(InputStream in) throws IOException {
         in.readFully(data, 0, size);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 84;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
index 6db6f53ec6274..62b6ae1222f58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
@@ -37,9 +37,6 @@ public class GridPartitionStateMap extends AbstractMap<Integer, GridDhtPartition
     /** Empty map. */
     public static final GridPartitionStateMap EMPTY = new GridPartitionStateMap(0);
 
-    /** Type code. */
-    public static final short TYPE_CODE = 517;
-
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -251,8 +248,4 @@ public GridDhtPartitionState state(int part) {
         return 31 * states.hashCode() + size;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java
index e302435c9a968..9639f4c843ec9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java
@@ -119,10 +119,6 @@ public Map<UUID, Throwable> error() {
         return err == null ? null : F.viewReadOnly(err, e -> e.error());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 30;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java
index 8eec7bf33b866..cf9412cb587d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java
@@ -121,8 +121,4 @@ public boolean waitClientResults() {
         return S.toString(InitMessage.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 31;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
index 3457d980c47c7..08c06c08fe382 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
@@ -34,9 +34,6 @@
  * @see InitMessage
  */
 public class SingleNodeMessage<R extends Message> implements Message {
-    /** Initial channel message type (value is {@code 176}). */
-    public static final short TYPE_CODE = 176;
-
     /** Process id. */
     @Order(0)
     UUID processId;
@@ -73,11 +70,6 @@ public SingleNodeMessage(UUID processId, DistributedProcessType type, R resp, Th
             errMsg = new ErrorMessage(err);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE_CODE;
-    }
-
     /** @return Process id. */
     public UUID processId() {
         return processId;
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index 3f9bcdce402a9..21b08d4b43c44 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -18,13 +18,19 @@
 package org.apache.ignite.plugin.extensions.communication;
 
 import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.IgniteException;
 
 /**
  * Base class for all communication messages.
  */
 public interface Message {
     /** Direct type size in bytes. */
-    public int DIRECT_TYPE_SIZE = 2;
+    int DIRECT_TYPE_SIZE = 2;
+
+    /** Registry of message class to direct type mappings, populated during factory initialization. */
+    Map<Class<?>, Short> REGISTRATIONS = new ConcurrentHashMap<>();
 
     /**
      * Writes this message to provided byte buffer.
@@ -35,7 +41,7 @@ public interface Message {
      * @deprecated Use the code-generated {@code MessageSerializer} instead.
      */
     @Deprecated
-    public default boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+    default boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         throw new UnsupportedOperationException();
     }
 
@@ -48,7 +54,7 @@ public default boolean writeTo(ByteBuffer buf, MessageWriter writer) {
      * @deprecated Use the code-generated {@code MessageSerializer} instead.
      */
     @Deprecated
-    public default boolean readFrom(ByteBuffer buf, MessageReader reader) {
+    default boolean readFrom(ByteBuffer buf, MessageReader reader) {
         throw new UnsupportedOperationException();
     }
 
@@ -57,5 +63,43 @@ public default boolean readFrom(ByteBuffer buf, MessageReader reader) {
      *
      * @return Message type.
      */
-    public short directType();
+    /**
+     * Gets message type.
+     *
+     * @return Message type.
+     */
+    default short directType() {
+        var clazz = getClass();
+        Short type = REGISTRATIONS.get(clazz);
+
+        if (type == null) {
+            throw new IgniteException("No registration for class " + clazz.getSimpleName());
+        }
+
+        return type;
+    }
+
+    /**
+     * Registers the direct type for this message class. Called during message factory initialization
+     * to populate the {@link #REGISTRATIONS} map so that {@link #directType()} can resolve types
+     * without requiring each message class to override it.
+     *
+     * @param directType Direct type to register.
+     * @throws IgniteException If this message class is already registered with a different direct type.
+     */
+    default void registerAsDirectType(short directType) {
+        var clazz = getClass();
+
+        if (REGISTRATIONS.containsValue(directType)) {
+            throw new IgniteException(
+                clazz.getSimpleName() + " can't be registered because direct type " + directType + "already registered"
+            );
+        }
+
+        var type = REGISTRATIONS.putIfAbsent(clazz, directType);
+
+        if (type != null) {
+            throw new IgniteException(clazz.getSimpleName() + " is already registered for direct type " + type);
+        }
+    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index fb516b54db51d..4098504ee566b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -37,6 +37,21 @@ public interface MessageFactory {
      */
     public void register(short directType, Supplier<Message> supplier) throws IgniteException;
 
+    /**
+     * Register message factory with given direct type. All messages must be registered during construction
+     * of class which implements this interface. Any invocation of this method after initialization is done must
+     * throw {@link IllegalStateException} exception.
+     *
+     * @param directType Direct type.
+     * @param supplier Message factory.
+     * @throws IgniteException In case of attempt to register message with direct type which is already registered.
+     * @throws IllegalStateException On any invocation of this method when class which implements this interface
+     * is alredy constructed.
+     */
+    default void register(int directType, Supplier<Message> supplier) throws IgniteException {
+        register((short)directType, supplier);
+    }
+
     /**
      * Register message factory with given direct type. All messages must be registered during construction
      * of class which implements this interface. Any invocation of this method after initialization is done must
@@ -52,21 +67,23 @@ public interface MessageFactory {
     public void register(short directType, Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException;
 
     /**
-     * Register message factory using the direct type obtained from the message via {@link Message#directType()}.
-     * This is a convenience method equivalent to {@link #register(short, Supplier, MessageSerializer)} where the direct
-     * type is derived from the message instance itself.
+     * Register message factory with given direct type and serializer. The direct type is also registered
+     * on the message class via {@link Message#registerAsDirectType(short)} so that {@link Message#directType()}
+     * resolves automatically without requiring each message to override it.
      *
-     * <p>All messages must be registered during construction of class which implements this interface. Any invocation
-     * of this method after initialization is done must throw {@link IllegalStateException} exception.
+     * <p>This is the preferred registration method. All messages must be registered during construction
+     * of class which implements this interface. Any invocation of this method after initialization is done must
+     * throw {@link IllegalStateException} exception.
      *
+     * @param directType Direct type.
      * @param supplier Message factory.
      * @param serializer Message serializer.
      * @throws IgniteException In case of attempt to register message with direct type which is already registered.
      * @throws IllegalStateException On any invocation of this method when class which implements this interface
      * is already constructed.
      */
-    default void register(Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException {
-        register(supplier.get().directType(), supplier, serializer);
+    default void register(int directType, Supplier<Message> supplier, MessageSerializer serializer) throws IgniteException {
+        register((short)directType, supplier, serializer);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
index 73a4ac017e78e..73b789cb1c0a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
@@ -50,10 +50,6 @@ public int delta() {
         return delta;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 82;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java
index 187f867618e9b..efc79ce3abfd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java
@@ -88,10 +88,6 @@ public int connectionIndex() {
         return null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 23;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
index 8c570236edb4a..6b5e9579d9610 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
@@ -46,10 +46,6 @@ public TcpInverseConnectionResponseMessage(int connIdx) {
         return connIdx;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 177;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
index fd82f326fe0e6..12be0f1f5ea6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 
 /**
  * Handshake message.
@@ -107,10 +106,6 @@ public int getMessageSize() {
         return MESSAGE_FULL_SIZE;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TcpCommunicationSpi.HANDSHAKE_MSG_TYPE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
index b33c8625791a2..84cc53e433560 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
@@ -20,8 +20,6 @@
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
 
-import static org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE;
-
 /**
  * Message requesting to wait until node's SPI context initialize.
  */
@@ -29,11 +27,6 @@ public class HandshakeWaitMessage implements Message {
     /** Full message size (with message type) in bytes. */
     public static final int MESSAGE_FULL_SIZE = DIRECT_TYPE_SIZE;
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return HANDSHAKE_WAIT_MSG_TYPE;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(HandshakeWaitMessage.class, this);
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
index 224f8d5397416..9f59f0adf210b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 
 /**
  * Node ID message.
@@ -58,10 +57,6 @@ public UUID nodeId() {
         return nodeId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TcpCommunicationSpi.NODE_ID_MSG_TYPE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
index 05a13078110c9..354635bc4a2a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 
 /**
  * Recovery acknowledgment message.
@@ -74,10 +73,6 @@ public long received() {
         return rcvCnt;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
index b77770a2d1069..6467f1ffa09f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
@@ -474,8 +474,4 @@ public void clearUnmarshalledJoiningNodeData() {
         unmarshalledJoiningNodeData = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -106;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java
index 74981891c3803..f7472e1e17d91 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java
@@ -56,10 +56,6 @@ public InetAddress address() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -100;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
index 5026fa3f257b4..a24b50d8b7f56 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
@@ -52,10 +52,6 @@ public int port() {
         return port;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -101;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java
index e6bf73813f5b3..51a40c178683b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java
@@ -54,10 +54,6 @@ public Map<Integer, byte[]> nodeSpecificData() {
         return nodeSpecificData;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -107;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index 75b87dad1bb58..98d6378245f7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -68,10 +68,6 @@ public InetAddress creatorAddress() {
         return creatorAddrMsg.address();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 11;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCacheMetricsMessage.java
index 3fbfc2faa7164..9f5b20c35f6e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCacheMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCacheMetricsMessage.java
@@ -38,10 +38,6 @@ public TcpDiscoveryCacheMetricsMessage(CacheMetrics cacheMetricsMsg) {
         super(cacheMetricsMsg);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -103;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
index a149b9b49cf67..8ce5e0051aa08 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
@@ -56,10 +56,6 @@ public String error() {
         return err;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 0;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index e7e7aaa0df4af..1a5adee61de8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -71,8 +71,4 @@ public IgniteUuid messageId() {
         return S.toString(TcpDiscoveryClientAckResponse.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 15;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
index 40d22b4d05b25..0de0f136b8175 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
@@ -63,10 +63,6 @@ public TcpDiscoveryNodeMetricsMessage metricsMessage() {
         return metricsMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 13;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean traceLogLevel() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java
index f544151b73f14..78fc2cc26ae5c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java
@@ -45,10 +45,6 @@ public void nodesMetricsMessages(Map<UUID, TcpDiscoveryNodeMetricsMessage> nodes
         this.nodesMetricsMsgs = nodesMetricsMsgs;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -104;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
index dcaa01ddf2050..47260519b3bc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
@@ -61,8 +61,4 @@ public TcpDiscoveryClientPingRequest(UUID creatorNodeId, @Nullable UUID nodeToPi
         return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 3;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
index a0fb8de7f9c3b..1d22b4421b3d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
@@ -74,8 +74,4 @@ public boolean result() {
         return S.toString(TcpDiscoveryClientPingResponse.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 4;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
index e76c9ea182a61..dc1967fe98794 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
@@ -123,10 +123,6 @@ public boolean success() {
             Objects.equals(lastMsgId, other.lastMsgId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 28;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
index 7a01679666f9e..27c14b411bf84 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
@@ -131,10 +131,6 @@ public Collection<TcpDiscoveryAbstractMessage> messages() {
         return res;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -200;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
index 3cf1784da5600..4814c7ee4d5a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
@@ -52,10 +52,6 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 6;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 4f0088562fb33..381a80995c3ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -157,8 +157,4 @@ public DiscoverySpiCustomMessage message() {
         return S.toString(TcpDiscoveryCustomEventMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 21;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index b70be6e19b63a..12fc2af899659 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -81,8 +81,4 @@ public boolean customMessageDiscard() {
         return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 9;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
index 924d95f8bcc2b..1a7d82ce65268 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
@@ -65,8 +65,4 @@ public UUID nodeId() {
         return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 12;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
index f9c33466d832e..e2164d17a63be 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
@@ -83,10 +83,6 @@ public void dcId(String dcId) {
         this.dcId = dcId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 8;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
index aa6490660cda3..6332fd068062f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
@@ -108,10 +108,6 @@ public void redirectAddresses(@Nullable Collection<InetSocketAddress> sockAddrs)
             : F.viewReadOnly(sockAddrs, addr -> new InetSocketAddressMessage(addr.getAddress(), addr.getPort()));
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 10;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
index 1e39d5b29fe2d..2b6bffa4b4fbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
@@ -124,8 +124,4 @@ public void responded(boolean responded) {
         return S.toString(TcpDiscoveryJoinRequestMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 20;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
index f2936a45ad9c4..756912715152b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
@@ -78,8 +78,4 @@ public Collection<String> hostNames() {
         return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 5;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
index 767a03ccaa785..59e726dc897a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
@@ -213,10 +213,6 @@ public void addClientNodeId(UUID clientNodeId) {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 14;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
index c11bee62e8513..9c0f7a1704b7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
@@ -145,8 +145,4 @@ public void clientNodeAttributes(Map<String, Object> clientNodeAttrs) {
         return S.toString(TcpDiscoveryNodeAddFinishedMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 19;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index bdb75e1978301..ffe8a1bf412d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -275,10 +275,6 @@ public long gridStartTime() {
     }
 
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 29;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
index 7e08ac134def7..b07c2933c4f49 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
@@ -101,8 +101,4 @@ public long internalOrder() {
         return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 17;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFullMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFullMetricsMessage.java
index 7d121816da41d..be70dfb74bd07 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFullMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFullMetricsMessage.java
@@ -32,10 +32,6 @@ public TcpDiscoveryNodeFullMetricsMessage() {
         // No-op.
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -105;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
index c307c5c3cc5d2..d271909d55335 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
@@ -45,10 +45,6 @@ public TcpDiscoveryNodeLeftMessage(UUID creatorNodeId) {
         super(creatorNodeId);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 16;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeMetricsMessage.java
index f62b3df08728f..24c82452b6d19 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeMetricsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeMetricsMessage.java
@@ -38,10 +38,6 @@ public TcpDiscoveryNodeMetricsMessage(ClusterMetrics nodeMetrics) {
         super(nodeMetrics);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -102;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
index 90027782be0de..3c76aec6a4433 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
@@ -61,8 +61,4 @@ public TcpDiscoveryPingRequest(UUID creatorNodeId, @Nullable UUID clientNodeId)
         return S.toString(TcpDiscoveryPingRequest.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 1;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index 200ba86515fa8..2b1759d63af62 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -64,8 +64,4 @@ public boolean clientExists() {
         return S.toString(TcpDiscoveryPingResponse.class, this, "super", super.toString());
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 2;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
index dc56a76634b30..977275ffa9c1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
@@ -76,10 +76,6 @@ public boolean maxHopsReached() {
         return curHops == maxHops;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 7;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
index 2b37f0027ad39..2963a386c9a24 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
@@ -44,8 +44,4 @@ public TcpDiscoveryServerOnlyCustomEventMessage(UUID creatorNodeId, @NotNull Dis
         super(creatorNodeId, msg);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 22;
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
index becd8dab015ab..bdc69e356e9d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -125,10 +125,6 @@ public void status(int status) {
         this.status = status;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 18;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object obj) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/direct/TestNestedContainersMessage.java b/modules/core/src/test/java/org/apache/ignite/internal/direct/TestNestedContainersMessage.java
index eecdadd5cd6de..436408639ce94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/direct/TestNestedContainersMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/direct/TestNestedContainersMessage.java
@@ -45,8 +45,4 @@ public TestNestedContainersMessage() {
         // No-op.
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return TYPE;
-    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
index f8d6913a944b8..7e5b53492dc4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java
@@ -34,8 +34,8 @@
 public class MessagesPluginProvider extends AbstractTestPluginProvider {
     /** */
     private static final MessageFactoryProvider FACTORY_PROVIDER = f -> {
-        f.register(TestIntegerMessage::new, new TestIntegerMessageSerializer());
-        f.register(TestUuidMessage::new, new TestUuidMessageSerializer());
+        f.register(10_000, TestIntegerMessage::new, new TestIntegerMessageSerializer());
+        f.register(10_001, TestUuidMessage::new, new TestUuidMessageSerializer());
     };
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestIntegerMessage.java b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestIntegerMessage.java
index 84ff66e8a8e41..6f148b3c98ff0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestIntegerMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestIntegerMessage.java
@@ -42,8 +42,4 @@ public int value() {
         return val;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 10_000;
-    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestUuidMessage.java b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestUuidMessage.java
index 0cf954b1a9e1f..f23b35beae407 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestUuidMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/distributed/TestUuidMessage.java
@@ -43,8 +43,4 @@ public UUID value() {
         return val;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 10_001;
-    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index 335f36922cf7d..f624b9c0862b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -114,8 +114,4 @@ public void bytes(byte[] bytes) {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 0;
-    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
index 2e096ae06c68b..5d85f5267f8f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
@@ -161,10 +161,6 @@ public void payload(byte[] payload) {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return DIRECT_TYPE;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
index 16aa598c22248..2164198cc4d88 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
@@ -127,9 +127,4 @@ public byte[] payload() {
 
         return true;
     }
-
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return DIRECT_TYPE;
-    }
 }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
index 10b87a8f34905..76e16fee3e011 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
@@ -66,10 +66,6 @@ public String table() {
         return tbl;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -54;
-    }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
index d875f7171785e..18f5e6f947772 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
@@ -64,10 +64,6 @@ public GridH2Array(Value val) throws IgniteCheckedException {
         return ValueArray.get(fillArray(x.iterator(), new Value[x.size()], ctx));
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -18;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
index 4df68797dc29e..eeb3670fa072e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
@@ -51,10 +51,6 @@ public GridH2Boolean(Value val) {
         return ValueBoolean.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -5;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
index e62a1aa11e3b3..81d69fb903751 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
@@ -51,10 +51,6 @@ public GridH2Byte(Value val) {
         return ValueByte.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -6;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
index 3c16e32b587b6..7012fd75ffc1a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
@@ -53,10 +53,6 @@ public GridH2Bytes(Value val) {
         return ValueBytes.getNoCopy(b);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -16;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
index cb7265f379e13..559f96bccad5c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
@@ -59,10 +59,6 @@ public GridH2CacheObject(GridH2ValueCacheObject v) throws IgniteCheckedException
         return new GridH2ValueCacheObject(obj, valCtx);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -22;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
index 5e3acc78fa28b..1b22138ff71c6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
@@ -53,10 +53,6 @@ public GridH2Date(Value val) {
         return ValueDate.fromDateValue(date);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -14;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
index b2a87edcf8573..22cb49cdc2829 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
@@ -62,10 +62,6 @@ public GridH2Decimal(Value val) {
         return ValueDecimal.get(new BigDecimal(new BigInteger(b), scale));
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -10;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
index b2fce2fa2ad64..56bd37e7a5486 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
@@ -338,10 +338,6 @@ public GridH2DmlRequest explicitTimeout(boolean explicitTimeout) {
         params = BinaryUtils.rawArrayFromBinary(ctx.marshaller().binaryMarshaller().unmarshal(paramsBytes, ldr));
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -55;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
index 3b605861cbb73..128ba7cfe4d8c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
@@ -136,10 +136,5 @@ public String error() {
         return S.toString(GridH2DmlResponse.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -56;
-    }
-
 }
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
index 711d1dc360ebf..1235acbc3f7a1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
@@ -51,10 +51,6 @@ public GridH2Double(Value val) {
         return ValueDouble.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -11;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
index ef0f06bf0b860..eaf42dc42c18a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
@@ -51,10 +51,6 @@ public GridH2Float(Value val) {
         return ValueFloat.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -12;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
index a229eaa724324..966c526a81521 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
@@ -74,10 +74,6 @@ public GridH2Geometry(Value val) {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -21;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index c3dd299b0eda6..76d30ff717095 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -135,10 +135,6 @@ public int batchLookupId() {
         return batchLookupId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -30;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index e24566f635a24..d91e97e14cd50 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -180,10 +180,6 @@ public int batchLookupId() {
         return batchLookupId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -31;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
index d5791aae5dcb4..8826a1a724677 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
@@ -51,10 +51,6 @@ public GridH2Integer(Value val) {
         return ValueInt.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -8;
-    }
 
     /** {@inheritDoc} */
     @Override public boolean equals(Object obj) {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
index 422e545d35115..6aba81df069e9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
@@ -53,10 +53,6 @@ public GridH2JavaObject(Value val) {
         return ValueJavaObject.getNoCopy(null, b, null);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -19;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
index c341037a81280..a5acce48002bb 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
@@ -51,10 +51,6 @@ public GridH2Long(Value val) {
         return ValueLong.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -9;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
index 28dbf6eb7f517..90b6bbde5abce 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
@@ -45,10 +45,6 @@ private GridH2Null() {
         return ValueNull.INSTANCE;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -4;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index bf435f3440a21..3c97585f609d1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -549,10 +549,6 @@ public static Boolean isDataPageScanEnabled(int flags) {
         params = BinaryUtils.rawArrayFromBinary(ctx.marshaller().binaryMarshaller().unmarshal(paramsBytes, ldr));
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -33;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
index b87d8f42bd7e9..6c0389aa52cf0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
@@ -46,10 +46,6 @@ public void values(List<GridH2ValueMessage> vals) {
         this.vals = vals;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -32;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
index 469dc0b37a615..474cfef3bca58 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
@@ -85,11 +85,6 @@ public boolean isPartial() {
         return (flags & FLAG_PARTIAL) == FLAG_PARTIAL;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -34;
-    }
-
     /**
      * @return Number of rows.
      */
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
index 980de604d927e..b91ab34ca85ba 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
@@ -95,10 +95,6 @@ public GridH2RowMessage last() {
         return last;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -35;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
index e3f1fd0ecdfbd..b59b1adedcad1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
@@ -51,10 +51,6 @@ public GridH2Short(Value val) {
         return ValueShort.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -7;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
index bf51be0cb0fb4..e909677f5cf6e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
@@ -53,10 +53,6 @@ public GridH2String(Value val) {
         return ValueString.get(x);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -17;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
index 2311b223c44d4..b27ae4f33b2fa 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
@@ -54,10 +54,6 @@ public GridH2Time(Value val) {
         return ValueTime.fromNanos(nanos);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -13;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
index fbe95c79f9c83..a19757d5fae0f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
@@ -58,10 +58,6 @@ public GridH2Timestamp(Value val) {
         return ValueTimestamp.fromDateValueAndNanos(date, nanos);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -15;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
index 9c0ba8f593452..681363f831a2c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
@@ -58,10 +58,6 @@ public GridH2Uuid(Value val) {
         return ValueUuid.get(high, low);
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return -20;
-    }
 
     /** {@inheritDoc} */
     @Override public String toString() {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
index d9d14853751ed..b26089afd70fe 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
@@ -37,34 +37,34 @@
 public class GridH2ValueMessageFactory implements MessageFactoryProvider {
     /** {@inheritDoc} */
     @Override public void registerAll(MessageFactory factory) {
-        factory.register(() -> GridH2Null.INSTANCE, new GridH2NullSerializer());
-        factory.register(GridH2Boolean::new, new GridH2BooleanSerializer());
-        factory.register(GridH2Byte::new, new GridH2ByteSerializer());
-        factory.register(GridH2Short::new, new GridH2ShortSerializer());
-        factory.register(GridH2Integer::new, new GridH2IntegerSerializer());
-        factory.register(GridH2Long::new, new GridH2LongSerializer());
-        factory.register(GridH2Decimal::new, new GridH2DecimalSerializer());
-        factory.register(GridH2Double::new, new GridH2DoubleSerializer());
-        factory.register(GridH2Float::new, new GridH2FloatSerializer());
-        factory.register(GridH2Time::new, new GridH2TimeSerializer());
-        factory.register(GridH2Date::new, new GridH2DateSerializer());
-        factory.register(GridH2Timestamp::new, new GridH2TimestampSerializer());
-        factory.register(GridH2Bytes::new, new GridH2BytesSerializer());
-        factory.register(GridH2String::new, new GridH2StringSerializer());
-        factory.register(GridH2Array::new, new GridH2ArraySerializer());
-        factory.register(GridH2JavaObject::new, new GridH2JavaObjectSerializer());
-        factory.register(GridH2Uuid::new, new GridH2UuidSerializer());
-        factory.register(GridH2Geometry::new, new GridH2GeometrySerializer());
-        factory.register(GridH2CacheObject::new, new GridH2CacheObjectSerializer());
-        factory.register(GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer());
-        factory.register(GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer());
-        factory.register(GridH2RowMessage::new, new GridH2RowMessageSerializer());
-        factory.register(GridH2QueryRequest::new, new GridH2QueryRequestSerializer());
-        factory.register(GridH2RowRange::new, new GridH2RowRangeSerializer());
-        factory.register(GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer());
-        factory.register(QueryTable::new, new QueryTableSerializer());
-        factory.register(GridH2DmlRequest::new, new GridH2DmlRequestSerializer());
-        factory.register(GridH2DmlResponse::new, new GridH2DmlResponseSerializer());
+        factory.register(-4, () -> GridH2Null.INSTANCE, new GridH2NullSerializer());
+        factory.register(-5, GridH2Boolean::new, new GridH2BooleanSerializer());
+        factory.register(-6, GridH2Byte::new, new GridH2ByteSerializer());
+        factory.register(-7, GridH2Short::new, new GridH2ShortSerializer());
+        factory.register(-8, GridH2Integer::new, new GridH2IntegerSerializer());
+        factory.register(-9, GridH2Long::new, new GridH2LongSerializer());
+        factory.register(-10, GridH2Decimal::new, new GridH2DecimalSerializer());
+        factory.register(-11, GridH2Double::new, new GridH2DoubleSerializer());
+        factory.register(-12, GridH2Float::new, new GridH2FloatSerializer());
+        factory.register(-13, GridH2Time::new, new GridH2TimeSerializer());
+        factory.register(-14, GridH2Date::new, new GridH2DateSerializer());
+        factory.register(-15, GridH2Timestamp::new, new GridH2TimestampSerializer());
+        factory.register(-16, GridH2Bytes::new, new GridH2BytesSerializer());
+        factory.register(-17, GridH2String::new, new GridH2StringSerializer());
+        factory.register(-18, GridH2Array::new, new GridH2ArraySerializer());
+        factory.register(-19, GridH2JavaObject::new, new GridH2JavaObjectSerializer());
+        factory.register(-20, GridH2Uuid::new, new GridH2UuidSerializer());
+        factory.register(-21, GridH2Geometry::new, new GridH2GeometrySerializer());
+        factory.register(-22, GridH2CacheObject::new, new GridH2CacheObjectSerializer());
+        factory.register(-30, GridH2IndexRangeRequest::new, new GridH2IndexRangeRequestSerializer());
+        factory.register(-31, GridH2IndexRangeResponse::new, new GridH2IndexRangeResponseSerializer());
+        factory.register(-32, GridH2RowMessage::new, new GridH2RowMessageSerializer());
+        factory.register(-33, GridH2QueryRequest::new, new GridH2QueryRequestSerializer());
+        factory.register(-34, GridH2RowRange::new, new GridH2RowRangeSerializer());
+        factory.register(-35, GridH2RowRangeBounds::new, new GridH2RowRangeBoundsSerializer());
+        factory.register(-54, QueryTable::new, new QueryTableSerializer());
+        factory.register(-55, GridH2DmlRequest::new, new GridH2DmlRequestSerializer());
+        factory.register(-56, GridH2DmlResponse::new, new GridH2DmlResponseSerializer());
     }
 
     /**

From 55c1e700a6199986421b2bc91ed32d7e4a16b699 Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Fri, 27 Mar 2026 19:26:19 +0300
Subject: [PATCH 7/8] Fix conflics

---
 .../processors/query/calcite/message/CalciteMessage.java | 5 -----
 .../managers/communication/GridIoMessageFactory.java     | 1 -
 .../managers/communication/IgniteMessageFactoryImpl.java | 1 -
 .../distributed/GridDistributedTxPrepareResponse.java    | 5 -----
 .../cache/distributed/near/GridNearTxFinishResponse.java | 5 -----
 .../ignite/plugin/extensions/communication/Message.java  | 9 +--------
 .../apache/ignite/spi/communication/TestMessage1.java    | 3 ---
 7 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
index 14ff074724271..d23affbb5c302 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
@@ -27,9 +27,4 @@ public interface CalciteMessage extends Message {
      * @return Message type.
      */
     MessageType type();
-
-    /** {@inheritDoc} */
-    @Override default short directType() {
-        return type().directType();
-    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 184daff811cc0..b691d1a8c1eb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -394,7 +394,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register((short)-43, IgniteIoTestMessage::new);
         factory.register(-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
         factory.register(-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
-        factory.register(-26, TxLockList::new, new TxLockListSerializer());
         factory.register(-25, TxLock::new, new TxLockSerializer());
         factory.register(-24, TxLocksRequest::new, new TxLocksRequestSerializer());
         factory.register(-23, TxLocksResponse::new, new TxLocksResponseSerializer());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index eca772bfb392d..1c26369b54141 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -63,7 +63,6 @@ public class IgniteMessageFactoryImpl implements MessageFactory {
 
             return msg.readFrom(buf, reader);
         }
-
     };
 
     /** Message suppliers. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 94aecce2bf7c6..95a8e651c32ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -110,11 +110,6 @@ public void error(@Nullable Throwable err) {
         return ctx.txPrepareMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 26;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return GridToStringBuilder.toString(GridDistributedTxPrepareResponse.class, this, "err",
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 718c5171eee0f..1f9e6d56cf493 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -82,11 +82,6 @@ public int miniId() {
         return miniId;
     }
 
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 54;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridNearTxFinishResponse.class, this, "super", super.toString());
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index 21b08d4b43c44..614418b2e369f 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -89,16 +89,9 @@ default short directType() {
      */
     default void registerAsDirectType(short directType) {
         var clazz = getClass();
-
-        if (REGISTRATIONS.containsValue(directType)) {
-            throw new IgniteException(
-                clazz.getSimpleName() + " can't be registered because direct type " + directType + "already registered"
-            );
-        }
-
         var type = REGISTRATIONS.putIfAbsent(clazz, directType);
 
-        if (type != null) {
+        if ((type != null) && (type != directType)) {
             throw new IgniteException(clazz.getSimpleName() + " is already registered for direct type " + type);
         }
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestMessage1.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestMessage1.java
index 7abb74f50348d..ea36359b45fe3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestMessage1.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestMessage1.java
@@ -61,10 +61,7 @@ public Message message() {
     }
 
     /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(TxLockList.class, this);
     @Override public short directType() {
         return DIRECT_TYPE;
     }
-
 }

From afecc1dcef1860740de5d06a001b153bec429012 Mon Sep 17 00:00:00 2001
From: Alex Abashev <alexey@abashev.ru>
Date: Sat, 28 Mar 2026 13:21:35 +0300
Subject: [PATCH 8/8] Fix type conflict

---
 .../managers/communication/GridIoMessageFactory.java |  2 +-
 .../communication/IgniteMessageFactoryImpl.java      |  8 +++++++-
 .../GridManagerLocalMessageListenerSelfTest.java     | 12 +-----------
 .../util/nio/IgniteExceptionInNioWorkerSelfTest.java |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index b691d1a8c1eb9..0460477cf1284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -378,7 +378,7 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
     @Override public void registerAll(MessageFactory factory) {
         // -54 is reserved for SQL.
         // We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
-        factory.register(-101, CompressedMessage::new);
+        factory.register(-67, CompressedMessage::new);
         factory.register(-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
         factory.register(-65, TxInfo::new, new TxInfoSerializer());
         factory.register(-64, TxEntriesInfo::new, new TxEntriesInfoSerializer());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
index 1c26369b54141..e56365af4b4d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java
@@ -105,7 +105,13 @@ public IgniteMessageFactoryImpl(MessageFactoryProvider[] factories) {
                     "Registration of new message types is forbidden.");
         }
 
-        supplier.get().registerAsDirectType(directType);
+        try {
+            supplier.get().registerAsDirectType(directType);
+        }
+        catch (NoClassDefFoundError | ExceptionInInitializerError e) {
+            // Optional dependency not available (e.g. JTS for GridH2Geometry).
+            // Registration will succeed when used in an environment with the dependency.
+        }
 
         int idx = directTypeToIndex(directType);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
index 4ce9935b10431..5661f942637d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
@@ -22,13 +22,10 @@
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.managers.communication.GridIoUserMessage;
 import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.plugin.AbstractTestPluginProvider;
 import org.apache.ignite.plugin.ExtensionRegistry;
 import org.apache.ignite.plugin.PluginContext;
-import org.apache.ignite.plugin.extensions.communication.MessageFactory;
-import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 import org.apache.ignite.spi.IgniteSpi;
 import org.apache.ignite.spi.IgniteSpiAdapter;
 import org.apache.ignite.spi.IgniteSpiContext;
@@ -46,9 +43,6 @@
  * Test Managers to add and remove local message listener.
  */
 public class GridManagerLocalMessageListenerSelfTest extends GridCommonAbstractTest {
-    /** */
-    private static final short DIRECT_TYPE = 210;
-
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
@@ -219,11 +213,7 @@ public static class TestPluginProvider extends AbstractTestPluginProvider {
 
         /** {@inheritDoc} */
         @Override public void initExtensions(PluginContext ctx, ExtensionRegistry registry) {
-            registry.registerExtension(MessageFactoryProvider.class, new MessageFactoryProvider() {
-                @Override public void registerAll(MessageFactory factory) {
-                    factory.register(DIRECT_TYPE, GridIoUserMessage::new);
-                }
-            });
+            // No-op.
         }
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
index 9c5a6ec432059..bea6d2fcacc3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
@@ -84,7 +84,7 @@ private static class BrokenMessage extends IgniteDiagnosticRequest {
                 return (byte)242;
             }
 
-            return super.directType();
+            return -61;
         }
     }
 }