Second part of #3044 (JsonSerializer->ValueSerializer)

Author: cowtowncoder

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

@@ -650,8 +650,8 @@ public PropertyName findRenameByField(MapperConfig<?> config,
 
     /**
      * Method for getting a serializer definition on specified method
-     * or field. Type of definition is either instance (of type {@link JsonSerializer})
-     * or Class (of {@code Class<JsonSerializer>} implementation subtype);
+     * or field. Type of definition is either instance (of type {@link ValueSerializer})
+     * or Class (of {@code Class<ValueSerializer>} implementation subtype);
      * if value of different type is returned, a runtime exception may be thrown by caller.
      */
     public Object findSerializer(MapperConfig<?> config, Annotated am) {
@@ -660,8 +660,8 @@ public Object findSerializer(MapperConfig<?> config, Annotated am) {
 
     /**
      * Method for getting a serializer definition for keys of associated {@code java.util.Map} property.
-     * Type of definition is either instance (of type {@link JsonSerializer})
-     * or Class (of type  {@code Class<JsonSerializer>});
+     * Type of definition is either instance (of type {@link ValueSerializer})
+     * or Class (of type  {@code Class<ValueSerializer>});
      * if value of different type is returned, a runtime exception may be thrown by caller.
      */
     public Object findKeySerializer(MapperConfig<?> config, Annotated am) {
@@ -671,8 +671,8 @@ public Object findKeySerializer(MapperConfig<?> config, Annotated am) {
     /**
      * Method for getting a serializer definition for content (values) of
      * associated <code>Collection</code>, <code>array</code> or {@code Map} property.
-     * Type of definition is either instance (of type {@link JsonSerializer})
-     * or Class (of type  {@code Class<JsonSerializer>});
+     * Type of definition is either instance (of type {@link ValueSerializer})
+     * or Class (of type  {@code Class<ValueSerializer>});
      * if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */

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

@@ -26,7 +26,7 @@
  * Instances are not typically passed when constructing serializers
  * and deserializers, but rather only passed when context
  * is known and
- * {@link JsonSerializer#createContextual} and
+ * {@link ValueSerializer#createContextual} and
  * {@link ValueDeserializer#createContextual} are called.
  * References may (need to) be retained by serializers and deserializers,
  * especially when further resolving dependent handlers like value

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

@@ -248,7 +248,7 @@ public static interface SetupContext
          * @param ser Serializer called to write output for JSON Object key of which value
          *   on Java side is `null`
          */
-        public SetupContext overrideDefaultNullKeySerializer(JsonSerializer<?> ser);
+        public SetupContext overrideDefaultNullKeySerializer(ValueSerializer<?> ser);
 
         /**
          * Method that module can use to override handler called to write Java `null` as
@@ -257,7 +257,7 @@ public static interface SetupContext
          * @param ser Serializer called to write output for Java `null` as value (as distinct from
          *    key_
          */
-        public SetupContext overrideDefaultNullValueSerializer(JsonSerializer<?> ser);
+        public SetupContext overrideDefaultNullValueSerializer(ValueSerializer<?> ser);
 
         /*
         /******************************************************************

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

@@ -1107,7 +1107,7 @@ public final static class Prefetch
          * This allows avoiding further serializer lookups and increases
          * performance a bit on cases where readers are reused.
          */
-        private final JsonSerializer<Object> valueSerializer;
+        private final ValueSerializer<Object> valueSerializer;
 
         /**
          * When dealing with polymorphic types, we cannot pre-fetch
@@ -1116,7 +1116,7 @@ public final static class Prefetch
         private final TypeSerializer typeSerializer;
 
         private Prefetch(JavaType rootT,
-                JsonSerializer<Object> ser, TypeSerializer typeSer)
+                ValueSerializer<Object> ser, TypeSerializer typeSer)
         {
             rootType = rootT;
             valueSerializer = ser;
@@ -1152,7 +1152,7 @@ public Prefetch forRootType(ObjectWriter parent, JavaType newType) {
                 //   serializer for polymorphic types, it is actually more efficient to do the
                 //   reverse here.
                 try {
-                    JsonSerializer<Object> ser = ctxt.findTypedValueSerializer(newType, true);
+                    ValueSerializer<Object> ser = ctxt.findTypedValueSerializer(newType, true);
                     // Important: for polymorphic types, "unwrap"...
                     if (ser instanceof TypeWrappedSerializer) {
                         return new Prefetch(newType, null,
@@ -1167,7 +1167,7 @@ public Prefetch forRootType(ObjectWriter parent, JavaType newType) {
             return new Prefetch(newType, null, typeSerializer);
         }
 
-        public final JsonSerializer<Object> getValueSerializer() {
+        public final ValueSerializer<Object> getValueSerializer() {
             return valueSerializer;
         }
 

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

@@ -40,7 +40,7 @@ public class SequenceWriter
     protected final SerializationConfig _config;
     protected final JsonGenerator _generator;
 
-    protected final JsonSerializer<Object> _rootSerializer;
+    protected final ValueSerializer<Object> _rootSerializer;
     protected final TypeSerializer _typeSerializer;
 
     protected final boolean _closeGenerator;
@@ -140,7 +140,7 @@ public SequenceWriter write(Object value) throws JacksonException
         if (_cfgCloseCloseable && (value instanceof Closeable)) {
             return _writeCloseableValue(value);
         }
-        JsonSerializer<Object> ser = _rootSerializer;
+        ValueSerializer<Object> ser = _rootSerializer;
         if (ser == null) {
             Class<?> type = value.getClass();
             ser = _dynamicSerializers.serializerFor(type);
@@ -159,7 +159,7 @@ public SequenceWriter write(Object value) throws JacksonException
      * Method for writing given value into output, as part of sequence
      * to write; further, full type (often generic, like {@link java.util.Map}
      * is passed in case a new
-     * {@link JsonSerializer} needs to be fetched to handle type
+     * {@link ValueSerializer} needs to be fetched to handle type
      * 
      * If root type was specified for {@link ObjectWriter},
      * value must be of compatible type (same or subtype).
@@ -179,7 +179,7 @@ public SequenceWriter write(Object value, JavaType type) throws JacksonException
          *   is likely to run into other issues. But who knows; if it does become an
          *   issue, may need to implement alternative, JavaType-based map.
          */
-        JsonSerializer<Object> ser = _dynamicSerializers.serializerFor(type.getRawClass());
+        ValueSerializer<Object> ser = _dynamicSerializers.serializerFor(type.getRawClass());
         if (ser == null) {
             ser = _findAndAddDynamic(type);
         }
@@ -247,7 +247,7 @@ protected SequenceWriter _writeCloseableValue(Object value) throws JacksonExcept
     {
         Closeable toClose = (Closeable) value;
         try {
-            JsonSerializer<Object> ser = _rootSerializer;
+            ValueSerializer<Object> ser = _rootSerializer;
             if (ser == null) {
                 Class<?> type = value.getClass();
                 ser = _dynamicSerializers.serializerFor(type);
@@ -282,7 +282,7 @@ protected SequenceWriter _writeCloseableValue(Object value, JavaType type)
         Closeable toClose = (Closeable) value;
         try {
             // 15-Dec-2014, tatu: As per above, could be problem that we do not pass generic type
-            JsonSerializer<Object> ser = _dynamicSerializers.serializerFor(type.getRawClass());
+            ValueSerializer<Object> ser = _dynamicSerializers.serializerFor(type.getRawClass());
             if (ser == null) {
                 ser = _findAndAddDynamic(type);
             }
@@ -307,7 +307,7 @@ protected SequenceWriter _writeCloseableValue(Object value, JavaType type)
         return this;
     }
 
-    private final JsonSerializer<Object> _findAndAddDynamic(Class<?> type)
+    private final ValueSerializer<Object> _findAndAddDynamic(Class<?> type)
     {
         PropertySerializerMap.SerializerAndMapResult result;
         if (_typeSerializer == null) {
@@ -321,7 +321,7 @@ private final JsonSerializer<Object> _findAndAddDynamic(Class<?> type)
         return result.serializer;
     }
 
-    private final JsonSerializer<Object> _findAndAddDynamic(JavaType type)
+    private final ValueSerializer<Object> _findAndAddDynamic(JavaType type)
     {
         PropertySerializerMap.SerializerAndMapResult result;
         if (_typeSerializer == null) {

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

@@ -367,7 +367,7 @@ public enum SerializationFeature implements ConfigFeature
 
     /**
      * Feature that determines whether {@link ObjectWriter} should
-     * try to eagerly fetch necessary {@link JsonSerializer} when
+     * try to eagerly fetch necessary {@link ValueSerializer} when
      * possible. This improves performance in cases where similarly
      * configured {@link ObjectWriter} instance is used multiple
      * times; and should not significantly affect single-use cases.