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

namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new c1ec826550f IGNITE-28308 Remove Serializable from discovery custom 
messages (#13001)
c1ec826550f is described below

commit c1ec826550feae400c4e20c70c685c26b17e17a9
Author: Nikita Amelchev <[email protected]>
AuthorDate: Thu Apr 16 15:44:46 2026 +0300

    IGNITE-28308 Remove Serializable from discovery custom messages (#13001)
---
 .../SecurityAwareCustomMessageWrapper.java         |  4 --
 .../authentication/UserAcceptedMessage.java        |  7 +--
 .../authentication/UserProposedMessage.java        |  7 +--
 .../cache/CacheAffinityChangeMessage.java          |  6 +--
 .../cache/CacheStatisticsClearMessage.java         |  6 +--
 .../cache/CacheStatisticsModeChangeMessage.java    |  7 +--
 .../cache/ClientCacheChangeDiscoveryMessage.java   |  7 +--
 .../ClientCacheChangeDummyDiscoveryMessage.java    |  4 --
 .../processors/cache/DynamicCacheChangeBatch.java  |  4 --
 .../processors/cache/ExchangeFailureMessage.java   |  8 +---
 ...TimeoutOnPartitionMapExchangeChangeMessage.java |  7 +--
 .../processors/cache/WalStateAbstractMessage.java  |  7 ++-
 .../processors/cache/WalStateFinishMessage.java    |  1 -
 .../processors/cache/WalStateProposeMessage.java   |  1 -
 .../binary/MetadataRemoveAcceptedMessage.java      |  7 +--
 .../binary/MetadataRemoveProposedMessage.java      |  6 +--
 .../binary/MetadataUpdateAcceptedMessage.java      |  7 +--
 .../binary/MetadataUpdateProposedMessage.java      | 51 +++++-----------------
 .../snapshot/SnapshotStartDiscoveryMessage.java    |  4 --
 .../cluster/ChangeGlobalStateFinishMessage.java    |  6 +--
 .../cluster/ChangeGlobalStateMessage.java          |  4 --
 .../continuous/AbstractContinuousMessage.java      |  6 +--
 .../StartRoutineAckDiscoveryMessage.java           |  3 --
 .../continuous/StartRoutineDiscoveryMessage.java   |  3 --
 .../continuous/StartRoutineDiscoveryMessageV2.java |  4 --
 .../continuous/StopRoutineAckDiscoveryMessage.java |  3 --
 .../continuous/StopRoutineDiscoveryMessage.java    |  3 --
 .../marshaller/MappingAcceptedMessage.java         |  7 +--
 .../marshaller/MappingProposedMessage.java         |  7 +--
 .../DistributedMetaStorageCasAckMessage.java       |  4 --
 .../DistributedMetaStorageCasMessage.java          |  4 --
 .../DistributedMetaStorageUpdateAckMessage.java    |  7 +--
 .../DistributedMetaStorageUpdateMessage.java       |  7 +--
 .../message/SchemaAbstractDiscoveryMessage.java    |  4 +-
 .../message/SchemaFinishDiscoveryMessage.java      |  1 -
 .../message/SchemaProposeDiscoveryMessage.java     |  6 +--
 .../service/ServiceChangeBatchRequest.java         |  6 +--
 .../ServiceClusterDeploymentResultBatch.java       |  6 +--
 .../internal/util/distributed/FullMessage.java     |  6 +--
 .../internal/util/distributed/InitMessage.java     |  6 +--
 .../TcpConnectionRequestDiscoveryMessage.java      |  7 +--
 .../apache/ignite/spi/discovery/DiscoverySpi.java  |  2 +-
 .../spi/discovery/DiscoverySpiCustomMessage.java   |  4 +-
 .../security/TestDiscoveryAcknowledgeMessage.java  |  3 +-
 .../processors/security/TestDiscoveryMessage.java  |  3 +-
 .../ignite/spi/discovery/MessageForServer.java     |  3 +-
 .../discovery/tcp/DummyCustomDiscoveryMessage.java |  3 +-
 .../ZkCommunicationErrorResolveFinishMessage.java  |  6 +--
 .../ZkCommunicationErrorResolveStartMessage.java   |  6 +--
 .../zk/internal/ZkForceNodeFailMessage.java        |  6 +--
 .../discovery/zk/internal/ZkNoServersMessage.java  |  6 +--
 51 files changed, 54 insertions(+), 249 deletions(-)

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 345bd3d3408..7c8269bd14d 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
@@ -30,9 +30,6 @@ import org.jetbrains.annotations.Nullable;
 
 /** Custom message wrapper with ID of security subject that initiated the 
current message. */
 public class SecurityAwareCustomMessageWrapper implements 
DiscoverySpiCustomMessage, MarshallableMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Security subject ID. */
     @Order(0)
     UUID secSubjId;
@@ -93,7 +90,6 @@ public class SecurityAwareCustomMessageWrapper implements 
DiscoverySpiCustomMess
         return ack == null ? null : new SecurityAwareCustomMessageWrapper(ack, 
secSubjId);
     }
 
-
     /** {@inheritDoc} */
     @Override public void prepareMarshal(Marshaller marsh) throws 
IgniteCheckedException {
         if (!(delegate instanceof Message))
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 2e29cd0b647..141928b0571 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
@@ -23,17 +23,13 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Is sent as an acknowledgement for end (with success or error) of user 
management operation on the cluster
  * (see {@link UserProposedMessage} and {@link UserManagementOperation}).
  */
-public class UserAcceptedMessage implements DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class UserAcceptedMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -95,5 +91,4 @@ public class UserAcceptedMessage implements 
DiscoveryCustomMessage, Message {
     @Override public String toString() {
         return S.toString(UserAcceptedMessage.class, this);
     }
-
 }
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 b74bd11b184..201ced99a1c 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
@@ -23,7 +23,6 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMe
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -33,10 +32,7 @@ import org.jetbrains.annotations.Nullable;
  * <p>
  * {@link UserAcceptedMessage} is sent as an acknowledgement that operation is 
finished on the all nodes of the cluster.
  */
-public class UserProposedMessage implements DiscoveryServerOnlyCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class UserProposedMessage implements DiscoveryServerOnlyCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -84,5 +80,4 @@ public class UserProposedMessage implements 
DiscoveryServerOnlyCustomMessage, Me
     @Override public String toString() {
         return S.toString(UserProposedMessage.class, this);
     }
-
 }
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 8d2647e9666..f4be696ae3c 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
@@ -29,7 +29,6 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Gri
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.DiscoverySpiMutableCustomMessageSupport;
 import org.jetbrains.annotations.Nullable;
 
@@ -37,10 +36,7 @@ import org.jetbrains.annotations.Nullable;
  * CacheAffinityChangeMessage represent a message that switches to a new 
affinity assignmentafter rebalance is finished.
  * This message should not be mutated  in any way outside the 
"disco-notifier-worker" thread.
  */
-public class CacheAffinityChangeMessage implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class CacheAffinityChangeMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
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 527d8147e6d..bd4601648e6 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
@@ -23,16 +23,12 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache statistics clear discovery message.
  */
-public class CacheStatisticsClearMessage implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class CacheStatisticsClearMessage implements DiscoveryCustomMessage {
     /** Initial message flag mask. */
     private static final byte INITIAL_MSG_MASK = 0x01;
 
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 02edc0d90aa..b660f2048cc 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
@@ -24,17 +24,13 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Cache statistics mode change discovery message.
  */
-public class CacheStatisticsModeChangeMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class CacheStatisticsModeChangeMessage implements 
DiscoveryCustomMessage {
     /** Initial message flag mask. */
     private static final byte INITIAL_MSG_MASK = 0x01;
 
@@ -140,5 +136,4 @@ public class CacheStatisticsModeChangeMessage implements 
DiscoveryCustomMessage,
     @Override public String toString() {
         return S.toString(CacheStatisticsModeChangeMessage.class, this);
     }
-
 }
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 f4f565fcb51..165807bc85f 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
@@ -28,16 +28,12 @@ import 
org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Sent from cache client node to asynchronously notify about started.closed 
client caches.
  */
-public class ClientCacheChangeDiscoveryMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ClientCacheChangeDiscoveryMessage implements 
DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -173,7 +169,6 @@ public class ClientCacheChangeDiscoveryMessage implements 
DiscoveryCustomMessage
         return null;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ClientCacheChangeDiscoveryMessage.class, this);
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 85f6e91aeb6..824cb7822ff 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
@@ -37,9 +37,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public class ClientCacheChangeDummyDiscoveryMessage extends 
AbstractCachePartitionExchangeWorkerTask
     implements DiscoveryCustomMessage, MarshallableMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     UUID reqId;
@@ -131,7 +128,6 @@ public class ClientCacheChangeDummyDiscoveryMessage extends 
AbstractCachePartiti
             startReqs = U.unmarshal(marsh, startRequestsBytes, clsLdr);
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ClientCacheChangeDummyDiscoveryMessage.class, this,
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 85760de87e9..0fc8cc5d9dd 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
@@ -40,9 +40,6 @@ import org.jetbrains.annotations.Nullable;
  * Cache change batch.
  */
 public class DynamicCacheChangeBatch implements DiscoveryCustomMessage, 
MarshallableMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Discovery custom message ID. */
     @Order(0)
     IgniteUuid id;
@@ -187,7 +184,6 @@ public class DynamicCacheChangeBatch implements 
DiscoveryCustomMessage, Marshall
             reqs = U.unmarshal(marsh, requestsBytes, clsLdr);
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DynamicCacheChangeBatch.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java
index e46e0cf6dcf..9393474d938 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java
@@ -36,17 +36,13 @@ import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * This class represents discovery message that is used to provide information 
about dynamic cache start failure.
  */
-public class ExchangeFailureMessage implements DiscoveryCustomMessage, Message 
{
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ExchangeFailureMessage implements DiscoveryCustomMessage {
     /** Cache names. */
     @GridToStringInclude
     @Order(0)
@@ -66,7 +62,7 @@ public class ExchangeFailureMessage implements 
DiscoveryCustomMessage, Message {
     Map<UUID, ErrorMessage> exchangeErrors;
 
     /** Actions to be done to rollback changes done before the exchange 
failure. */
-    private transient ExchangeActions exchangeRollbackActions;
+    private ExchangeActions exchangeRollbackActions;
 
     /** Default constructor for {@link MessageFactory}. */
     public ExchangeFailureMessage() {
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 f2182833f07..224762cceca 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
@@ -22,16 +22,12 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Discovery message for changing transaction timeout on partition map 
exchange.
  */
-public class TxTimeoutOnPartitionMapExchangeChangeMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TxTimeoutOnPartitionMapExchangeChangeMessage implements 
DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -119,5 +115,4 @@ public class TxTimeoutOnPartitionMapExchangeChangeMessage 
implements DiscoveryCu
     @Override public String toString() {
         return S.toString(TxTimeoutOnPartitionMapExchangeChangeMessage.class, 
this);
     }
-
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
index d6451a2b349..e2d4b786d42 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache;
 
+import java.io.Serializable;
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoCache;
@@ -26,13 +27,15 @@ import 
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * WAL state change abstract message.
  */
-public abstract class WalStateAbstractMessage implements 
DiscoveryCustomMessage, Message {
+public abstract class WalStateAbstractMessage implements 
DiscoveryCustomMessage, Serializable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
     /** Message ID */
     @Order(0)
     IgniteUuid id;
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 36d3874ea7f..98584b983c5 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
@@ -77,5 +77,4 @@ public class WalStateFinishMessage extends 
WalStateAbstractMessage {
     @Override public String toString() {
         return S.toString(WalStateFinishMessage.class, this, "super", 
super.toString());
     }
-
 }
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 7bdeb150604..ac64520856f 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
@@ -96,5 +96,4 @@ public class WalStateProposeMessage extends 
WalStateAbstractMessage {
     @Override public String toString() {
         return S.toString(WalStateProposeMessage.class, this, "super", 
super.toString());
     }
-
 }
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 ae547829a91..3ff707ee477 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
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -30,10 +29,7 @@ import org.jetbrains.annotations.Nullable;
  * As discovery messaging doesn't guarantee that message makes only one pass 
across the cluster
  * <b>MetadataRemoveAcceptedMessage</b> enables to mark it as duplicated so 
other nodes won't process it but skip.
  */
-public class MetadataRemoveAcceptedMessage implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class MetadataRemoveAcceptedMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -95,5 +91,4 @@ public class MetadataRemoveAcceptedMessage implements 
DiscoveryCustomMessage, Me
     @Override public String toString() {
         return S.toString(MetadataRemoveAcceptedMessage.class, this);
     }
-
 }
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 9aa2064ad54..87bec077f47 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
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.binary.BinaryMetadata;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -31,10 +30,7 @@ import org.jetbrains.annotations.Nullable;
  * discovery-based protocol for manage {@link BinaryMetadata metadata} 
describing objects in binary format
  * stored in Ignite caches.
  */
-public final class MetadataRemoveProposedMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public final class MetadataRemoveProposedMessage implements 
DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
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 fb5d9e7fc0c..1f2c2ebbd48 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
@@ -20,7 +20,6 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -29,10 +28,7 @@ import org.jetbrains.annotations.Nullable;
  * As discovery messaging doesn't guarantee that message makes only one pass 
across the cluster
  * <b>MetadataUpdateAcceptedMessage</b> enables to mark it as duplicated so 
other nodes won't process it but skip.
  */
-public class MetadataUpdateAcceptedMessage implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class MetadataUpdateAcceptedMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -99,7 +95,6 @@ public class MetadataUpdateAcceptedMessage implements 
DiscoveryCustomMessage, Me
         this.duplicated = duplicated;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(MetadataUpdateAcceptedMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java
index c3308aeab3a..c06b6e92a36 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java
@@ -74,9 +74,6 @@ import org.jetbrains.annotations.Nullable;
  * equals to <b>pending version</b> of this metadata to the moment when is was 
initially read by the thread.
  */
 public final class MetadataUpdateProposedMessage implements 
DiscoveryCustomMessage, MarshallableMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     IgniteUuid id;
@@ -128,23 +125,17 @@ public final class MetadataUpdateProposedMessage 
implements DiscoveryCustomMessa
         typeId = metadata.typeId();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override public IgniteUuid id() {
         return id;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Nullable @Override public DiscoveryCustomMessage ackMessage() {
         return !rejected() ? new MetadataUpdateAcceptedMessage(typeId, 
pendingVer) : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override public boolean isMutable() {
         return true;
     }
@@ -156,9 +147,7 @@ public final class MetadataUpdateProposedMessage implements 
DiscoveryCustomMessa
         errMsg = new ErrorMessage(err);
     }
 
-    /**
-     *
-     */
+    /** */
     boolean rejected() {
         return errMsg != null;
     }
@@ -170,58 +159,42 @@ public final class MetadataUpdateProposedMessage 
implements DiscoveryCustomMessa
         return (BinaryObjectException)ErrorMessage.error(errMsg);
     }
 
-    /**
-     * @return Pending version.
-     */
+    /** @return Pending version. */
     int pendingVersion() {
         return pendingVer;
     }
 
-    /**
-     * @param pendingVer New pending version.
-     */
+    /** @param pendingVer New pending version. */
     void pendingVersion(int pendingVer) {
         this.pendingVer = pendingVer;
     }
 
-    /**
-     *
-     */
+    /** */
     int acceptedVersion() {
         return acceptedVer;
     }
 
-    /**
-     * @param acceptedVer Accepted version.
-     */
+    /** @param acceptedVer Accepted version. */
     void acceptedVersion(int acceptedVer) {
         this.acceptedVer = acceptedVer;
     }
 
-    /**
-     *
-     */
+    /** */
     UUID origNodeId() {
         return origNodeId;
     }
 
-    /**
-     *
-     */
+    /** */
     public BinaryMetadata metadata() {
         return metadata;
     }
 
-    /**
-     * @param metadata Metadata.
-     */
+    /** @param metadata Metadata. */
     public void metadata(BinaryMetadata metadata) {
         this.metadata = metadata;
     }
 
-    /**
-     *
-     */
+    /** */
     public int typeId() {
         return typeId;
     }
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 c7611c0b0be..0f08587315a 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
@@ -27,9 +27,6 @@ import static 
org.apache.ignite.internal.util.distributed.DistributedProcess.Dis
 
 /** Snapshot operation start message. */
 public class SnapshotStartDiscoveryMessage extends 
InitMessage<SnapshotOperationRequest> implements SnapshotDiscoveryMessage {
-    /** Serial version uid. */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     boolean needExchange;
@@ -59,7 +56,6 @@ public class SnapshotStartDiscoveryMessage extends 
InitMessage<SnapshotOperation
         return false;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(SnapshotStartDiscoveryMessage.class, this, 
super.toString());
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 37b3e94f205..b12847a04e1 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
@@ -23,16 +23,12 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  *
  */
-public class ChangeGlobalStateFinishMessage implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ChangeGlobalStateFinishMessage implements DiscoveryCustomMessage {
     /** Custom message ID. */
     @Order(0)
     IgniteUuid id;
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 d00c50b17ab..2056a0692da 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
@@ -41,9 +41,6 @@ import org.jetbrains.annotations.Nullable;
  * Message represent request for change cluster global state.
  */
 public class ChangeGlobalStateMessage implements DiscoveryCustomMessage, 
MarshallableMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Custom message ID. */
     @Order(0)
     IgniteUuid id;
@@ -253,7 +250,6 @@ public class ChangeGlobalStateMessage implements 
DiscoveryCustomMessage, Marshal
             baselineTopology = U.unmarshal(marsh, baselineTopologyBytes, 
clsLdr);
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ChangeGlobalStateMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
index f3e4dc5228d..e82c8ca30bd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
@@ -21,15 +21,11 @@ import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  *
  */
-public abstract class AbstractContinuousMessage implements Message, 
DiscoveryCustomMessage {
-    /** */
-    private static final long serialVersionUID = 2781778657738703012L;
-
+public abstract class AbstractContinuousMessage implements 
DiscoveryCustomMessage {
     /** Routine ID. */
     @Order(0)
     UUID routineId;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
index ab19f9bc615..ff4901dfd1c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
@@ -32,9 +32,6 @@ import org.jetbrains.annotations.Nullable;
  *
  */
 public class StartRoutineAckDiscoveryMessage extends AbstractContinuousMessage 
{
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     Map<UUID, ErrorMessage> errs;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index cf2f639aa8d..af18f362fe0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -30,9 +30,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
  * Discovery message used for Continuous Query registration.
  */
 public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     StartRequestData startReqData;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessageV2.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessageV2.java
index 856f1b533eb..15b57836528 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessageV2.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessageV2.java
@@ -26,9 +26,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
  *
  */
 public class StartRoutineDiscoveryMessageV2 extends AbstractContinuousMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     StartRequestData startReqData;
@@ -53,7 +50,6 @@ public class StartRoutineDiscoveryMessageV2 extends 
AbstractContinuousMessage {
         return startReqData;
     }
 
-
     /** {@inheritDoc} */
     @Override public DiscoveryCustomMessage ackMessage() {
         return null;
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 26263c4d629..e889b5fd45f 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
@@ -26,9 +26,6 @@ import org.jetbrains.annotations.Nullable;
  *
  */
 public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     public StopRoutineAckDiscoveryMessage() {
         // No-op.
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 45589a86a42..3ca2d36b8ba 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
@@ -26,9 +26,6 @@ import org.jetbrains.annotations.Nullable;
  *
  */
 public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     public StopRoutineDiscoveryMessage() {
         // No-op.
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 a0d3b7d94de..f943e3bd928 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
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -29,10 +28,7 @@ import org.jetbrains.annotations.Nullable;
  *
  * If any nodes were waiting for this mapping to be accepted they will be 
unblocked on receiving this message.
  */
-public class MappingAcceptedMessage implements DiscoveryCustomMessage, Message 
{
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class MappingAcceptedMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -69,7 +65,6 @@ public class MappingAcceptedMessage implements 
DiscoveryCustomMessage, Message {
         return item;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(MappingAcceptedMessage.class, this);
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 273a40648de..757dc7b7207 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
@@ -22,7 +22,6 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -34,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
  * When it completes a pass around the cluster ring with no conflicts observed,
  * {@link MappingAcceptedMessage} is sent as an acknowledgement that 
everything is fine.
  */
-public class MappingProposedMessage implements DiscoveryCustomMessage, Message 
{
+public class MappingProposedMessage implements DiscoveryCustomMessage {
     /** */
     enum ProposalStatus {
         /** */
@@ -45,9 +44,6 @@ public class MappingProposedMessage implements 
DiscoveryCustomMessage, Message {
         DUPLICATED
     }
 
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     IgniteUuid id;
@@ -142,7 +138,6 @@ public class MappingProposedMessage implements 
DiscoveryCustomMessage, Message {
         return conflictingClsName;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(MappingProposedMessage.class, this);
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 35bd6407a4b..a64753ad577 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
@@ -24,9 +24,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 
 /** */
 public class DistributedMetaStorageCasAckMessage extends 
DistributedMetaStorageUpdateAckMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** */
     @Order(0)
     boolean updated;
@@ -48,7 +45,6 @@ public class DistributedMetaStorageCasAckMessage extends 
DistributedMetaStorageU
         return updated;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DistributedMetaStorageCasAckMessage.class, this);
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 f3817d43f17..62c49f0f07b 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
@@ -26,9 +26,6 @@ import org.jetbrains.annotations.Nullable;
 
 /** */
 public class DistributedMetaStorageCasMessage extends 
DistributedMetaStorageUpdateMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** TODO: revise the external serialization 
https://issues.apache.org/jira/browse/IGNITE-28058. */
     @Order(0)
     byte[] expectedVal;
@@ -70,7 +67,6 @@ public class DistributedMetaStorageCasMessage extends 
DistributedMetaStorageUpda
         return new DistributedMetaStorageCasAckMessage(requestId(), matches);
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DistributedMetaStorageCasMessage.class, this, 
super.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 181f3f35751..7b99dbf1876 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
@@ -23,14 +23,10 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class DistributedMetaStorageUpdateAckMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class DistributedMetaStorageUpdateAckMessage implements 
DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -65,7 +61,6 @@ public class DistributedMetaStorageUpdateAckMessage 
implements DiscoveryCustomMe
         return null;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DistributedMetaStorageUpdateAckMessage.class, this);
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 dabd0a79135..af4d7256bdb 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
@@ -23,15 +23,11 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class DistributedMetaStorageUpdateMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class DistributedMetaStorageUpdateMessage implements 
DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id;
@@ -94,7 +90,6 @@ public class DistributedMetaStorageUpdateMessage implements 
DiscoveryCustomMessa
         return true;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DistributedMetaStorageUpdateMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java
index 34367a1d4f3..04223b930aa 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.query.schema.message;
 
+import java.io.Serializable;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import 
org.apache.ignite.internal.processors.query.schema.SchemaOperationException;
@@ -24,13 +25,12 @@ import 
org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstra
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Abstract discovery message for schema operations.
  */
-public abstract class SchemaAbstractDiscoveryMessage implements 
DiscoveryCustomMessage, Message {
+public abstract class SchemaAbstractDiscoveryMessage implements 
DiscoveryCustomMessage, Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
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 90caf76263e..9ff555b729a 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
@@ -74,5 +74,4 @@ public class SchemaFinishDiscoveryMessage extends 
SchemaAbstractDiscoveryMessage
     @Override public String toString() {
         return S.toString(SchemaFinishDiscoveryMessage.class, this, "parent", 
super.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 2283fe614b7..1f761c1e81e 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
@@ -90,10 +90,7 @@ public class SchemaProposeDiscoveryMessage extends 
SchemaAbstractDiscoveryMessag
         this.depId = depId;
     }
 
-    /**
-     *
-     * @return {@code True} if message is initialized.
-     */
+    /** @return {@code True} if message is initialized. */
     public boolean initialized() {
         return deploymentId() != null || hasError();
     }
@@ -109,5 +106,4 @@ public class SchemaProposeDiscoveryMessage extends 
SchemaAbstractDiscoveryMessag
     @Override public String toString() {
         return S.toString(SchemaProposeDiscoveryMessage.class, this, "parent", 
super.toString());
     }
-
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java
index 875432ccbfb..9a8c69748b3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java
@@ -26,17 +26,13 @@ import 
org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Service change batch request discovery message.
  */
-public class ServiceChangeBatchRequest implements DiscoveryCustomMessage, 
Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ServiceChangeBatchRequest implements DiscoveryCustomMessage {
     /** Unique custom message ID. */
     @Order(0)
     IgniteUuid id;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java
index f947d54131e..fcd23e89063 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java
@@ -24,7 +24,6 @@ import 
org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,10 +33,7 @@ import org.jetbrains.annotations.Nullable;
  * <p/>
  * Contains collection of {@link ServiceClusterDeploymentResult}.
  */
-public class ServiceClusterDeploymentResultBatch implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ServiceClusterDeploymentResultBatch implements 
DiscoveryCustomMessage {
     /** Unique custom message ID. */
     @Order(0)
     IgniteUuid id;
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 9639f4c843e..3106bacc6f1 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
@@ -39,10 +39,7 @@ import org.jetbrains.annotations.Nullable;
  * @see InitMessage
  * @see SingleNodeMessage
  */
-public class FullMessage<R extends Message> implements DiscoveryCustomMessage, 
Message {
-    /** Serial version uid. */
-    private static final long serialVersionUID = 0L;
-
+public class FullMessage<R extends Message> implements DiscoveryCustomMessage {
     /** Custom message ID. */
     @Order(0)
     IgniteUuid id;
@@ -119,7 +116,6 @@ public class FullMessage<R extends Message> implements 
DiscoveryCustomMessage, M
         return err == null ? null : F.viewReadOnly(err, e -> e.error());
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(FullMessage.class, this);
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 cf9412cb587..aee4e3b3b00 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
@@ -38,10 +38,7 @@ import org.jetbrains.annotations.Nullable;
  * @see FullMessage
  * @see SingleNodeMessage
  */
-public class InitMessage<I extends Message> implements Message, 
DiscoveryCustomMessage {
-    /** Serial version uid. */
-    private static final long serialVersionUID = 0L;
-
+public class InitMessage<I extends Message> implements DiscoveryCustomMessage {
     /** Custom message ID. */
     @Order(0)
     public IgniteUuid id;
@@ -120,5 +117,4 @@ public class InitMessage<I extends Message> implements 
Message, DiscoveryCustomM
     @Override public String toString() {
         return S.toString(InitMessage.class, this);
     }
-
 }
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 41583a1a356..f873143e8a8 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
@@ -23,7 +23,6 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,10 +34,7 @@ import org.jetbrains.annotations.Nullable;
  * node B receives request and opens communication connection to node A
  * thus allowing both nodes to communicate to each other.
  */
-public class TcpConnectionRequestDiscoveryMessage implements 
DiscoveryCustomMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpConnectionRequestDiscoveryMessage implements 
DiscoveryCustomMessage {
     /** Message id. */
     @Order(0)
     IgniteUuid id;
@@ -88,7 +84,6 @@ public class TcpConnectionRequestDiscoveryMessage implements 
DiscoveryCustomMess
         return null;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpConnectionRequestDiscoveryMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index 545e1a043e7..c9492bb0b86 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -151,7 +151,7 @@ public interface DiscoverySpi extends IgniteSpi {
     /**
      * Sends custom message across the ring.
      * @param msg Custom message.
-     * @throws IgniteException if failed to sent the event message.
+     * @throws IgniteException If failed to send the event message.
      */
     public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws 
IgniteException;
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
index 2cae2cfa9fc..482c23e92df 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.discovery;
 
-import java.io.Serializable;
+import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  *
  * @see DiscoverySpi#sendCustomEvent
  */
-public interface DiscoverySpiCustomMessage extends Serializable {
+public interface DiscoverySpiCustomMessage extends Message {
     /**
      * Called when custom message has been handled by all nodes.
      *
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryAcknowledgeMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryAcknowledgeMessage.java
index 7c8a5f02a04..58012184bed 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryAcknowledgeMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryAcknowledgeMessage.java
@@ -20,12 +20,11 @@ package org.apache.ignite.internal.processors.security;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class TestDiscoveryAcknowledgeMessage implements 
DiscoveryCustomMessage, Message {
+public class TestDiscoveryAcknowledgeMessage implements DiscoveryCustomMessage 
{
     /** */
     @Order(0)
     IgniteUuid id = IgniteUuid.randomUuid();
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryMessage.java
index b80a6a01e65..a1322699ae5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/TestDiscoveryMessage.java
@@ -20,12 +20,11 @@ package org.apache.ignite.internal.processors.security;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class TestDiscoveryMessage implements DiscoveryCustomMessage, Message {
+public class TestDiscoveryMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id = IgniteUuid.randomUuid();
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/MessageForServer.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/MessageForServer.java
index 2495290d165..01d9a62014b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/MessageForServer.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/MessageForServer.java
@@ -21,12 +21,11 @@ import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import 
org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class MessageForServer implements DiscoveryServerOnlyCustomMessage, 
Message {
+public class MessageForServer implements DiscoveryServerOnlyCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id = IgniteUuid.randomUuid();
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DummyCustomDiscoveryMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DummyCustomDiscoveryMessage.java
index a26013a586f..c742ab8efbd 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DummyCustomDiscoveryMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DummyCustomDiscoveryMessage.java
@@ -20,12 +20,11 @@ package org.apache.ignite.spi.discovery.tcp;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /** */
-public class DummyCustomDiscoveryMessage implements DiscoveryCustomMessage, 
Message {
+public class DummyCustomDiscoveryMessage implements DiscoveryCustomMessage {
     /** */
     @Order(0)
     IgniteUuid id = IgniteUuid.randomUuid();
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java
index d78606da464..3bca8d48773 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.zk.internal;
 import java.util.UUID;
 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.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.jetbrains.annotations.Nullable;
@@ -28,10 +27,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  *
  */
-class ZkCommunicationErrorResolveFinishMessage implements 
DiscoverySpiCustomMessage, ZkInternalMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+class ZkCommunicationErrorResolveFinishMessage implements 
DiscoverySpiCustomMessage, ZkInternalMessage {
     /** */
     @Order(0)
     UUID futId;
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java
index b5b7c046a83..6371646be8e 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.zk.internal;
 import java.util.UUID;
 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.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.jetbrains.annotations.Nullable;
@@ -28,10 +27,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Zk Communication Error Resolve Start Message.
  */
-public class ZkCommunicationErrorResolveStartMessage implements 
DiscoverySpiCustomMessage, ZkInternalMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ZkCommunicationErrorResolveStartMessage implements 
DiscoverySpiCustomMessage, ZkInternalMessage {
     /** */
     @Order(0)
     UUID id;
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java
index 3f40be08fc8..7c87ca1d881 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.zk.internal;
 
 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.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.jetbrains.annotations.Nullable;
@@ -27,10 +26,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Zk Force Node Fail Message.
  */
-public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, 
ZkInternalMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, 
ZkInternalMessage {
     /** */
     @Order(0)
     long nodeInternalId;
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java
index 86fcebb8cbe..d3505a5127c 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java
@@ -18,17 +18,13 @@
 package org.apache.ignite.spi.discovery.zk.internal;
 
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.jetbrains.annotations.Nullable;
 
 /**
  *
  */
-class ZkNoServersMessage implements DiscoverySpiCustomMessage, 
ZkInternalMessage, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+class ZkNoServersMessage implements DiscoverySpiCustomMessage, 
ZkInternalMessage {
     /** {@inheritDoc} */
     @Nullable @Override public DiscoverySpiCustomMessage ackMessage() {
         return null;

Reply via email to