This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9cd5a557538 IGNITE-27869 Use MessageSerializer for
GenerateEncryptionKeyResponse (#12748)
9cd5a557538 is described below
commit 9cd5a5575383a0524bf29be5b8c7757f7036c0b8
Author: Dmitry Werner <[email protected]>
AuthorDate: Thu Feb 19 21:55:50 2026 +0500
IGNITE-27869 Use MessageSerializer for GenerateEncryptionKeyResponse
(#12748)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../encryption/GenerateEncryptionKeyResponse.java | 94 ++++++----------------
2 files changed, 25 insertions(+), 72 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 03db54860b7..8108c88978e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -51,6 +51,7 @@ import
org.apache.ignite.internal.codegen.ContinuousRoutineStartResultMessageSer
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);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
index 61c0aed95a3..ab012dee3e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
+++
b/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,6 +61,13 @@ public class GenerateEncryptionKeyResponse implements
Message {
return id;
}
+ /**
+ * @param id Request id.
+ */
+ public void requestId(IgniteUuid id) {
+ this.id = id;
+ }
+
/**
* @return Encryption keys.
*/
@@ -70,76 +75,23 @@ public class GenerateEncryptionKeyResponse implements
Message {
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} */
