IGNITE-28052 Use MessageSerializer for InitMessage (#12912)

Author: NSAmelchev

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

@@ -19,6 +19,10 @@
 
 import org.apache.ignite.internal.managers.communication.ErrorMessage;
 import org.apache.ignite.internal.managers.communication.ErrorMessageMarshallableSerializer;
+import org.apache.ignite.internal.managers.encryption.ChangeCacheEncryptionRequest;
+import org.apache.ignite.internal.managers.encryption.ChangeCacheEncryptionRequestSerializer;
+import org.apache.ignite.internal.managers.encryption.MasterKeyChangeRequest;
+import org.apache.ignite.internal.managers.encryption.MasterKeyChangeRequestSerializer;
 import org.apache.ignite.internal.processors.authentication.User;
 import org.apache.ignite.internal.processors.authentication.UserAcceptedMessage;
 import org.apache.ignite.internal.processors.authentication.UserAcceptedMessageSerializer;
@@ -55,18 +59,28 @@
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersResponseSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckPartitionHashesResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckPartitionHashesResponseMarshallableSerializer;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckProcessRequest;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckProcessRequestSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckResponseSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotHandlerResult;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotHandlerResultSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotMetadataResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotMetadataResponseMarshallableSerializer;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationEndRequest;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationEndRequestSerializer;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationRequest;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationRequestSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperationResponseSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyHandlerResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotRestoreOperationResponse;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotRestoreOperationResponseMarshallableSerializer;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotRestoreStartRequest;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotRestoreStartRequestSerializer;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotStartDiscoveryMessage;
+import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotStartDiscoveryMessageSerializer;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersionSerializer;
 import org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessage;
@@ -107,6 +121,8 @@
 import org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexDropOperationSerializer;
 import org.apache.ignite.internal.util.distributed.FullMessage;
 import org.apache.ignite.internal.util.distributed.FullMessageSerializer;
+import org.apache.ignite.internal.util.distributed.InitMessage;
+import org.apache.ignite.internal.util.distributed.InitMessageSerializer;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
@@ -264,6 +280,14 @@ public DiscoveryMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register((short)29, TcpDiscoveryNodeAddedMessage::new,
             new TcpDiscoveryNodeAddedMessageMarshallableSerializer(marsh, clsLdr));
         factory.register((short)30, FullMessage::new, new FullMessageSerializer());
+        factory.register((short)31, InitMessage::new, new InitMessageSerializer());
+        factory.register((short)32, SnapshotStartDiscoveryMessage::new, new SnapshotStartDiscoveryMessageSerializer());
+        factory.register((short)33, SnapshotCheckProcessRequest::new, new SnapshotCheckProcessRequestSerializer());
+        factory.register((short)34, SnapshotOperationRequest::new, new SnapshotOperationRequestSerializer());
+        factory.register((short)35, MasterKeyChangeRequest::new, new MasterKeyChangeRequestSerializer());
+        factory.register((short)36, SnapshotOperationEndRequest::new, new SnapshotOperationEndRequestSerializer());
+        factory.register((short)37, SnapshotRestoreStartRequest::new, new SnapshotRestoreStartRequestSerializer());
+        factory.register((short)38, ChangeCacheEncryptionRequest::new, new ChangeCacheEncryptionRequestSerializer());
 
         factory.register((short)86, GridCacheVersion::new, new GridCacheVersionSerializer());
 

modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java

@@ -17,32 +17,41 @@
 
 package org.apache.ignite.internal.managers.encryption;
 
-import java.io.Serializable;
 import java.util.Objects;
 import java.util.UUID;
+import org.apache.ignite.internal.Order;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 
 /**
  * Change cache group encryption key request.
  */
 @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
-public class ChangeCacheEncryptionRequest implements Serializable {
-    /** Serial version uid. */
-    private static final long serialVersionUID = 0L;
-
+public class ChangeCacheEncryptionRequest implements Message {
     /** Request ID. */
-    private final UUID reqId = UUID.randomUUID();
+    @Order(0)
+    UUID reqId;
 
     /** Cache group IDs. */
-    private final int[] grpIds;
+    @Order(1)
+    int[] grpIds;
 
     /** Encryption keys. */
-    private final byte[][] keys;
+    @Order(2)
+    byte[][] keys;
 
     /** Key identifiers. */
-    private final byte[] keyIds;
+    @Order(3)
+    byte[] keyIds;
 
     /** Master key digest. */
-    private final byte[] masterKeyDigest;
+    @Order(4)
+    byte[] masterKeyDigest;
+
+    /** Default constructor for {@link MessageFactory}. */
+    public ChangeCacheEncryptionRequest() {
+        // No-op.
+    }
 
     /**
      * @param grpIds Cache group IDs.
@@ -51,6 +60,7 @@ public class ChangeCacheEncryptionRequest implements Serializable {
      * @param masterKeyDigest Master key digest.
      */
     public ChangeCacheEncryptionRequest(int[] grpIds, byte[][] keys, byte[] keyIds, byte[] masterKeyDigest) {
+        this.reqId = UUID.randomUUID();
         this.grpIds = grpIds;
         this.keys = keys;
         this.keyIds = keyIds;
@@ -103,6 +113,11 @@ public byte[] masterKeyDigest() {
         return Objects.equals(reqId, ((ChangeCacheEncryptionRequest)o).reqId);
     }
 
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 38;
+    }
+
     /** {@inheritDoc} */
     @Override public int hashCode() {
         return Objects.hash(reqId);

modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java

@@ -1748,77 +1748,6 @@ private String decryptKeyName(byte[] data) {
         });
     }
 
-    /** Master key change request. */
-    private static class MasterKeyChangeRequest implements Serializable {
-        /** Serial version uid. */
-        private static final long serialVersionUID = 0L;
-
-        /** Request id. */
-        private final UUID reqId;
-
-        /** Encrypted master key name. */
-        private final byte[] encKeyName;
-
-        /** Master key digest. */
-        private final byte[] digest;
-
-        /**
-         * @param reqId Request id.
-         * @param encKeyName Encrypted master key name.
-         * @param digest Master key digest.
-         */
-        private MasterKeyChangeRequest(UUID reqId, byte[] encKeyName, byte[] digest) {
-            this.reqId = reqId;
-            this.encKeyName = encKeyName;
-            this.digest = digest;
-        }
-
-        /** @return Request id. */
-        UUID requestId() {
-            return reqId;
-        }
-
-        /** @return Encrypted master key name. */
-        byte[] encKeyName() {
-            return encKeyName;
-        }
-
-        /** @return Master key digest. */
-        byte[] digest() {
-            return digest;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (!(o instanceof MasterKeyChangeRequest))
-                return false;
-
-            MasterKeyChangeRequest key = (MasterKeyChangeRequest)o;
-
-            return Arrays.equals(encKeyName, key.encKeyName) &&
-                Arrays.equals(digest, key.digest) &&
-                Objects.equals(reqId, key.reqId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            int res = Objects.hash(reqId);
-
-            res = 31 * res + Arrays.hashCode(encKeyName);
-            res = 31 * res + Arrays.hashCode(digest);
-
-            return res;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return S.toString(MasterKeyChangeRequest.class, this);
-        }
-    }
-
     /** */
     protected static class NodeEncryptionKeys implements Serializable {
         /** */

modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java

@@ -0,0 +1,107 @@
+/*
+ * 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.encryption;
+
+import java.util.Arrays;
+import java.util.Objects;
+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.apache.ignite.plugin.extensions.communication.MessageFactory;
+
+/** Master key change request. */
+public class MasterKeyChangeRequest implements Message {
+    /** Request id. */
+    @Order(0)
+    UUID reqId;
+
+    /** Encrypted master key name. */
+    @Order(1)
+    byte[] encKeyName;
+
+    /** Master key digest. */
+    @Order(2)
+    byte[] digest;
+
+    /** Default constructor for {@link MessageFactory}. */
+    public MasterKeyChangeRequest() {
+        // No-op.
+    }
+
+    /**
+     * @param reqId Request id.
+     * @param encKeyName Encrypted master key name.
+     * @param digest Master key digest.
+     */
+    public MasterKeyChangeRequest(UUID reqId, byte[] encKeyName, byte[] digest) {
+        this.reqId = reqId;
+        this.encKeyName = encKeyName;
+        this.digest = digest;
+    }
+
+    /** @return Request id. */
+    UUID requestId() {
+        return reqId;
+    }
+
+    /** @return Encrypted master key name. */
+    byte[] encKeyName() {
+        return encKeyName;
+    }
+
+    /** @return Master key digest. */
+    byte[] digest() {
+        return digest;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof MasterKeyChangeRequest))
+            return false;
+
+        MasterKeyChangeRequest key = (MasterKeyChangeRequest)o;
+
+        return Arrays.equals(encKeyName, key.encKeyName) &&
+            Arrays.equals(digest, key.digest) &&
+            Objects.equals(reqId, key.reqId);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        int res = Objects.hash(reqId);
+
+        res = 31 * res + Arrays.hashCode(encKeyName);
+        res = 31 * res + Arrays.hashCode(digest);
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 35;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(MasterKeyChangeRequest.class, this);
+    }
+}

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotOperationRequest.java

@@ -17,46 +17,52 @@
 
 package org.apache.ignite.internal.processors.cache.persistence.snapshot;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.distributed.DistributedProcess;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Snapshot operation start request for {@link DistributedProcess} initiate message.
  */
-abstract class AbstractSnapshotOperationRequest implements Serializable {
-    /** Serial version uid. */
-    private static final long serialVersionUID = 0L;
-
+abstract class AbstractSnapshotOperationRequest implements Message {
     /** Request ID. */
-    @GridToStringInclude
-    private final UUID reqId;
+    @Order(0)
+    UUID reqId;
 
     /** Snapshot name. */
-    @GridToStringInclude
-    private final String snpName;
+    @Order(1)
+    String snpName;
 
     /** Snapshot directory path. */
-    @GridToStringInclude
-    private final String snpPath;
+    @Order(2)
+    String snpPath;
 
     /** Collection of cache group names. */
+    @Order(3)
     @GridToStringInclude
-    private final Collection<String> grps;
+    Collection<String> grps;
 
     /** Start time. */
-    @GridToStringInclude
-    private final long startTime;
+    @Order(4)
+    long startTime;
 
     /** IDs of the nodes that must be alive to complete the operation. */
     @GridToStringInclude
-    private final Set<UUID> nodes;
+    @Order(5)
+    Set<UUID> nodes;
+
+    /** Default constructor for {@link MessageFactory}. */
+    public AbstractSnapshotOperationRequest() {
+        // No-op.
+    }
 
     /**
      * @param reqId Request ID.