Merge pull request #37129 from quarkusio/dependabot/maven/org.jetbrai…

…ns.kotlinx-kotlinx-serialization-json-1.6.1 Bump org.jetbrains.kotlinx:kotlinx-serialization-json from 1.6.0 to 1.6.1
quarkusio · Nov 27, 2023 · 670b43c · 670b43c
2 parents 07a38eb + 1ce610c
commit 670b43c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -161,7 +161,7 @@
         <kotlin.version>1.9.21</kotlin.version>
         <kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
         <azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
-        <kotlin-serialization.version>1.6.0</kotlin-serialization.version>
+        <kotlin-serialization.version>1.6.1</kotlin-serialization.version>
         <dekorate.version>4.1.0</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.0</awaitility.version>

diff --git a/...ain/java/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonConfig.java b/...ain/java/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonConfig.java
@@ -129,6 +129,12 @@ public class JsonConfig {
     @ConfigItem(defaultValue = "false")
     public boolean decodeEnumsCaseInsensitive = false;
 
+    /**
+     * Specifies if trailing comma is allowed.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean allowTrailingComma = false;
+
     @Override
     public String toString() {
         return new StringJoiner(", ", JsonConfig.class.getSimpleName() + "[", "]")
@@ -144,6 +150,7 @@ public String toString() {
                 .add("allowSpecialFloatingPointValues=" + allowSpecialFloatingPointValues)
                 .add("useAlternativeNames=" + useAlternativeNames)
                 .add("decodeEnumsCaseInsensitive=" + decodeEnumsCaseInsensitive)
+                .add("allowTrailingComma=" + allowTrailingComma)
                 .toString();
     }
 }
diff --git a/...n/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt b/...n/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt
@@ -38,6 +38,7 @@ class JsonProducer {
         useAlternativeNames = configuration.json.useAlternativeNames
         useArrayPolymorphism = configuration.json.useArrayPolymorphism
         decodeEnumsCaseInsensitive = configuration.json.decodeEnumsCaseInsensitive
+        allowTrailingComma = configuration.json.allowTrailingComma
 
         configuration.json.namingStrategy.ifPresent { strategy ->
             loadStrategy(this, strategy, this@JsonProducer)