Merge branch '2.18' into 2.19

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

@@ -561,6 +561,9 @@ public abstract WritableObjectId findObjectId(Object forPojo,
      * Note that serializers produced should NOT handle polymorphic serialization
      * aspects; separate {@link TypeSerializer} is to be constructed by caller
      * if and as necessary.
+     *<p>
+     * Note: this call will also contextualize serializer (call
+     * {@code serializer.createContextual()}) before returning it.
      *
      * @throws JsonMappingException if there are fatal problems with
      *   accessing suitable serializer; including that of not
@@ -603,7 +606,8 @@ public JsonSerializer<Object> findValueSerializer(Class<?> valueType, BeanProper
      * This is necessary for accurate handling of external type information,
      * to handle polymorphic types.
      *<p>
-     * Note: this call will also contextualize serializer before returning it.
+     * Note: this call will also contextualize serializer (call
+     * {@code serializer.createContextual()}) before returning it.
      *
      * @param property When creating secondary serializers, property for which
      *   serializer is needed: annotations of the property (or bean that contains it)
@@ -635,9 +639,10 @@ public JsonSerializer<Object> findValueSerializer(JavaType valueType, BeanProper
     }
 
     /**
-     * Method variant used when we do NOT want contextualization to happen; it will need
-     * to be handled at a later point, but caller wants to be able to do that
-     * as needed; sometimes to avoid infinite loops
+     * Serializer lookup variant used when we do NOT want contextualization to happen;
+     * while contextualization MUST be handled at some point (many serializers will not be
+     * in usable state before contextualization), but caller wants to be able to do that
+     * later; sometimes to avoid infinite loops.
      *
      * @since 2.5
      */
@@ -664,9 +669,10 @@ public JsonSerializer<Object> findValueSerializer(Class<?> valueType) throws Jso
     }
 
     /**
-     * Method variant used when we do NOT want contextualization to happen; it will need
-     * to be handled at a later point, but caller wants to be able to do that
-     * as needed; sometimes to avoid infinite loops
+     * Serializer lookup variant used when we do NOT want contextualization to happen;
+     * while contextualization MUST be handled at some point (many serializers will not be
+     * in usable state before contextualization), but caller wants to be able to do that
+     * later; sometimes to avoid infinite loops.
      *
      * @since 2.5
      */
@@ -698,8 +704,10 @@ public JsonSerializer<Object> findValueSerializer(JavaType valueType)
      * certain that this is the primary property value serializer.
      *
      * @param valueType Type of values to serialize
-     * @param property Property that is being handled; will never be null, and its
-     *    type has to match <code>valueType</code> parameter.
+     * @param property Property that directly refers to value being serialized (optional,
+     *    may be {@code null} for root level serializers).
+     *    Should not be null if property is known. If not null,
+     *    its type must match {@code valueType} argument.
      *
      * @since 2.3
      */