Merge pull request #30729 from vespa-engine/bjorncs/json

Strip trailing zeros when serializing to json

1 files changed, 4 insertions, 2 deletions

diff --git a/vespajlib/src/main/java/ai/vespa/json/Json.java b/vespajlib/src/main/java/ai/vespa/json/Json.java
index 5cb04e30e56..fef6e2e988e 100644
--- a/vespajlib/src/main/java/ai/vespa/json/Json.java
+++ b/vespajlib/src/main/java/ai/vespa/json/Json.java
@@ -219,7 +219,7 @@ public class Json implements Iterable<Json> {
                 SlimeUtils.copyObject(object.cursor, cursor.addObject()); return this;
             }
             public Builder.Array add(Json json) {
-                SlimeUtils.addValue(json.inspector, cursor.addObject()); return this;
+                SlimeUtils.addValue(json.inspector, cursor); return this;
             }
             public Builder.Array add(Json.Builder builder) { return add(builder.build()); }
 
@@ -258,7 +258,9 @@ public class Json implements Iterable<Json> {
             public Builder.Object set(String field, long value) { cursor.setLong(field, value); return this; }
             public Builder.Object set(String field, double value) { cursor.setDouble(field, value); return this; }
             public Builder.Object set(String field, boolean value) { cursor.setBool(field, value); return this; }
-            public Builder.Object set(String field, BigDecimal value) { cursor.setString(field, value.toPlainString()); return this; }
+            public Builder.Object set(String field, BigDecimal value) {
+                cursor.setString(field, value.stripTrailingZeros().toPlainString()); return this;
+            }
             public Builder.Object set(String field, Instant timestamp) { cursor.setString(field, timestamp.toString()); return this; }
         }