Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
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;
Expand Down Expand Up @@ -386,7 +387,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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,15 @@
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.
Expand All @@ -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}.
Expand Down Expand Up @@ -136,107 +139,6 @@ public GridDeploymentInfoBean(GridDeploymentInfo dep) {
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;
Expand Down
Loading