IGNITE-28021 Order should start from 0 at each class and subclass

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

@@ -26,11 +26,11 @@
  */
 public class CalciteErrorMessage extends ErrorMessage implements CalciteMessage {
     /** */
-    @Order(1)
+    @Order(0)
     UUID qryId;
 
     /** */
-    @Order(2)
+    @Order(1)
     long fragmentId;
 
     /** */

modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java

@@ -126,11 +126,16 @@ public class MessageProcessor extends AbstractProcessor {
      */
     private List<VariableElement> orderedFields(TypeElement type) {
         List<VariableElement> result = new ArrayList<>();
+        Map<String, List<VariableElement>> elMap = new HashMap<>();
 
         while (type != null) {
-            for (Element el: type.getEnclosedElements()) {
+            for (Element el : type.getEnclosedElements()) {
                 if (el.getAnnotation(Order.class) != null) {
-                    result.add((VariableElement)el);
+                    String enclosingName = el.getEnclosingElement().getSimpleName().toString();
+
+                    elMap.computeIfAbsent(enclosingName, k -> new ArrayList<>());
+
+                    elMap.get(enclosingName).add((VariableElement)el);
 
                     if (el.getModifiers().contains(Modifier.STATIC)) {
                         processingEnv.getMessager().printMessage(
@@ -140,6 +145,8 @@ private List<VariableElement> orderedFields(TypeElement type) {
                     }
 
                     validateEnumFieldMapping(type, el);
+
+                    result.add((VariableElement)el);
                 }
             }
 
@@ -148,14 +155,17 @@ private List<VariableElement> orderedFields(TypeElement type) {
             type = (TypeElement)superType;
         }
 
-        result.sort(Comparator.comparingInt(f -> f.getAnnotation(Order.class).value()));
+        for (Map.Entry entry : elMap.entrySet()) {
+            List<VariableElement> elList = (List<VariableElement>)entry.getValue();
+            elList.sort(Comparator.comparingInt(f -> f.getAnnotation(Order.class).value()));
 
-        for (int i = 0; i < result.size(); i++) {
-            if (result.get(i).getAnnotation(Order.class).value() != i) {
-                processingEnv.getMessager().printMessage(
-                    Diagnostic.Kind.ERROR,
-                    "Annotation @Order must be a sequence from 0 to " + (result.size() - 1),
-                    result.get(i));
+            for (int i = 0; i < elList.size(); i++) {
+                if (elList.get(i).getAnnotation(Order.class).value() != i) {
+                    processingEnv.getMessager().printMessage(
+                        Diagnostic.Kind.ERROR,
+                        "Annotation @Order must be a sequence from 0 to " + (elList.size() - 1),
+                        elList.get(i));
+                }
             }
         }
 

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java

@@ -29,7 +29,7 @@ public class GridIoSecurityAwareMessage extends GridIoMessage {
     public static final short TYPE_CODE = 174;
 
     /** Security subject ID that will be used during message processing on a remote node. */
-    @Order(8)
+    @Order(0)
     UUID secSubjId;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java

@@ -30,7 +30,7 @@
 public abstract class GridCacheGroupIdMessage extends GridCacheMessage {
     /** Cache group ID. */
     @GridToStringInclude
-    @Order(3)
+    @Order(0)
     public int grpId;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java

@@ -30,7 +30,7 @@
 public abstract class GridCacheIdMessage extends GridCacheMessage {
     /** Cache ID. */
     @GridToStringInclude
-    @Order(3)
+    @Order(0)
     public int cacheId;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java

@@ -28,11 +28,11 @@
  */
 public class GridChangeGlobalStateMessageResponse extends GridCacheMessage {
     /** Request id. */
-    @Order(3)
+    @Order(0)
     UUID reqId;
 
     /** Activation error message. */
-    @Order(4)
+    @Order(1)
     ErrorMessage errMsg;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java

@@ -37,28 +37,28 @@
 public class GridCacheTtlUpdateRequest extends GridCacheIdMessage {
     /** Entries keys. */
     @GridToStringInclude
-    @Order(4)
+    @Order(0)
     List<KeyCacheObject> keys;
 
     /** Entries versions. */
-    @Order(5)
+    @Order(1)
     List<GridCacheVersion> vers;
 
     /** Near entries keys. */
     @GridToStringInclude
-    @Order(6)
+    @Order(2)
     List<KeyCacheObject> nearKeys;
 
     /** Near entries versions. */
-    @Order(7)
+    @Order(3)
     List<GridCacheVersion> nearVers;
 
     /** New TTL. */
-    @Order(8)
+    @Order(4)
     long ttl;
 
     /** Topology version. */
-    @Order(9)
+    @Order(5)
     AffinityTopologyVersion topVer;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java

@@ -30,27 +30,27 @@
  */
 public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage {
     /** Future ID. */
-    @Order(7)
+    @Order(0)
     IgniteUuid futId;
 
     /** Mini future ID. */
-    @Order(8)
+    @Order(1)
     IgniteUuid miniId;
 
     /** Near transaction ID. */
-    @Order(9)
+    @Order(2)
     GridCacheVersion nearXidVer;
 
     /** Expected number of transactions on node. */
-    @Order(10)
+    @Order(3)
     int txNum;
 
     /** System transaction flag. */
-    @Order(11)
+    @Order(4)
     boolean sys;
 
     /** {@code True} if should check only tx on near node. */
-    @Order(12)
+    @Order(5)
     boolean nearTxCheck;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java

@@ -31,15 +31,15 @@
  */
 public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage implements IgniteTxStateAware {
     /** Future ID. */
-    @Order(7)
+    @Order(0)
     IgniteUuid futId;
 
     /** Mini future ID. */
-    @Order(8)
+    @Order(1)
     IgniteUuid miniId;
 
     /** Flag indicating if all remote transactions were prepared. */
-    @Order(9)
+    @Order(2)
     boolean success;
 
     /** Transient TX state. */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java

@@ -33,17 +33,17 @@
 public abstract class GridDistributedBaseMessage extends GridCacheIdMessage implements GridCacheDeployable,
     GridCacheVersionable {
     /** Lock or transaction version. */
-    @Order(4)
+    @Order(0)
     @GridToStringInclude
     public GridCacheVersion ver;
 
     /** Committed versions with order higher than one for this message (needed for commit ordering). */
-    @Order(5)
+    @Order(1)
     @GridToStringInclude
     @Nullable public Collection<GridCacheVersion> committedVers;
 
     /** Rolled back versions with order higher than one for this message (needed for commit ordering). */
-    @Order(6)
+    @Order(2)
     @GridToStringInclude
     @Nullable public Collection<GridCacheVersion> rolledbackVers;
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java

@@ -50,59 +50,59 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
     private static final int SKIP_READ_THROUGH_FLAG_MASK = 0x08;
 
     /** Sender node ID. */
-    @Order(7)
+    @Order(0)
     public UUID nodeId;
 
     /** Near transaction version. */
-    @Order(8)
+    @Order(1)
     public GridCacheVersion nearXidVer;
 
     /** Thread ID. */
-    @Order(9)
+    @Order(2)
     public long threadId;
 
     /** Future ID. */
-    @Order(10)
+    @Order(3)
     public IgniteUuid futId;
 
     /** Max wait timeout. */
-    @Order(11)
+    @Order(4)
     public long timeout;
 
     /** Indicates whether lock is obtained within a scope of transaction. */
-    @Order(12)
+    @Order(5)
     public boolean isInTx;
 
     /** Invalidate flag for transactions. */
-    @Order(13)
+    @Order(6)
     public boolean isInvalidate;
 
     /** Indicates whether implicit lock so for read or write operation. */
-    @Order(14)
+    @Order(7)
     public boolean isRead;
 
     /** Transaction isolation level. */
-    @Order(15)
+    @Order(8)
     public TransactionIsolation isolation;
 
     /** Key bytes for keys to lock. */
-    @Order(16)
+    @Order(9)
     public List<KeyCacheObject> keys;
 
     /** Array indicating whether value should be returned for a key. */
-    @Order(17)
+    @Order(10)
     @GridToStringInclude
     public boolean[] retVals;
 
     /** Key-bytes index. */
     protected int idx;
 
     /** Key count. */
-    @Order(18)
+    @Order(11)
     public int txSize;
 
     /** Additional flags. */
-    @Order(19)
+    @Order(12)
     public byte flags;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java

@@ -38,16 +38,16 @@
 @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
 public class GridDistributedLockResponse extends GridDistributedBaseMessage {
     /** Future ID. */
-    @Order(7)
+    @Order(0)
     public IgniteUuid futId;
 
     /** Error. */
-    @Order(8)
+    @Order(1)
     public ErrorMessage errMsg;
 
     /** Values. */
     @GridToStringInclude
-    @Order(9)
+    @Order(2)
     public List<CacheObject> vals;
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java

@@ -56,47 +56,47 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
     protected static final int STORE_ENABLED_FLAG_MASK = 0x20;
 
     /** Topology version. */
-    @Order(7)
+    @Order(0)
     public AffinityTopologyVersion topVer;
 
     /** Future ID. */
-    @Order(8)
+    @Order(1)
     public IgniteUuid futId;
 
     /** Thread ID. */
-    @Order(9)
+    @Order(2)
     public long threadId;
 
     /** Commit version. */
-    @Order(10)
+    @Order(3)
     public GridCacheVersion commitVer;
 
     /** Invalidate flag. */
-    @Order(11)
+    @Order(4)
     public boolean invalidate;
 
     /** Commit flag. */
-    @Order(12)
+    @Order(5)
     public boolean commit;
 
     /** Min version used as base for completed versions. */
-    @Order(13)
+    @Order(6)
     public GridCacheVersion baseVer;
 
     /** IO policy. */
-    @Order(14)
+    @Order(7)
     public byte plc;
 
     /** Task name hash. */
-    @Order(15)
+    @Order(8)
     public int taskNameHash;
 
     /** */
-    @Order(16)
+    @Order(9)
     public byte flags;
 
     /** Write synchronization mode. */
-    @Order(17)
+    @Order(10)
     public CacheWriteSynchronizationMode syncMode;
 
     /** Transient TX state. */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java

@@ -31,15 +31,15 @@
  */
 public class GridDistributedTxFinishResponse extends GridCacheMessage {
     /** */
-    @Order(3)
+    @Order(0)
     public GridCacheVersion txId;
 
     /** Future ID. */
-    @Order(4)
+    @Order(1)
     public IgniteUuid futId;
 
     /** Partition ID this message is targeted to. */
-    @Order(5)
+    @Order(2)
     public int part;
 
     /**