fix and test

Fix and test

Delete GoodTest.java

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

@@ -182,8 +182,14 @@ 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;
+                // [databind#4471] Since 2.18.1 Different behavior when Include.NON_DEFAULT setting is used on
+                //                POJO vs global setting, as per documentation.
+                boolean isGloballyConfigured = _config.getDefaultInclusion(actualType.getRawClass(), rawPropertyType)
+                        .getValueInclusion() == JsonInclude.Include.NON_DEFAULT;
+                if (isGloballyConfigured) {
+                    // [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/JsonInclude4741Test.java

@@ -0,0 +1,44 @@
+package com.fasterxml.jackson.databind.ser.filter;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JsonInclude4741Test
+        extends DatabindTestUtil
+{
+
+    private ObjectMapper MAPPER = newJsonMapper();
+
+    @Test
+    void testSerialization() throws JsonProcessingException
+    {
+        MyString input = new MyString();
+        input.setValue("");
+
+        String json = MAPPER.writeValueAsString(input);
+        MyString output = MAPPER.readValue(json, MyString.class);
+
+        assertEquals(input.getValue(), output.getValue());
+    }
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    public static class MyString {
+        private String value = null;
+
+        // Getter
+        public String getValue() {
+            return value;
+        }
+
+        // Setter
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
+}