Merge branch '2.16'

Author: cowtowncoder

src/main/java/tools/jackson/databind/ser/BasicSerializerFactory.java

@@ -218,7 +218,8 @@ public ValueSerializer<Object> createKeySerializer(SerializerProvider ctxt, Java
                         }
                         // need to pass both type of key Object (on which accessor called), and actual
                         // value type that `JsonType`-annotated accessor returns (or contains, in case of field)
-                        ser = new JsonValueSerializer(keyType, acc.getType(), false, null, delegate, acc);
+                        ser = JsonValueSerializer.construct(config, keyType, acc.getType(),
+                                false, null, delegate, acc);
                     } else {
                         ser = JDKKeySerializers.getFallbackKeySerializer(config, keyType.getRawClass(),
                                 beanDesc.getClassInfo());
@@ -328,8 +329,8 @@ protected final ValueSerializer<?> findSerializerByAnnotations(SerializerProvide
             ValueSerializer<Object> ser = findSerializerFromAnnotation(ctxt, valueAccessor);
             JavaType valueType = valueAccessor.getType();
             TypeSerializer vts = ctxt.findTypeSerializer(valueType);
-            return new JsonValueSerializer(type, valueType, /* static typing */ false,
-                    vts, ser, valueAccessor);
+            return JsonValueSerializer.construct(ctxt.getConfig(), type, valueType,
+                    /* static typing */ false, vts, ser, valueAccessor);
         }
         // No well-known annotations...
         return null;

src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java

@@ -56,6 +56,8 @@ public class JsonValueSerializer
      */
     protected final boolean _forceTypeInformation;
 
+    protected final Set<String> _ignoredProperties;
+
     /*
     /**********************************************************************
     /* Life-cycle
@@ -68,16 +70,18 @@ public class JsonValueSerializer
      *    {@link tools.jackson.databind.annotation.JsonSerialize#using}), otherwise
      *    null
      */
-    public JsonValueSerializer(JavaType nominalType,
+    protected JsonValueSerializer(JavaType nominalType,
             JavaType valueType, boolean staticTyping,
             TypeSerializer vts, ValueSerializer<?> ser,
-            AnnotatedMember accessor)
+            AnnotatedMember accessor,
+            Set<String> ignoredProperties)
     {
         super(nominalType, null, vts, ser);
         _valueType = valueType;
         _staticTyping = staticTyping;
         _accessor = accessor;
         _forceTypeInformation = true; // gets reconsidered when we are contextualized
+        _ignoredProperties = ignoredProperties;
     }
 
     protected JsonValueSerializer(JsonValueSerializer src, BeanProperty property,
@@ -88,6 +92,20 @@ protected JsonValueSerializer(JsonValueSerializer src, BeanProperty property,
         _accessor = src._accessor;
         _staticTyping = src._staticTyping;
         _forceTypeInformation = forceTypeInfo;
+        _ignoredProperties = src._ignoredProperties;
+    }
+
+    public static JsonValueSerializer construct(SerializationConfig config,
+            JavaType nominalType,
+            JavaType valueType, boolean staticTyping,
+            TypeSerializer vts, ValueSerializer<?> ser,
+            AnnotatedMember accessor)
+    {
+        JsonIgnoreProperties.Value ignorals = config.getAnnotationIntrospector()
+            .findPropertyIgnoralByName(config, accessor);
+        return new JsonValueSerializer(nominalType, valueType, staticTyping,
+                vts, ser, accessor,
+                ignorals.findIgnoredForSerialization());
     }
 
     public JsonValueSerializer withResolved(BeanProperty property,

src/test/java/tools/jackson/databind/ser/filter/JsonValueIgnore3647Test.java

@@ -9,7 +9,7 @@
 // [databind#3647] : Support @JsonIgnoreProperties to work with @JsonValue
 public class JsonValueIgnore3647Test extends BaseMapTest
 {
-    static class Foo3647 {
+    final static class Foo3647 {
         public String p1 = "hello";
         public String p2 = "world";
     }