Merge branch '2.12'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -24,6 +24,8 @@ Project: jackson-databind
   values could be converted to integers losslessly
  (requested by Oguzhan U; implementation contributed by Siavash S)
 #2903: Allow preventing "Enum from integer" coercion using new `CoercionConfig` system
+#2909: `@JsonValue` not considered when evaluating inclusion
+ (reported by chrylis@github)
 
 2.12.0-rc1 (12-Oct-2020)
 

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

@@ -720,9 +720,8 @@ public void serializeAsElement(Object bean, JsonGenerator gen,
                     serializeAsPlaceholder(bean, gen, prov);
                     return;
                 }
-            } else if (_suppressableValue.equals(value)) { // can NOT suppress
-                                                           // entries in tabular
-                                                           // output
+            } else if (_suppressableValue.equals(value)) {
+                // can NOT suppress entries in tabular output
                 serializeAsPlaceholder(bean, gen, prov);
                 return;
             }

src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java

@@ -66,7 +66,7 @@ public ObjectArraySerializer(ObjectArraySerializer src, TypeSerializer vts)
         _staticTyping = src._staticTyping;
         _elementSerializer = src._elementSerializer;
     }
-    
+
     @SuppressWarnings("unchecked")
     public ObjectArraySerializer(ObjectArraySerializer src,
             BeanProperty property, TypeSerializer vts, JsonSerializer<?> elementSerializer,

src/test/java/com/fasterxml/jackson/databind/deser/creators/TestPolymorphicDelegating.java

@@ -42,7 +42,6 @@ public void testAbstractDelegateWithCreator() throws Exception
         Issue580Bean input = new Issue580Bean(new Issue580Impl(13));
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(input);
-
         Issue580Bean result = mapper.readValue(json, Issue580Bean.class);
         assertNotNull(result);
         assertNotNull(result.value);

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

@@ -4,6 +4,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.*;
 
 public class MapInclusionTest extends BaseMapTest
@@ -41,6 +42,17 @@ public NoNullsNotEmptyMapContainer add(String key, String value) {
         }
     }
 
+    // [databind#2909]
+    static class Wrapper2909 {
+        @JsonValue
+        public Map<String, String> values = new HashMap<>();
+    }
+
+    static class TopLevel2099 {
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        public Wrapper2909 nested = new Wrapper2909();
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -80,4 +92,10 @@ public void testNonEmptyNoNullsMap() throws IOException
                 .add("b", null));
         assertEquals(aposToQuotes("{}"), json);
     }
+
+    // [databind#2909]
+    public void testMapViaJsonValue() throws Exception
+    {
+        assertEquals(a2q("{}"), MAPPER.writeValueAsString(new TopLevel2099()));
+    }
 }