IGNITE-27269 Use MessageSerializer for TcpDiscoveryClientPingRequest and TcpDiscoveryClientPingResponse (#12564)

Author: wernerdv

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteCommunicationMessageSerializationTest.java

@@ -17,11 +17,11 @@
 
 package org.apache.ignite.internal.processors.query.calcite.message;
 
-import org.apache.ignite.internal.managers.communication.AbstractCommunicationMessageSerializationTest;
+import org.apache.ignite.internal.managers.communication.AbstractMessageSerializationTest;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 
 /** */
-public class CalciteCommunicationMessageSerializationTest extends AbstractCommunicationMessageSerializationTest {
+public class CalciteCommunicationMessageSerializationTest extends AbstractMessageSerializationTest {
     /** {@inheritDoc} */
     @Override protected MessageFactoryProvider messageFactory() {
         return new CalciteMessageFactory();

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

@@ -18,11 +18,15 @@
 package org.apache.ignite.internal.managers.discovery;
 
 import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
+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.TcpDiscoveryPingRequest;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
 
@@ -33,5 +37,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
         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());
     }
 }

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

@@ -18,18 +18,26 @@
 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.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage {
+public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage implements Message {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** Pinged client node ID. */
-    private final UUID nodeToPing;
+    @Order(5)
+    private @Nullable UUID nodeToPing;
+
+    /** */
+    public TcpDiscoveryClientPingRequest() {
+        // No-op.
+    }
 
     /**
      * @param creatorNodeId Creator node ID.
@@ -48,8 +56,20 @@ public TcpDiscoveryClientPingRequest(UUID creatorNodeId, @Nullable UUID nodeToPi
         return nodeToPing;
     }
 
+    /**
+     * @param nodeToPing Pinged client node ID.
+     */
+    public void nodeToPing(@Nullable UUID nodeToPing) {
+        this.nodeToPing = nodeToPing;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString());
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 3;
+    }
 }

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

@@ -18,21 +18,30 @@
 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.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage {
+public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage implements Message {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** Pinged client node ID. */
-    private final UUID nodeToPing;
+    @Order(5)
+    private @Nullable UUID nodeToPing;
 
     /** */
-    private final boolean res;
+    @Order(value = 6, method = "result")
+    private boolean res;
+
+    /** */
+    public TcpDiscoveryClientPingResponse() {
+        // No-op.
+    }
 
     /**
      * @param creatorNodeId Creator node ID.
@@ -53,15 +62,34 @@ public TcpDiscoveryClientPingResponse(UUID creatorNodeId, @Nullable UUID nodeToP
         return nodeToPing;
     }
 
+    /**
+     * @param nodeToPing Pinged client node ID.
+     */
+    public void nodeToPing(@Nullable UUID nodeToPing) {
+        this.nodeToPing = nodeToPing;
+    }
+
     /**
      * @return Result of ping.
      */
     public boolean result() {
         return res;
     }
 
+    /**
+     * @param res Result of ping.
+     */
+    public void result(boolean res) {
+        this.res = res;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryClientPingResponse.class, this, "super", super.toString());
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 4;
+    }
 }

…mmunicationMessageSerializationTest.java …on/AbstractMessageSerializationTest.javamodules/core/src/test/java/org/apache/ignite/internal/managers/communication/AbstractCommunicationMessageSerializationTest.java renamed to modules/core/src/test/java/org/apache/ignite/internal/managers/communication/AbstractMessageSerializationTest.java modules/core/src/test/java/org/apache/ignite/internal/managers/communication/AbstractCommunicationMessageSerializationTest.java renamed to modules/core/src/test/java/org/apache/ignite/internal/managers/communication/AbstractMessageSerializationTest.java

@@ -41,7 +41,7 @@
 import static org.junit.Assert.assertEquals;
 
 /** */
-public abstract class AbstractCommunicationMessageSerializationTest {
+public abstract class AbstractMessageSerializationTest {
     /** */
     @Test
     public void testMessageSerializationAndDeserializationConsistency() throws Exception {

modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java

@@ -27,7 +27,7 @@
 import static org.apache.ignite.internal.util.IgniteUtils.toBytes;
 
 /** */
-public class IgniteIoCommunicationMessageSerializationTest extends AbstractCommunicationMessageSerializationTest {
+public class IgniteIoCommunicationMessageSerializationTest extends AbstractMessageSerializationTest {
     /** {@inheritDoc} */
     @Override protected MessageFactoryProvider messageFactory() {
         return new GridIoMessageFactory();

modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteDiscoveryMessageSerializationTest.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.managers.discovery;
+
+import org.apache.ignite.internal.managers.communication.AbstractMessageSerializationTest;
+import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
+
+/** Serialization test for discovery messages. */
+public class IgniteDiscoveryMessageSerializationTest extends AbstractMessageSerializationTest {
+    /** {@inheritDoc} */
+    @Override protected MessageFactoryProvider messageFactory() {
+        return new DiscoveryMessageFactory();
+    }
+}

modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java

@@ -18,6 +18,7 @@
 package org.apache.ignite.testsuites;
 
 import org.apache.ignite.internal.IgniteDiscoveryMassiveNodeFailTest;
+import org.apache.ignite.internal.managers.discovery.IgniteDiscoveryMessageSerializationTest;
 import org.apache.ignite.spi.ExponentialBackoffTimeoutStrategyTest;
 import org.apache.ignite.spi.GridTcpSpiForwardingSelfTest;
 import org.apache.ignite.spi.discovery.AuthenticationRestartTest;
@@ -187,6 +188,8 @@
 
     MultiDataCenterDeploymentTest.class,
     MultiDataCenterClientRoutingTest.class,
+
+    IgniteDiscoveryMessageSerializationTest.class
 })
 public class IgniteSpiDiscoverySelfTestSuite {
     /** */

modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/H2CommunicationMessageSerializationTest.java

@@ -17,12 +17,12 @@
 
 package org.apache.ignite.spi.communication.tcp;
 
-import org.apache.ignite.internal.managers.communication.AbstractCommunicationMessageSerializationTest;
+import org.apache.ignite.internal.managers.communication.AbstractMessageSerializationTest;
 import org.apache.ignite.internal.processors.query.h2.twostep.msg.GridH2ValueMessageFactory;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 
 /** */
-public class H2CommunicationMessageSerializationTest extends AbstractCommunicationMessageSerializationTest {
+public class H2CommunicationMessageSerializationTest extends AbstractMessageSerializationTest {
     /** {@inheritDoc} */
     @Override protected MessageFactoryProvider messageFactory() {
         return new GridH2ValueMessageFactory();