IGNITE-28028 Use MessageSerializer for TxTimeoutOnPartitionMapExchangeChangeMessage

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

@@ -19,6 +19,8 @@
 
 import org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessage;
 import org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessageSerializer;
+import org.apache.ignite.internal.processors.cache.TxTimeoutOnPartitionMapExchangeChangeMessage;
+import org.apache.ignite.internal.processors.cache.TxTimeoutOnPartitionMapExchangeChangeMessageSerializer;
 import org.apache.ignite.internal.processors.cache.WalStateFinishMessage;
 import org.apache.ignite.internal.processors.cache.WalStateFinishMessageSerializer;
 import org.apache.ignite.internal.processors.cache.WalStateProposeMessage;
@@ -145,5 +147,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
         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, TxTimeoutOnPartitionMapExchangeChangeMessage::new,
+            new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer());
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java

@@ -18,39 +18,51 @@
 package org.apache.ignite.internal.processors.cache;
 
 import java.util.UUID;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoCache;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 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 {
+public class TxTimeoutOnPartitionMapExchangeChangeMessage implements DiscoveryCustomMessage, Message {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** */
-    private final IgniteUuid id = IgniteUuid.randomUuid();
+    @Order(0)
+    IgniteUuid id;
 
     /** Request ID. */
-    private final UUID reqId;
+    @Order(1)
+    UUID reqId;
 
     /** Transaction timeout on partition map exchange in milliseconds. */
-    private final long timeout;
+    @Order(2)
+    long timeout;
 
     /** Init flag. */
-    private final boolean isInit;
+    @Order(3)
+    boolean isInit;
+
+    /** */
+    public TxTimeoutOnPartitionMapExchangeChangeMessage() {
+        // No-op.
+    }
 
     /**
      * Constructor for response.
      *
      * @param req Request message.
      */
     public TxTimeoutOnPartitionMapExchangeChangeMessage(TxTimeoutOnPartitionMapExchangeChangeMessage req) {
+        this.id = IgniteUuid.randomUuid();
         this.reqId = req.reqId;
         this.timeout = req.timeout;
         this.isInit = false;
@@ -63,6 +75,7 @@ public TxTimeoutOnPartitionMapExchangeChangeMessage(TxTimeoutOnPartitionMapExcha
      * @param timeout Transaction timeout on partition map exchange in milliseconds.
      */
     public TxTimeoutOnPartitionMapExchangeChangeMessage(UUID reqId, long timeout) {
+        this.id = IgniteUuid.randomUuid();
         this.reqId = reqId;
         this.timeout = timeout;
         this.isInit = true;
@@ -120,4 +133,9 @@ public boolean isInit() {
     @Override public String toString() {
         return S.toString(TxTimeoutOnPartitionMapExchangeChangeMessage.class, this);
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 508;
+    }
 }