default json key ordering -> crud, distinct

Author: inzapp

.idea/workspace.xml

@@ -1,7 +1,7 @@
 {
     "CRUD": ["SELECT"],
-    "COLUMN": ["VAL"],
     "DISTINCT": ["TRUE"],
+    "COLUMN": ["VAL"],
     "TABLE": ["((SELECT FIELD1 AS VAL FROM TABLE1 WHERE CONDITION1 = 'CONDITION1') UNION ALL (SELECT FIELD2 FROM TABLE1 WHERE CONDITION2 = 'CONDITION2') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3')) T"],
     "TABLE ALIAS": ["T"],
     "TABLE SUB QUERY 1": ["((SELECT FIELD1 AS VAL FROM TABLE1 WHERE CONDITION1 = 'CONDITION1') UNION ALL (SELECT FIELD2 FROM TABLE1 WHERE CONDITION2 = 'CONDITION2') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3') UNION ALL (SELECT FIELD3 FROM TABLE3 WHERE CONDITION3 = 'CONDITION3'))"],

out/production/SqlToJsonParser/com/inzapp/sqlToJsonParser/core/json/JsonManager.class

@@ -22,11 +22,22 @@ public class JsonManager {
      */
     protected JsonManager() {
         this.json = new JSONObject((Comparator<String>) (a, b) -> {
-            if(a.equals(JsonKey.CRUD) && b.equals(JsonKey.CRUD))
+            String jsonKey;
+
+            jsonKey = JsonKey.CRUD;
+            if(a.equals(jsonKey) && b.equals(jsonKey))
+                return 0;
+            else if(a.equals(jsonKey))
+                return -1;
+            else if(b.equals(jsonKey))
+                return 1;
+
+            jsonKey = JsonKey.DISTINCT;
+            if(a.equals(jsonKey) && b.equals(jsonKey))
                 return 0;
-            else if(a.equals(JsonKey.CRUD))
+            else if(a.equals(jsonKey))
                 return -1;
-            else if(b.equals(JsonKey.CRUD))
+            else if(b.equals(jsonKey))
                 return 1;
 
             return a.compareTo(b);