IGNITE-26080 Use MessageSerializer for GenerateEncryptionKeyRequest (#12234)

Author: w3ll1ngt

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

@@ -28,6 +28,7 @@
 import org.apache.ignite.internal.binary.BinaryUtils;
 import org.apache.ignite.internal.codegen.CacheEvictionEntrySerializer;
 import org.apache.ignite.internal.codegen.CacheVersionedValueSerializer;
+import org.apache.ignite.internal.codegen.GenerateEncryptionKeyRequestSerializer;
 import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer;
 import org.apache.ignite.internal.codegen.GridCacheVersionExSerializer;
 import org.apache.ignite.internal.codegen.GridCacheVersionSerializer;
@@ -341,7 +342,7 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
         factory.register((short)135, LatchAckMessage::new, new LatchAckMessageSerializer());
         factory.register((short)157, PartitionUpdateCountersMessage::new);
         factory.register((short)158, GridDhtPartitionSupplyErrorMessage::new);
-        factory.register((short)162, GenerateEncryptionKeyRequest::new);
+        factory.register((short)162, GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
         factory.register((short)163, GenerateEncryptionKeyResponse::new);
         factory.register((short)167, ServiceDeploymentProcessId::new);
         factory.register((short)168, ServiceSingleNodeDeploymentResultBatch::new);

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

@@ -17,21 +17,21 @@
 
 package org.apache.ignite.internal.managers.encryption;
 
-import java.nio.ByteBuffer;
+import org.apache.ignite.internal.Order;
 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.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Generate encryption key request.
  */
 public class GenerateEncryptionKeyRequest implements Message {
     /** Request ID. */
-    private IgniteUuid id = IgniteUuid.randomUuid();
+    @Order(0)
+    private IgniteUuid id;
 
     /** */
+    @Order(value = 1, method = "keyCount")
     private int keyCnt;
 
     /** */
@@ -43,6 +43,7 @@ public GenerateEncryptionKeyRequest() {
      */
     public GenerateEncryptionKeyRequest(int keyCnt) {
         this.keyCnt = keyCnt;
+        id = IgniteUuid.randomUuid();
     }
 
     /**
@@ -52,66 +53,25 @@ public IgniteUuid id() {
         return id;
     }
 
+    /**
+     * @param id New request ID.
+     */
+    public void id(IgniteUuid id) {
+        this.id = id;
+    }
+
     /**
      * @return Count of encryption key to generate.
      */
     public int keyCount() {
         return keyCnt;
     }
 
-    /** {@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.writeIgniteUuid(id))
-                    return false;
-
-                writer.incrementState();
-
-            case 1:
-                if (!writer.writeInt(keyCnt))
-                    return false;
-
-                writer.incrementState();
-
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
-        reader.setBuffer(buf);
-
-        switch (reader.state()) {
-            case 0:
-                id = reader.readIgniteUuid();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-            case 1:
-                keyCnt = reader.readInt();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-        }
-
-        return true;
+    /**
+     * @param keyCnt New key count.
+     */
+    public void keyCount(int keyCnt) {
+        this.keyCnt = keyCnt;
     }
 
     /** {@inheritDoc} */