When JsonInclude.NON_DEFAULT is configured, at least NON_EMPTY should be configured. (#4467)

Author: JooHyukKim

release-notes/CREDITS-2.x

@@ -1771,3 +1771,7 @@ Oddbjørn Kvalsund (oddbjornkvalsund@github)
    in `DeserializerCache` to avoid deadlock on pinning
   (2.17.1)
 
+Teodor Danciu (teodord@github)
+ * Repored #4464: When `Include.NON_DEFAULT` setting is used, `isEmpty()` method is
+   not called on the serializer
+  (2.18.0)

release-notes/VERSION-2.x

@@ -6,7 +6,10 @@ Project: jackson-databind
 
 2.18.0 (not yet released)
 
--
+#4464: When `Include.NON_DEFAULT` setting is used, `isEmpty()` method is
+  not called on the serializer
+ (reported by Teodor D)
+ (fix by Joo-Hyuk K)
 
 2.17.1 (not yet released)
 

src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java

@@ -182,6 +182,8 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
             }
             if (valueToSuppress == null) {
                 suppressNulls = true;
+                // [databind#4464] NON_DEFAULT does not work with NON_EMPTY for custom serializer
+                valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
             } else {
                 if (valueToSuppress.getClass().isArray()) {
                     valueToSuppress = ArrayBuilders.getArrayComparator(valueToSuppress);

src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonInclude4464Test.java

@@ -0,0 +1,54 @@
+package com.fasterxml.jackson.databind.ser.filter;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [databind#4464] Since 2.15, NON_DEFAULT should be extension of NON_EMPTY
+public class JsonInclude4464Test {
+
+    public static class BarSerializer extends JsonSerializer<Bar> {
+
+        public BarSerializer() {
+        }
+
+        @Override
+        public void serialize(Bar value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+            gen.writeObject(value);
+        }
+
+        @Override
+        public boolean isEmpty(SerializerProvider provider, Bar value) {
+            return "I_AM_EMPTY".equals(value.getName());
+        }
+    }
+
+    public static class Bar {
+        public String getName() {
+            return "I_AM_EMPTY";
+        }
+    }
+
+    public static class Foo {
+        @JsonSerialize(using = BarSerializer.class)
+        public Bar getBar() {
+            return new Bar();
+        }
+    }
+
+    @Test
+    public void test86() throws IOException {
+        ObjectMapper mapper = JsonMapper.builder().serializationInclusion(JsonInclude.Include.NON_DEFAULT).build();
+        String json = mapper.writeValueAsString(new Foo());
+        assertEquals("{}", json);
+    }
+}