(ignite-3) branch main updated: IGNITE-26319 Use correct field name for writing marshallable field (#6500)

[rpuch]

This is an automated email from the ASF dual-hosted git repository.

rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 1c162291bd9 IGNITE-26319 Use correct field name for writing 
marshallable field (#6500)
1c162291bd9 is described below

commit 1c162291bd9a696e04861fc71731d3feb04c1ad0
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Wed Aug 27 15:13:23 2025 +0400

    IGNITE-26319 Use correct field name for writing marshallable field (#6500)
---
 .../serialization/MessageWriterMethodResolver.java |  1 +
 ...erializatersAndDeserializersFieldNamesTest.java | 67 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git 
a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/serialization/MessageWriterMethodResolver.java
 
b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/serialization/MessageWriterMethodResolver.java
index 73b8874a651..05c04ffb02d 100644
--- 
a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/serialization/MessageWriterMethodResolver.java
+++ 
b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/serialization/MessageWriterMethodResolver.java
@@ -78,6 +78,7 @@ class MessageWriterMethodResolver {
 
         if (getter.getAnnotation(Marshallable.class) != null) {
             getterName = addByteArrayPostfix(getterName);
+            propertyName = addByteArrayPostfix(propertyName);
             return CodeBlock.builder()
                     .add("writeByteArray($S, message.$L())", propertyName, 
getterName)
                     .build();
diff --git 
a/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/SerializatersAndDeserializersFieldNamesTest.java
 
b/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/SerializatersAndDeserializersFieldNamesTest.java
new file mode 100644
index 00000000000..e8360aa3fc8
--- /dev/null
+++ 
b/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/SerializatersAndDeserializersFieldNamesTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.network.processor.tests;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.ignite.internal.network.serialization.MessageReader;
+import org.apache.ignite.internal.network.serialization.MessageWriter;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class SerializatersAndDeserializersFieldNamesTest extends 
BaseIgniteAbstractTest {
+    private final TestMessagesFactory factory = new TestMessagesFactory();
+
+    @Test
+    void marshallableFieldIsWrittenWithCorrectName() {
+        MessageWriter writer = mock(MessageWriter.class);
+
+        when(writer.isHeaderWritten()).thenReturn(true);
+        when(writer.state()).thenReturn(0);
+
+        
WithMarshallableSerializer.INSTANCE.writeMessage(messageWithMarshallable(), 
writer);
+
+        verify(writer).writeByteArray(eq("objectsByteArray"), any());
+    }
+
+    @Test
+    void marshallableFieldIsReadWithCorrectName() {
+        MessageReader reader = mock(MessageReader.class);
+
+        when(reader.beforeMessageRead()).thenReturn(true);
+        when(reader.state()).thenReturn(0);
+
+        WithMarshallableDeserializer deserializer = new 
WithMarshallableDeserializer(factory);
+        deserializer.readMessage(reader);
+
+        verify(reader).readByteArray(eq("objectsByteArray"));
+    }
+
+    private WithMarshallable messageWithMarshallable() {
+        return factory.withMarshallable()
+                .objects(new Object[]{"a", "b"})
+                .build();
+    }
+}