IGNITE-27869 Use MessageSerializer for GenerateEncryptionKeyResponse (#12748)

Author: wernerdv

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

@@ -51,6 +51,7 @@
 import org.apache.ignite.internal.codegen.ErrorMessageSerializer;
 import org.apache.ignite.internal.codegen.ExchangeInfoSerializer;
 import org.apache.ignite.internal.codegen.GenerateEncryptionKeyRequestSerializer;
+import org.apache.ignite.internal.codegen.GenerateEncryptionKeyResponseSerializer;
 import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer;
 import org.apache.ignite.internal.codegen.GridCacheQueryRequestSerializer;
 import org.apache.ignite.internal.codegen.GridCacheQueryResponseSerializer;
@@ -473,7 +474,7 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
         factory.register(NodeFullMetricsMessage.TYPE_CODE, NodeFullMetricsMessage::new, new NodeFullMetricsMessageSerializer());
         factory.register((short)157, PartitionUpdateCountersMessage::new, new PartitionUpdateCountersMessageSerializer());
         factory.register((short)162, GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
-        factory.register((short)163, GenerateEncryptionKeyResponse::new);
+        factory.register((short)163, GenerateEncryptionKeyResponse::new, new GenerateEncryptionKeyResponseSerializer());
         factory.register((short)167, ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
         factory.register((short)168, ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
         factory.register((short)169, ServiceSingleNodeDeploymentResult::new);

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

@@ -17,28 +17,26 @@
 
 package org.apache.ignite.internal.managers.encryption;
 
-import java.nio.ByteBuffer;
 import java.util.Collection;
-import org.apache.ignite.internal.GridDirectCollection;
+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.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 
 /**
  * Generate encryption key response.
  */
 public class GenerateEncryptionKeyResponse implements Message {
     /** Request message ID. */
+    @Order(value = 0, method = "requestId")
     private IgniteUuid id;
 
     /** */
-    @GridDirectCollection(byte[].class)
+    @Order(value = 1, method = "encryptionKeys")
     private Collection<byte[]> encKeys;
 
     /** Master key digest that encrypted group encryption keys. */
+    @Order(2)
     private byte[] masterKeyDigest;
 
     /** */
@@ -63,83 +61,37 @@ public IgniteUuid requestId() {
         return id;
     }
 
+    /**
+     * @param id Request id.
+     */
+    public void requestId(IgniteUuid id) {
+        this.id = id;
+    }
+
     /**
      * @return Encryption keys.
      */
     public Collection<byte[]> encryptionKeys() {
         return encKeys;
     }
 
+    /**
+     * @param encKeys Encryption keys.
+     */
+    public void encryptionKeys(Collection<byte[]> encKeys) {
+        this.encKeys = encKeys;
+    }
+
     /** @return Master key digest that encrypted group encryption keys. */
     public byte[] masterKeyDigest() {
         return masterKeyDigest;
     }
 
-    /** {@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.writeCollection(encKeys, MessageCollectionItemType.BYTE_ARR))
-                    return false;
-
-                writer.incrementState();
-
-            case 1:
-                if (!writer.writeIgniteUuid(id))
-                    return false;
-
-                writer.incrementState();
-
-            case 2:
-                if (!writer.writeByteArray(masterKeyDigest))
-                    return false;
-
-                writer.incrementState();
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
-        reader.setBuffer(buf);
-
-        switch (reader.state()) {
-            case 0:
-                encKeys = reader.readCollection(MessageCollectionItemType.BYTE_ARR);
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-            case 1:
-                id = reader.readIgniteUuid();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-            case 2:
-                masterKeyDigest = reader.readByteArray();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-        }
-
-        return true;
+    /**
+     * @param masterKeyDigest Master key digest that encrypted group encryption keys.
+     */
+    public void masterKeyDigest(byte[] masterKeyDigest) {
+        this.masterKeyDigest = masterKeyDigest;
     }
 
     /** {@inheritDoc} */