This is an automated email from the ASF dual-hosted git repository.
shishkovilja 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 e9367af6f66 IGNITE-27827 Use MessageSerializer for
GridDeploymentInfoBean (#12779)
e9367af6f66 is described below
commit e9367af6f667592a6f14c331d6268da88b51de27
Author: Alexey Abashev <[email protected]>
AuthorDate: Wed Mar 4 19:04:27 2026 +0300
IGNITE-27827 Use MessageSerializer for GridDeploymentInfoBean (#12779)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../deployment/GridDeploymentInfoBean.java | 130 +++------------------
2 files changed, 18 insertions(+), 115 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 400621eb161..eb1a84d7223 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
@@ -52,6 +52,7 @@ import
org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettingsS
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest;
import
org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequestSerializer;
import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
+import
org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBeanSerializer;
import org.apache.ignite.internal.managers.deployment.GridDeploymentRequest;
import
org.apache.ignite.internal.managers.deployment.GridDeploymentRequestSerializer;
import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse;
@@ -388,7 +389,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)7, GridCheckpointRequest::new, new
GridCheckpointRequestSerializer());
factory.register((short)8, GridIoMessage::new, new
GridIoMessageSerializer());
factory.register((short)9, GridIoUserMessage::new, new
GridIoUserMessageSerializer());
- factory.register((short)10, GridDeploymentInfoBean::new);
+ factory.register((short)10, GridDeploymentInfoBean::new, new
GridDeploymentInfoBeanSerializer());
factory.register((short)11, GridDeploymentRequest::new, new
GridDeploymentRequestSerializer());
factory.register((short)12, GridDeploymentResponse::new, new
GridDeploymentResponseSerializer());
factory.register((short)13, GridEventStorageMessage::new, new
GridEventStorageMessageSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index e16d44dae24..f520f40d28a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -21,19 +21,15 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.nio.ByteBuffer;
import java.util.Map;
import java.util.UUID;
import org.apache.ignite.configuration.DeploymentMode;
-import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
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;
/**
* Deployment info bean.
@@ -43,22 +39,29 @@ public class GridDeploymentInfoBean implements Message,
GridDeploymentInfo, Exte
private static final long serialVersionUID = 0L;
/** */
- private IgniteUuid clsLdrId;
+ @Order(0)
+ IgniteUuid clsLdrId;
/** */
- private DeploymentMode depMode;
+ @Order(1)
+ DeploymentMode depMode;
/** */
- private String userVer;
+ @Order(2)
+ String userVer;
- /** */
- @Deprecated // Left for backward compatibility only.
- private boolean locDepOwner;
+ /**
+ * TODO Left for backward compatibility only.
+ * https://issues.apache.org/jira/browse/IGNITE-28063
+ * */
+ @Deprecated(forRemoval = true)
+ @Order(3)
+ boolean locDepOwner;
/** Node class loader participant map. */
@GridToStringInclude
- @GridDirectMap(keyType = UUID.class, valueType = IgniteUuid.class)
- private Map<UUID, IgniteUuid> participants;
+ @Order(4)
+ Map<UUID, IgniteUuid> participants;
/**
* Required by {@link Externalizable}.
@@ -136,107 +139,6 @@ public class GridDeploymentInfoBean implements Message,
GridDeploymentInfo, Exte
clsLdrId.equals(((GridDeploymentInfoBean)o).clsLdrId);
}
- /** {@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(clsLdrId))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeByte(depMode != null ?
(byte)depMode.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeBoolean(locDepOwner))
- return false;
-
- writer.incrementState();
-
- case 3:
- if (!writer.writeMap(participants,
MessageCollectionItemType.UUID, MessageCollectionItemType.IGNITE_UUID))
- return false;
-
- writer.incrementState();
-
- case 4:
- if (!writer.writeString(userVer))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- clsLdrId = reader.readIgniteUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- byte depModeOrd;
-
- depModeOrd = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- depMode = DeploymentMode.fromOrdinal(depModeOrd);
-
- reader.incrementState();
-
- case 2:
- locDepOwner = reader.readBoolean();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 3:
- participants = reader.readMap(MessageCollectionItemType.UUID,
MessageCollectionItemType.IGNITE_UUID, false);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 4:
- userVer = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 10;
