From 833494346e2ff273ab2a8546709dc0e1f821bf27 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sat, 13 Apr 2024 13:58:40 +0200 Subject: [PATCH] fix(serialize-json): make JsonWriter.omitQuotes configurable --- .../jfronny/commons/serialize/json/JsonWriter.java | 11 ++++++++++- .../java/io/gitlab/jfronny/muscript/json/JsonLib.java | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java b/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java index e0233e0..978fc08 100644 --- a/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java +++ b/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java @@ -28,7 +28,7 @@ public class JsonWriter extends SerializeWriter impleme private boolean omitQuotes = false; private String deferredName; - private List deferredComments = new LinkedList<>(); + private final List deferredComments = new LinkedList<>(); public JsonWriter(Writer out) { this.out = Objects.requireNonNull(out, "out == null"); @@ -74,6 +74,15 @@ public class JsonWriter extends SerializeWriter impleme return newline; } + public JsonWriter setOmitQuotes(boolean omitQuotes) { + this.omitQuotes = omitQuotes; + return this; + } + + public boolean isOmitQuotes() { + return omitQuotes; + } + @Override public JsonWriter beginArray() throws IOException { writeDeferredName(); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/JsonLib.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/JsonLib.java index 7cdebe9..6a3e2d9 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/JsonLib.java +++ b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/JsonLib.java @@ -27,7 +27,8 @@ public class JsonLib { .setNewline("") .setIndent("") .setSerializeSpecialFloatingPointValues(true) - .setSerializeNulls(true))); + .setSerializeNulls(true) + .setOmitQuotes(false))); } } @@ -45,7 +46,8 @@ public class JsonLib { .setNewline("\n") .setIndent(" ") .setSerializeSpecialFloatingPointValues(true) - .setSerializeNulls(true))); + .setSerializeNulls(true) + .setOmitQuotes(true))); } } }