#698 JsonHelper: Alphabetical sorting of fields in "pretty print" mode

javalite · Mar 16, 2018 · a463b7d · a463b7d
1 parent 314e415
commit a463b7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/javalite-common/src/main/java/org/javalite/common/JsonHelper.java b/javalite-common/src/main/java/org/javalite/common/JsonHelper.java
@@ -87,7 +87,7 @@ public static String toJsonString(Object val) {
      */
     public static String toJsonString(Object val, boolean pretty) {
         try {
-            return pretty ? mapper.writerWithDefaultPrettyPrinter().writeValueAsString(val) : mapper.writeValueAsString(val);
+            return pretty ? mapper.writerWithDefaultPrettyPrinter().with(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS).writeValueAsString(val) : mapper.writeValueAsString(val);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/javalite-common/src/test/java/org/javalite/common/JsonHelperSpec.java b/javalite-common/src/test/java/org/javalite/common/JsonHelperSpec.java
@@ -44,12 +44,15 @@ public void setLastName(String lastName) {
 
     @Test
     public void shouldConvertObject2JSONPrettyPrintString() {
-        Map m = JsonHelper.toMap("{ \"name\" : \"John\", \"age\": 22 }");
-        String pretty = "{" + System.lineSeparator() +
-                "  \"name\" : \"John\"," + System.lineSeparator() +
-                "  \"age\" : 22" + System.lineSeparator() +
-                "}";
-        a(toJsonString(m, true)).shouldBeEqual(pretty);
+        Map m = JsonHelper.toMap("{ \"firstName\" : \"John\",\"lastName\" : \"Smith\", \"age\": 22, \"1\": 1 }");
+        String pretty = toJsonString(m, true);
+        a(pretty).shouldBeEqual("{" + System.lineSeparator() +
+                "  \"1\" : 1," + System.lineSeparator() +
+                "  \"age\" : 22," + System.lineSeparator() +
+                "  \"firstName\" : \"John\"," + System.lineSeparator() +
+                "  \"lastName\" : \"Smith\"" + System.lineSeparator() +
+                "}"
+        );
     }
 
     @Test