Merge pull request #832 from scireum/feature/aha/json-amount-fix

BREAKING CHANGE: Uses proper machine formats when outputting JSON.
scireum · Apr 26, 2021 · 078e7d3 · 078e7d3
2 parents 97c2a92 + 7bc458a
commit 078e7d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <description>Provides a modern and scalable web server as SIRIUS module</description>
 
     <properties>
-        <sirius.kernel>dev-21.1</sirius.kernel>
+        <sirius.kernel>dev-22.0.1</sirius.kernel>
     </properties>
 
     <repositories>

diff --git a/src/main/java/sirius/web/services/JSONStructuredOutput.java b/src/main/java/sirius/web/services/JSONStructuredOutput.java
@@ -10,9 +10,11 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import sirius.kernel.commons.Amount;
 import sirius.kernel.commons.Strings;
 import sirius.kernel.health.Exceptions;
 import sirius.kernel.health.HandledException;
+import sirius.kernel.nls.NLS;
 import sirius.kernel.xml.AbstractStructuredOutput;
 import sirius.kernel.xml.Attribute;
 import sirius.kernel.xml.StructuredOutput;
@@ -241,8 +243,10 @@ private void writePlainProperty(String name, Object data) {
                 writer.write("null");
             } else if (data instanceof Boolean || data instanceof Number) {
                 writer.write(data.toString());
+            } else if (data instanceof Amount) {
+                writer.write(((Amount)data).toMachineString());
             } else {
-                writeString(data.toString());
+                writeString(transformToStringRepresentation(data));
             }
         } catch (ClosedChannelException e) {
             throw handleClosedChannel(e);