IGNITE-28566 Remove TcpDiscoveryCollectionMessage (#13040)

Author: NSAmelchev

modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java

@@ -255,7 +255,6 @@
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCollectionMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
@@ -341,9 +340,6 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         withNoSchema(GridCacheVersion.class);
         withNoSchema(GridCacheVersionEx.class);
 
-        msgIdx = 5500;
-        withNoSchema(TcpDiscoveryCollectionMessage.class);
-
         // [5700 - 5900]: Discovery originated messages.
         msgIdx = 5700;
         withNoSchema(TcpDiscoveryHandshakeRequest.class);

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java

@@ -18,7 +18,6 @@
 package org.apache.ignite.spi.discovery.tcp.messages;
 
 import java.io.Externalizable;
-import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -27,15 +26,13 @@
 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;
 
 /**
  * Base class to implement discovery messages.
  */
-public abstract class TcpDiscoveryAbstractMessage implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public abstract class TcpDiscoveryAbstractMessage implements Message {
     /** */
     protected static final int CLIENT_FLAG_POS = 0;
 
@@ -48,8 +45,8 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable {
     /** */
     protected static final int FORCE_FAIL_FLAG_POS = 4;
 
-    /** Sender of the message (transient). */
-    private transient UUID sndNodeId;
+    /** Sender of the message. */
+    private UUID sndNodeId;
 
     /** Message ID. */
     @Order(0)

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java

@@ -21,16 +21,12 @@
 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;
 
 /**
  * Message telling joining node that its authentication failed.
  */
-public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage {
     /** Creator address. */
     @Order(0)
     InetAddressMessage creatorAddrMsg;
@@ -68,7 +64,6 @@ public InetAddress creatorAddress() {
         return creatorAddrMsg.address();
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryAuthFailedMessage.class, this, "super", super.toString());

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java

@@ -20,15 +20,11 @@
 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;
 
 /**
  * Message telling joining node that it failed coordinator's validation check.
  */
-public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage {
     /** Coordinator version. */
     @Order(0)
     String err;
@@ -56,7 +52,6 @@ public String error() {
         return err;
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryCheckFailedMessage.class, this, "super", super.toString());

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java

@@ -21,15 +21,11 @@
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  *
  */
-public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage {
     /** */
     @Order(0)
     IgniteUuid msgId;
@@ -70,5 +66,4 @@ public IgniteUuid messageId() {
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientAckResponse.class, this, "super", super.toString());
     }
-
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java

@@ -22,18 +22,14 @@
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage;
 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;
 
 /**
  * Metrics update message.
  * <p>
  * Client sends his metrics in this message.
  */
-public class TcpDiscoveryClientMetricsUpdateMessage extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientMetricsUpdateMessage extends TcpDiscoveryAbstractMessage {
     /** */
     @Order(0)
     NodeMetricsMessage metricsMsg;
@@ -64,7 +60,6 @@ public NodeMetricsMessage metricsMessage() {
         return metricsMsg;
     }
 
-
     /** {@inheritDoc} */
     @Override public boolean traceLogLevel() {
         return true;

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java

@@ -20,16 +20,12 @@
 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.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage {
     /** Pinged client node ID. */
     @Order(0)
     @Nullable UUID nodeToPing;
@@ -60,5 +56,4 @@ public TcpDiscoveryClientPingRequest(UUID creatorNodeId, @Nullable UUID nodeToPi
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString());
     }
-
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java

@@ -20,16 +20,12 @@
 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.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage {
     /** Pinged client node ID. */
     @Order(0)
     @Nullable UUID nodeToPing;
@@ -73,5 +69,4 @@ public boolean result() {
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingResponse.class, this, "super", super.toString());
     }
-
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java

@@ -25,18 +25,14 @@
 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;
 
 /**
  * Message telling that client node is reconnecting to topology.
  */
 @TcpDiscoveryEnsureDelivery
-public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMessage implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMessage {
     /** New router nodeID. */
     @Order(0)
     UUID routerNodeId;
@@ -47,7 +43,7 @@ public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMess
 
     /** Pending messages holder. */
     @Order(2)
-    @Nullable TcpDiscoveryCollectionMessage pendingMsgsMsg;
+    @Nullable Collection<TcpDiscoveryAbstractMessage> pendingMsgs;
 
     /** Constructor for {@link MessageFactory}. */
     public TcpDiscoveryClientReconnectMessage() {
@@ -66,44 +62,32 @@ public TcpDiscoveryClientReconnectMessage(UUID creatorNodeId, UUID routerNodeId,
         this.lastMsgId = lastMsgId;
     }
 
-    /**
-     * @return New router node ID.
-     */
+    /** @return New router node ID. */
     public UUID routerNodeId() {
         return routerNodeId;
     }
 
-    /**
-     * @return Last message ID.
-     */
+    /** @return Last message ID. */
     public IgniteUuid lastMessageId() {
         return lastMsgId;
     }
 
-    /**
-     * @param msgs Pending messages.
-     */
-    public void pendingMessages(@Nullable Collection<TcpDiscoveryAbstractMessage> msgs) {
-        pendingMsgsMsg = F.isEmpty(msgs) ? null : new TcpDiscoveryCollectionMessage(msgs);
+    /** @param msgs Pending messages. */
+    public void pendingMessages(Collection<TcpDiscoveryAbstractMessage> msgs) {
+        pendingMsgs = F.isEmpty(msgs) ? null : msgs;
     }
 
-    /**
-     * @return Pending messages.
-     */
+    /** @return Pending messages. */
     public Collection<TcpDiscoveryAbstractMessage> pendingMessages() {
-        return pendingMsgsMsg == null ? Collections.emptyList() : pendingMsgsMsg.messages();
+        return pendingMsgs == null ? Collections.emptyList() : pendingMsgs;
     }
 
-    /**
-     * @param success Success flag.
-     */
+    /** @param success Success flag. */
     public void success(boolean success) {
         setFlag(CLIENT_RECON_SUCCESS_FLAG_POS, success);
     }
 
-    /**
-     * @return Success flag.
-     */
+    /** @return Success flag. */
     public boolean success() {
         return getFlag(CLIENT_RECON_SUCCESS_FLAG_POS);
     }
@@ -123,7 +107,6 @@ public boolean success() {
             Objects.equals(lastMsgId, other.lastMsgId);
     }
 
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientReconnectMessage.class, this, "super", super.toString());