This is an automated email from the ASF dual-hosted git repository.
sergeychugunov 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 e1ed0953bdf IGNITE-26015 Use MessageSerializer for
UserManagementOperationFinishedMessage (#12218)
e1ed0953bdf is described below
commit e1ed0953bdfeb1962ab807327f0d01a1c852b3e1
Author: Dmitry Werner <[email protected]>
AuthorDate: Fri Jul 25 18:39:39 2025 +0500
IGNITE-26015 Use MessageSerializer for
UserManagementOperationFinishedMessage (#12218)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../UserManagementOperationFinishedMessage.java | 73 +++++-----------------
2 files changed, 18 insertions(+), 58 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 bc1e0283134..0baf550c7fd 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
@@ -36,6 +36,7 @@ import
org.apache.ignite.internal.codegen.MissingMappingResponseMessageSerialize
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateRequestMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateResponseMessageSerializer;
+import
org.apache.ignite.internal.codegen.UserManagementOperationFinishedMessageSerializer;
import org.apache.ignite.internal.codegen.WalStateAckMessageSerializer;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest;
import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
@@ -317,7 +318,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)127,
GridNearAtomicSingleUpdateFilterRequest::new);
factory.register((short)128, CacheGroupAffinityMessage::new);
factory.register((short)129, WalStateAckMessage::new, new
WalStateAckMessageSerializer());
- factory.register((short)130,
UserManagementOperationFinishedMessage::new);
+ factory.register((short)130,
UserManagementOperationFinishedMessage::new, new
UserManagementOperationFinishedMessageSerializer());
factory.register((short)131, UserAuthenticateRequestMessage::new, new
UserAuthenticateRequestMessageSerializer());
factory.register((short)132, UserAuthenticateResponseMessage::new, new
UserAuthenticateResponseMessageSerializer());
factory.register((short)133, ClusterMetricsUpdateMessage::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
index 6ab558be18f..1add3488e49 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.authentication;
-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;
/**
* Message indicating that user operation is finished locally on the node.
@@ -30,9 +28,11 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class UserManagementOperationFinishedMessage implements Message {
/** Operation Id. */
+ @Order(value = 0, method = "operationId")
private IgniteUuid opId;
/** Error message. */
+ @Order(value = 1, method = "errorMessage")
private String errorMsg;
/**
@@ -52,12 +52,19 @@ public class UserManagementOperationFinishedMessage
implements Message {
}
/**
- * @return Operation ID,
+ * @return Operation ID.
*/
public IgniteUuid operationId() {
return opId;
}
+ /**
+ * @param opId New operation ID.
+ */
+ public void operationId(IgniteUuid opId) {
+ this.opId = opId;
+ }
+
/**
* @return Success flag.
*/
@@ -72,59 +79,11 @@ public class UserManagementOperationFinishedMessage
implements Message {
return errorMsg;
}
- /** {@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.writeString(errorMsg))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeIgniteUuid(opId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- errorMsg = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- opId = reader.readIgniteUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
+ /**
+ * @param errorMsg New error message.
+ */
+ public void errorMessage(String errorMsg) {
+ this.errorMsg = errorMsg;
}
/** {@inheritDoc} */
