IGNITE-24260 Remove IgniteDataTransferObject protoVer fields (#11910)

Author: maksaska

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/DurableBackgroundCleanupIndexTreeTaskV2.java

@@ -166,10 +166,7 @@ public DurableBackgroundCleanupIndexTreeTaskV2() {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(
-        byte protoVer,
-        ObjectInput in
-    ) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         uid = U.readLongString(in);
         grpName = U.readLongString(in);
         cacheName = U.readLongString(in);

modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java

@@ -50,10 +50,7 @@ public class CheckIndexInlineSizesResult extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(
-        byte protoVer,
-        ObjectInput in
-    ) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         int size = in.readInt();
 
         for (int i = 0; i < size; i++) {

modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java

@@ -38,33 +38,6 @@ public abstract class IgniteDataTransferObject implements Externalizable {
     /** Magic number to detect correct transfer objects. */
     private static final int MAGIC = 0x42BEEF00;
 
-    /** Version 1. */
-    protected static final byte V1 = 1;
-
-    /** Version 2. */
-    protected static final byte V2 = 2;
-
-    /** Version 3. */
-    protected static final byte V3 = 3;
-
-    /** Version 4. */
-    protected static final byte V4 = 4;
-
-    /** Version 5. */
-    protected static final byte V5 = 5;
-
-    /** Version 6. */
-    protected static final byte V6 = 6;
-
-    /** Version 7. */
-    protected static final byte V7 = 7;
-
-    /** Version 8. */
-    protected static final byte V8 = 8;
-
-    /** Version 9. */
-    protected static final byte V9 = 9;
-
     /**
      * @param col Source collection.
      * @param <T> Collection type.
@@ -89,13 +62,6 @@ public abstract class IgniteDataTransferObject implements Externalizable {
         return null;
     }
 
-    /**
-     * @return Transfer object version.
-     */
-    public byte getProtocolVersion() {
-        return V1;
-    }
-
     /**
      * Save object's specific data content.
      *
@@ -106,9 +72,7 @@ public byte getProtocolVersion() {
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
-        int hdr = MAGIC + getProtocolVersion();
-
-        out.writeInt(hdr);
+        out.writeInt(MAGIC);
 
         try (IgniteDataTransferObjectOutput dtout = new IgniteDataTransferObjectOutput(out)) {
             writeExternalData(dtout);
@@ -118,12 +82,11 @@ public byte getProtocolVersion() {
     /**
      * Load object's specific data content.
      *
-     * @param protoVer Input object version.
      * @param in Input object to load data content.
      * @throws IOException If I/O errors occur.
      * @throws ClassNotFoundException If the class for an object being restored cannot be found.
      */
-    protected abstract void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException;
+    protected abstract void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException;
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -133,10 +96,8 @@ public byte getProtocolVersion() {
             throw new IOException("Unexpected IgniteDataTransferObject header " +
                 "[actual=" + Integer.toHexString(hdr) + ", expected=" + Integer.toHexString(MAGIC) + "]");
 
-        byte ver = (byte)(hdr & 0xFF);
-
         try (IgniteDataTransferObjectInput dtin = new IgniteDataTransferObjectInput(in)) {
-            readExternalData(ver, dtin);
+            readExternalData(dtin);
         }
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java

@@ -44,7 +44,7 @@ public class ChangeTagCommandArg extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         newTagValue = U.readString(in);
     }
 

modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTaskResult.java

@@ -64,7 +64,7 @@ public ClusterChangeTagTaskResult(String tag, @Nullable Boolean success, @Nullab
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         success = (Boolean)in.readObject();
         errResp = (String)in.readObject();
 

modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java

@@ -45,7 +45,7 @@ public class DeactivateCommandArg extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         force = in.readBoolean();
         clusterName = U.readString(in);
     }

modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java

@@ -66,7 +66,7 @@ public class SetStateCommandArg extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         state = U.readEnum(in, ClusterState.class);
         force = in.readBoolean();
         clusterName = U.readString(in);

modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java

@@ -53,7 +53,7 @@ public class ShutdownPolicyCommandArg extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         shutdownPolicy = U.readEnum(in, ShutdownPolicy.class);
     }
 

modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTaskResult.java

@@ -57,7 +57,7 @@ public void setShutdown(ShutdownPolicy shutdown) {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         shutdown = ShutdownPolicy.fromOrdinal(in.readInt());
 
     }

modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java

@@ -68,7 +68,7 @@ public class SystemViewCommandArg extends IgniteDataTransferObject {
     }
 
     /** {@inheritDoc} */
-    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException {
         systemViewName = U.readString(in);
         nodeId = U.readUuid(in);
         nodeIds = U.readArray(in, UUID.class);