IGNITE-27895 Message SerDe based on field instead of method

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java

@@ -26,12 +26,12 @@
  */
 public class CalciteErrorMessage extends ErrorMessage implements CalciteMessage {
     /** */
-    @Order(value = 1, method = "queryId")
-    private UUID qryId;
+    @Order(1)
+    UUID qryId;
 
     /** */
     @Order(2)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
     public CalciteErrorMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java

@@ -31,7 +31,7 @@ public final class GenericValueMessage implements ValueMessage {
 
     /** */
     @Order(0)
-    private byte[] serialized;
+    byte[] serialized;
 
     /** */
     public GenericValueMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java

@@ -25,16 +25,16 @@
  */
 public class InboxCloseMessage implements CalciteMessage {
     /** */
-    @Order(value = 0, method = "queryId")
-    private UUID qryId;
+    @Order(0)
+    UUID qryId;
 
     /** */
     @Order(1)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
     @Order(2)
-    private long exchangeId;
+    long exchangeId;
 
     /** */
     public InboxCloseMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java

@@ -18,21 +18,12 @@
 package org.apache.ignite.internal.processors.query.calcite.message;
 
 import java.util.function.Supplier;
-import org.apache.ignite.internal.codegen.CalciteErrorMessageSerializer;
-import org.apache.ignite.internal.codegen.ColocationGroupSerializer;
-import org.apache.ignite.internal.codegen.FragmentDescriptionSerializer;
-import org.apache.ignite.internal.codegen.FragmentMappingSerializer;
-import org.apache.ignite.internal.codegen.GenericValueMessageSerializer;
-import org.apache.ignite.internal.codegen.InboxCloseMessageSerializer;
-import org.apache.ignite.internal.codegen.QueryBatchAcknowledgeMessageSerializer;
-import org.apache.ignite.internal.codegen.QueryBatchMessageSerializer;
-import org.apache.ignite.internal.codegen.QueryCloseMessageSerializer;
-import org.apache.ignite.internal.codegen.QueryStartRequestSerializer;
-import org.apache.ignite.internal.codegen.QueryStartResponseSerializer;
-import org.apache.ignite.internal.codegen.QueryTxEntrySerializer;
 import org.apache.ignite.internal.processors.query.calcite.metadata.ColocationGroup;
+import org.apache.ignite.internal.processors.query.calcite.metadata.ColocationGroupSerializer;
 import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription;
+import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescriptionSerializer;
 import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMapping;
+import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMappingSerializer;
 import org.apache.ignite.plugin.extensions.communication.MessageSerializer;
 
 /**

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java

@@ -25,20 +25,20 @@
  */
 public class QueryBatchAcknowledgeMessage implements ExecutionContextAware {
     /** */
-    @Order(value = 0, method = "queryId")
-    private UUID qryId;
+    @Order(0)
+    UUID qryId;
 
     /** */
     @Order(1)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
     @Order(2)
-    private long exchangeId;
+    long exchangeId;
 
     /** */
     @Order(3)
-    private int batchId;
+    int batchId;
 
     /** */
     public QueryBatchAcknowledgeMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java

@@ -29,31 +29,31 @@
  */
 public class QueryBatchMessage implements MarshalableMessage, ExecutionContextAware {
     /** */
-    @Order(value = 0, method = "queryId")
-    private UUID qryId;
+    @Order(0)
+    UUID qryId;
 
     /** */
     @Order(1)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
     @Order(2)
-    private long exchangeId;
+    long exchangeId;
 
     /** */
     @Order(3)
-    private int batchId;
+    int batchId;
 
     /** */
     @Order(4)
-    private boolean last;
+    boolean last;
 
     /** */
     private List<Object> rows;
 
     /** */
-    @Order(value = 5, method = "messageRows")
-    private List<ValueMessage> mRows;
+    @Order(5)
+    List<ValueMessage> mRows;
 
     /** */
     public QueryBatchMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java

@@ -25,8 +25,8 @@
  */
 public class QueryCloseMessage implements CalciteMessage {
     /** */
-    @Order(value = 0, method = "queryId")
-    private UUID qryId;
+    @Order(0)
+    UUID qryId;
 
     /** */
     public QueryCloseMessage() {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java

@@ -34,50 +34,50 @@
 public class QueryStartRequest implements MarshalableMessage, ExecutionContextAware {
     /** */
     @Order(0)
-    private String schema;
+    String schema;
 
     /** */
-    @Order(value = 1, method = "queryId")
-    private UUID qryId;
+    @Order(1)
+    UUID qryId;
 
     /** */
-    @Order(value = 2, method = "originatingQueryId")
-    private long originatingQryId;
+    @Order(2)
+    long originatingQryId;
 
     /** */
-    @Order(value = 3, method = "topologyVersion")
-    private AffinityTopologyVersion ver;
+    @Order(3)
+    AffinityTopologyVersion ver;
 
     /** */
-    @Order(value = 4, method = "fragmentDescription")
-    private FragmentDescription fragmentDesc;
+    @Order(4)
+    FragmentDescription fragmentDesc;
 
     /** */
-    @Order(value = 5)
-    private String root;
+    @Order(5)
+    String root;
 
     /** Total count of fragments in query for this node. */
-    @Order(value = 6, method = "totalFragmentsCount")
-    private int totalFragmentsCnt;
+    @Order(6)
+    int totalFragmentsCnt;
 
     /** */
     private @Nullable Object[] params;
 
     /** */
-    @Order(value = 7, method = "parametersBytes")
-    private @Nullable byte[] paramsBytes;
+    @Order(7)
+    @Nullable byte[] paramsBytes;
 
     /** */
-    @Order(value = 8)
-    private long timeout;
+    @Order(8)
+    long timeout;
 
     /** */
-    @Order(value = 9, method = "queryTransactionEntries")
-    private @Nullable Collection<QueryTxEntry> qryTxEntries;
+    @Order(9)
+    @Nullable Collection<QueryTxEntry> qryTxEntries;
 
     /** */
-    @Order(value = 10, method = "applicationAttributes")
-    private @Nullable Map<String, String> appAttrs;
+    @Order(10)
+    @Nullable Map<String, String> appAttrs;
 
     /** */
     @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java

@@ -27,16 +27,16 @@
  */
 public class QueryStartResponse implements CalciteMessage {
     /** */
-    @Order(value = 0, method = "queryId")
-    private UUID qryId;
+    @Order(0)
+    UUID qryId;
 
     /** */
     @Order(1)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
-    @Order(value = 2, method = "errorMessage")
-    private @Nullable ErrorMessage errMsg;
+    @Order(2)
+    @Nullable ErrorMessage errMsg;
 
     /** */
     public QueryStartResponse() {}

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java

@@ -41,19 +41,19 @@
 public class QueryTxEntry implements CalciteMessage {
     /** Cache id. */
     @Order(0)
-    private int cacheId;
+    int cacheId;
 
     /** Entry key. */
     @Order(1)
-    private KeyCacheObject key;
+    KeyCacheObject key;
 
     /** Entry value. */
-    @Order(value = 2, method = "value")
-    private CacheObject val;
+    @Order(2)
+    CacheObject val;
 
     /** Entry version. */
-    @Order(value = 3, method = "version")
-    private GridCacheVersion ver;
+    @Order(3)
+    GridCacheVersion ver;
 
     /**
      * Empty constructor.

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java

@@ -43,12 +43,12 @@
 /** */
 public class ColocationGroup implements CalciteMessage {
     /** */
-    @Order(value = 0, method = "sourceIds")
-    private long[] srcIds;
+    @Order(0)
+    long[] srcIds;
 
     /** */
     @Order(1)
-    private List<UUID> nodeIds;
+    List<UUID> nodeIds;
 
     /** */
     private List<List<UUID>> assignments;
@@ -60,8 +60,8 @@ public class ColocationGroup implements CalciteMessage {
     private boolean primaryAssignment;
 
     /** Marshalled assignments serialization call holder. */
-    @Order(2)
-    private int[] marshalledAssignments;
+    @Order(value = 2, method = "marshalledAssignments")
+    int[] marshalledAssignments;
 
     /** */
     public static ColocationGroup forNodes(List<UUID> nodeIds) {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java

@@ -32,19 +32,19 @@
 public class FragmentDescription implements MarshalableMessage {
     /** */
     @Order(0)
-    private long fragmentId;
+    long fragmentId;
 
     /** */
     @Order(1)
-    private FragmentMapping mapping;
+    FragmentMapping mapping;
 
     /** */
     @Order(2)
-    private Map<Long, UUIDCollectionMessage> remoteSources0;
+    Map<Long, UUIDCollectionMessage> remoteSources0;
 
     /** */
     @Order(3)
-    private ColocationGroup target;
+    ColocationGroup target;
 
     /** */
     private Map<Long, List<UUID>> remoteSources;

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java

@@ -36,8 +36,8 @@
  */
 public class FragmentMapping implements CalciteMessage {
     /** */
-    @Order(value = 0, method = "colocationGroups")
-    private List<ColocationGroup> colocationGrps;
+    @Order(0)
+    List<ColocationGroup> colocationGrps;
 
     /** */
     public FragmentMapping() {

modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java

@@ -1140,10 +1140,12 @@ private TestObject(int id) {
     @SuppressWarnings("PackageVisibleField")
     private static class TestObjectField implements Serializable {
         /** */
-        @GridToStringInclude final int a;
+        @GridToStringInclude
+        final int a;
 
         /** */
-        @GridToStringInclude final String b;
+        @GridToStringInclude
+        final String b;
 
         /**
          * @param a A.