Model file: match key order with other SDKs

Author: greenrobot-team

objectbox/lib/src/modelinfo/modelentity.dart

@@ -181,8 +181,8 @@ class ModelEntity {
     ret['id'] = id.toString();
     ret['lastPropertyId'] = lastPropertyId.toString();
     ret['name'] = name;
-    if (flags != 0) ret['flags'] = flags;
     if (externalName != null) ret['externalName'] = externalName;
+    if (flags != 0) ret['flags'] = flags;
     ret['properties'] =
         properties.map((p) => p.toMap(forModelJson: forModelJson)).toList();
     ret['relations'] =

objectbox/lib/src/modelinfo/modelproperty.dart

@@ -145,11 +145,11 @@ class ModelProperty {
     final ret = <String, dynamic>{};
     ret['id'] = id.toString();
     ret['name'] = name;
+    if (indexId != null) ret['indexId'] = indexId!.toString();
     ret['type'] = type;
     if (externalType != null) ret['externalType'] = externalType;
     if (externalName != null) ret['externalName'] = externalName;
     if (flags != 0) ret['flags'] = flags;
-    if (indexId != null) ret['indexId'] = indexId!.toString();
     if (relationTarget != null) ret['relationTarget'] = relationTarget;
     if (!forModelJson) {
       if (_dartFieldType != null) {

objectbox/lib/src/modelinfo/modelrelation.dart

@@ -87,13 +87,13 @@ class ModelRelation {
     final ret = <String, dynamic>{};
     ret['id'] = id.toString();
     ret['name'] = name;
-    if (_targetId != null) ret['targetId'] = _targetId.toString();
     if (externalType != null) {
       ret['externalType'] = externalType;
     }
     if (externalName != null) {
       ret['externalName'] = externalName;
     }
+    if (_targetId != null) ret['targetId'] = _targetId.toString();
     if (!forModelJson) {
       ret['targetName'] = _targetName;
       ret['uidRequest'] = uidRequest;

objectbox_test/test/objectbox-model.json

@@ -63,86 +63,86 @@
         {
           "id": "15:5960097736918862689",
           "name": "uByte",
+          "indexId": "1:759265819613755228",
           "type": 2,
-          "flags": 40,
-          "indexId": "1:759265819613755228"
+          "flags": 40
         },
         {
           "id": "16:3014870337091941693",
           "name": "uShort",
+          "indexId": "2:3731424852781354288",
           "type": 3,
-          "flags": 40,
-          "indexId": "2:3731424852781354288"
+          "flags": 40
         },
         {
           "id": "17:3004362051550241897",
           "name": "uChar",
+          "indexId": "3:1180301620695216647",
           "type": 4,
-          "flags": 40,
-          "indexId": "3:1180301620695216647"
+          "flags": 40
         },
         {
           "id": "18:1083874867412561588",
           "name": "uInt",
+          "indexId": "4:9159391309201422019",
           "type": 5,
-          "flags": 40,
-          "indexId": "4:9159391309201422019"
+          "flags": 40
         },
         {
           "id": "19:1849261948480372113",
           "name": "uString",
+          "indexId": "5:7090314366957370493",
           "type": 9,
-          "flags": 2080,
-          "indexId": "5:7090314366957370493"
+          "flags": 2080
         },
         {
           "id": "20:1700905145011245158",
           "name": "uLong",
+          "indexId": "6:9146355272521890356",
           "type": 6,
-          "flags": 40,
-          "indexId": "6:9146355272521890356"
+          "flags": 40
         },
         {
           "id": "21:1256214340403371310",
           "name": "iByte",
+          "indexId": "7:2597915862881161952",
           "type": 2,
-          "flags": 8,
-          "indexId": "7:2597915862881161952"
+          "flags": 8
         },
         {
           "id": "22:5768208836201983752",
           "name": "iShort",
+          "indexId": "8:5900854653402683567",
           "type": 3,
-          "flags": 8,
-          "indexId": "8:5900854653402683567"
+          "flags": 8
         },
         {
           "id": "23:2550226115516189529",
           "name": "iChar",
+          "indexId": "9:6832522351412488843",
           "type": 4,
-          "flags": 8,
-          "indexId": "9:6832522351412488843"
+          "flags": 8
         },
         {
           "id": "24:8654682464442924778",
           "name": "iInt",
+          "indexId": "10:7301436684067319059",
           "type": 5,
-          "flags": 8,
-          "indexId": "10:7301436684067319059"
+          "flags": 8
         },
         {
           "id": "25:6667369331692110338",
           "name": "iString",
+          "indexId": "11:4395163045094957195",
           "type": 9,
-          "flags": 2048,
-          "indexId": "11:4395163045094957195"
+          "flags": 2048
         },
         {
           "id": "26:3059114515142777989",
           "name": "iLong",
+          "indexId": "12:5335419474465474748",
           "type": 6,
-          "flags": 8,
-          "indexId": "12:5335419474465474748"
+          "flags": 8
         },
         {
           "id": "27:3303202230649375862",
@@ -167,17 +167,17 @@
         {
           "id": "31:2809605701582877706",
           "name": "relAId",
+          "indexId": "16:2470631863336693263",
           "type": 11,
           "flags": 520,
-          "indexId": "16:2470631863336693263",
           "relationTarget": "RelatedEntityA"
         },
         {
           "id": "32:8664662867703418562",
           "name": "relBId",
+          "indexId": "17:1880235110135739998",
           "type": 11,
           "flags": 520,
-          "indexId": "17:1880235110135739998",
           "relationTarget": "RelatedEntityB"
         },
         {
@@ -193,9 +193,9 @@
         {
           "id": "35:1724663621433823504",
           "name": "replaceLong",
+          "indexId": "20:4846837430056399798",
           "type": 6,
-          "flags": 32808,
-          "indexId": "20:4846837430056399798"
+          "flags": 32808
         }
       ],
       "relations": [
@@ -220,9 +220,9 @@
         {
           "id": "2:1699553834502252174",
           "name": "value",
+          "indexId": "18:8736709610628523744",
           "type": 6,
-          "flags": 40,
-          "indexId": "18:8736709610628523744"
+          "flags": 40
         }
       ],
       "relations": []
@@ -251,9 +251,9 @@
         {
           "id": "4:4770420600931409867",
           "name": "relBId",
+          "indexId": "13:4152155418078636653",
           "type": 11,
           "flags": 520,
-          "indexId": "13:4152155418078636653",
           "relationTarget": "RelatedEntityB"
         }
       ],
@@ -283,17 +283,17 @@
         {
           "id": "4:2040461616972321497",
           "name": "relAId",
+          "indexId": "14:9134773468347164958",
           "type": 11,
           "flags": 520,
-          "indexId": "14:9134773468347164958",
           "relationTarget": "RelatedEntityA"
         },
         {
           "id": "5:4421486877612415347",
           "name": "relBId",
+          "indexId": "15:1869174197194604432",
           "type": 11,
           "flags": 520,
-          "indexId": "15:1869174197194604432",
           "relationTarget": "RelatedEntityB"
         }
       ],
@@ -427,9 +427,9 @@
         {
           "id": "3:4230259646478779567",
           "name": "parentId",
+          "indexId": "19:3009172190024929732",
           "type": 11,
           "flags": 520,
-          "indexId": "19:3009172190024929732",
           "relationTarget": "TreeNode"
         }
       ],
@@ -684,24 +684,24 @@
         {
           "id": "3:1316805984869681992",
           "name": "floatVector",
+          "indexId": "21:979541882805401029",
           "type": 28,
-          "flags": 8,
-          "indexId": "21:979541882805401029"
+          "flags": 8
         },
         {
           "id": "4:2308158275756661586",
           "name": "relId",
+          "indexId": "22:6527315700526716999",
           "type": 11,
           "flags": 520,
-          "indexId": "22:6527315700526716999",
           "relationTarget": "RelatedNamedEntity"
         },
         {
           "id": "5:1476994841170736323",
           "name": "floatVectorGeoCoordinates",
+          "indexId": "23:6649884639373473085",
           "type": 28,
-          "flags": 8,
-          "indexId": "23:6649884639373473085"
+          "flags": 8
         }
       ],
       "relations": []
@@ -762,9 +762,9 @@
         {
           "id": "2:313640065593441165",
           "name": "mongoIdEntities",
-          "targetId": "16:5931645853908059165",
           "externalType": 124,
-          "externalName": "my-mongo-rel"
+          "externalName": "my-mongo-rel",
+          "targetId": "16:5931645853908059165"
         }
       ]
     }