Merge pull request #78 from dominicfreeston/strip-nils-only-strip-nils

Update strip-nils to only strip nils, not empty strings, maps, etc
metosin · Aug 9, 2024 · dae5171 · dae5171
2 parents 16a826a + f8ef2ca
commit dae5171
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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
@@ -57,6 +57,9 @@
     (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}))))))
+    (testing ":strip-nils doesn't strip other empties"
+      (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"