Update strip-nils to only strip nils, not empty strings, maps, etc

metosin · Jul 11, 2024 · c8b12a8 · c8b12a8
1 parent 16a826a
commit c8b12a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/clj/jsonista/core.clj b/src/clj/jsonista/core.clj
@@ -154,7 +154,7 @@
                    (:order-by-keys options) (.configure SerializationFeature/ORDER_MAP_ENTRIES_BY_KEYS true)
                    (:pretty options) (.enable SerializationFeature/INDENT_OUTPUT)
                    (:bigdecimals options) (.enable DeserializationFeature/USE_BIG_DECIMAL_FOR_FLOATS)
-                   (:strip-nils options) (.setSerializationInclusion JsonInclude$Include/NON_EMPTY)
+                   (:strip-nils options) (.setSerializationInclusion JsonInclude$Include/NON_NULL)
                    (:do-not-fail-on-empty-beans options) (.disable SerializationFeature/FAIL_ON_EMPTY_BEANS)
                    (:escape-non-ascii options) (doto (-> .getFactory (.enable JsonGenerator$Feature/ESCAPE_NON_ASCII)))))]
      (doseq [module (:modules options)]

diff --git a/test/jsonista/core_test.clj b/test/jsonista/core_test.clj
@@ -55,8 +55,8 @@
     (testing ":pretty"
       (is (= "{\n  \"hello\" : \"world\"\n}" (j/write-value-as-string data (j/object-mapper {:pretty true})))))
     (testing ":strip-nils"
-      (let [data-with-nils {:hello "world" :goodbye nil}]
-        (is (= "{\"hello\":\"world\"}" (j/write-value-as-string data-with-nils (j/object-mapper {:strip-nils true}))))))
+      (let [data-with-nils {:hello "world" :goodbye nil :empty-string "" :empty-map {}}]
+        (is (= "{\"hello\":\"world\",\"empty-string\":\"\",\"empty-map\":{}}" (j/write-value-as-string data-with-nils (j/object-mapper {:strip-nils true}))))))
     (testing ":escape-non-ascii"
       (is (= "{\"imperial-money\":\"\\u00A3\"}" (j/write-value-as-string {:imperial-money "£"} (j/object-mapper {:escape-non-ascii true})))))
     (testing ":date-format"