IGNITE-27310 Use MessageSerializer for TcpDiscoveryDiscardMessage (#12570)

Author: wernerdv

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -21,6 +21,7 @@
 import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryConnectionCheckMessageSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryDiscardMessageSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeRequestSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
@@ -32,6 +33,7 @@
 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.TcpDiscoveryConnectionCheckMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
@@ -51,5 +53,6 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
         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());
     }
 }

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

@@ -6110,7 +6110,7 @@ private void processMetricsUpdateMessage(TcpDiscoveryMetricsUpdateMessage msg) {
         private void processDiscardMessage(TcpDiscoveryDiscardMessage msg) {
             assert msg != null;
 
-            IgniteUuid msgId = msg.msgId();
+            IgniteUuid msgId = msg.messageId();
 
             assert msgId != null;
 

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

@@ -18,22 +18,31 @@
 package org.apache.ignite.spi.discovery.tcp.messages;
 
 import java.util.UUID;
+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;
 
 /**
  * Message sent by coordinator when some operation handling is over. All receiving
  * nodes should discard this and all preceding messages in local buffers.
  */
-public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
+public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage implements Message {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** ID of the message to discard (this and all preceding). */
-    private final IgniteUuid msgId;
+    @Order(value = 5, method = "messageId")
+    private IgniteUuid msgId;
 
     /** True if this is discard ID for custom event message. */
-    private final boolean customMsgDiscard;
+    @Order(value = 6, method = "customMessageDiscard")
+    private boolean customMsgDiscard;
+
+    /** */
+    public TcpDiscoveryDiscardMessage() {
+        // No-op.
+    }
 
     /**
      * Constructor.
@@ -54,10 +63,17 @@ public TcpDiscoveryDiscardMessage(UUID creatorNodeId, IgniteUuid msgId, boolean
      *
      * @return Message ID.
      */
-    public IgniteUuid msgId() {
+    public IgniteUuid messageId() {
         return msgId;
     }
 
+    /**
+     * @param msgId Message ID.
+     */
+    public void messageId(IgniteUuid msgId) {
+        this.msgId = msgId;
+    }
+
     /**
      * Flag indicating whether the ID to discard is for a custom message or not.
      *
@@ -67,8 +83,20 @@ public boolean customMessageDiscard() {
         return customMsgDiscard;
     }
 
+    /**
+     * @param customMsgDiscard Custom message flag.
+     */
+    public void customMessageDiscard(boolean customMsgDiscard) {
+        this.customMsgDiscard = customMsgDiscard;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString());
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 9;
+    }
 }