IGNITE-26071 Remove Message interface from AffinityTopologyVersion (#12231)

Author: wernerdv

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

@@ -56,7 +56,6 @@
 import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyRequest;
 import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyResponse;
 import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.authentication.UserAuthenticateRequestMessage;
 import org.apache.ignite.internal.processors.authentication.UserAuthenticateResponseMessage;
 import org.apache.ignite.internal.processors.authentication.UserManagementOperationFinishedMessage;
@@ -311,7 +310,6 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
         factory.register((short)107, GridQueryFailResponse::new);
         factory.register((short)108, GridQueryNextPageRequest::new);
         factory.register((short)109, GridQueryNextPageResponse::new);
-        factory.register((short)111, AffinityTopologyVersion::new);
         factory.register((short)112, GridCacheSqlQuery::new);
         // 113 - BinaryObjectImpl
         factory.register((short)114, GridDhtPartitionSupplyMessage::new);

modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java

@@ -21,16 +21,12 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.nio.ByteBuffer;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  *
  */
-public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersion>, Externalizable, Message {
+public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersion>, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -73,7 +69,7 @@ public AffinityTopologyVersion(
     }
 
     /**
-     * @return {@code True} if this is real topology version (neither {@link #NONE} nor {@link #ZERO}.
+     * @return {@code True} if this is real topology version (neither {@link #NONE} nor {@link #ZERO}).
      */
     public boolean initialized() {
         return topVer > 0;
@@ -137,11 +133,6 @@ public final boolean before(AffinityTopologyVersion topVer) {
         return compareTo(topVer) < 0;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)
@@ -172,66 +163,6 @@ public final boolean before(AffinityTopologyVersion topVer) {
         minorTopVer = in.readInt();
     }
 
-    /** {@inheritDoc} */
-    @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
-        writer.setBuffer(buf);
-
-        if (!writer.isHeaderWritten()) {
-            if (!writer.writeHeader(directType()))
-                return false;
-
-            writer.onHeaderWritten();
-        }
-
-        switch (writer.state()) {
-            case 0:
-                if (!writer.writeInt(minorTopVer))
-                    return false;
-
-                writer.incrementState();
-
-            case 1:
-                if (!writer.writeLong(topVer))
-                    return false;
-
-                writer.incrementState();
-
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
-        reader.setBuffer(buf);
-
-        switch (reader.state()) {
-            case 0:
-                minorTopVer = reader.readInt();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-            case 1:
-                topVer = reader.readLong();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public short directType() {
-        return 111;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(AffinityTopologyVersion.class, this);

modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java

@@ -89,7 +89,7 @@ public IgniteUuid requestId() {
 
         switch (writer.state()) {
             case 0:
-                if (!writer.writeMessage(topVer))
+                if (!writer.writeAffinityTopologyVersion(topVer))
                     return false;
 
                 writer.incrementState();
@@ -110,7 +110,7 @@ public IgniteUuid requestId() {
 
         switch (reader.state()) {
             case 0:
-                topVer = reader.readMessage();
+                topVer = reader.readAffinityTopologyVersion();
 
                 if (!reader.isLastRead())
                     return false;

modules/core/src/test/java/org/apache/ignite/internal/processors/security/IgniteSecurityProcessorTest.java

@@ -20,10 +20,10 @@
 import java.lang.reflect.Method;
 import java.util.UUID;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteDiagnosticMessage;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.managers.GridManagerAdapter;
 import org.apache.ignite.internal.managers.communication.GridIoSecurityAwareMessage;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.ListeningTestLogger;
@@ -81,7 +81,7 @@ public void testThrowIllegalStateExceptionIfNodeNotFoundInDiscoCache() throws Ex
             PUBLIC_POOL,
             TOPIC_CACHE,
             TOPIC_CACHE.ordinal(),
-            new AffinityTopologyVersion(),
+            new IgniteDiagnosticMessage(),
             false,
             0,
             false

modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java

@@ -21,8 +21,8 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.GridTopic;
+import org.apache.ignite.internal.IgniteDiagnosticMessage;
 import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -72,7 +72,7 @@ public void testBrokenMessage() throws Exception {
     /**
      *
      */
-    private static class BrokenMessage extends AffinityTopologyVersion {
+    private static class BrokenMessage extends IgniteDiagnosticMessage {
         /** */
         private boolean fail = true;
 

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java

@@ -416,7 +416,7 @@ public GridH2DmlRequest explicitTimeout(boolean explicitTimeout) {
                 writer.incrementState();
 
             case 10:
-                if (!writer.writeMessage(topVer))
+                if (!writer.writeAffinityTopologyVersion(topVer))
                     return false;
 
                 writer.incrementState();
@@ -512,7 +512,7 @@ public GridH2DmlRequest explicitTimeout(boolean explicitTimeout) {
                 reader.incrementState();
 
             case 10:
-                topVer = reader.readMessage();
+                topVer = reader.readAffinityTopologyVersion();
 
                 if (!reader.isLastRead())
                     return false;