more twiddling of parameter ordering

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

@@ -639,8 +639,8 @@ public <T extends BeanDescription> T introspectForBuilder(JavaType type) {
     public TypeDeserializer findTypeDeserializer(JavaType baseType)
         throws JsonMappingException
     {
-        BeanDescription bean = introspectClassAnnotations(baseType.getRawClass());
-        return getTypeResolverProvider().findTypeDeserializer(this,
-                bean.getClassInfo(), baseType);
+        BeanDescription beanDesc = introspectClassAnnotations(baseType.getRawClass());
+        return getTypeResolverProvider().findTypeDeserializer(this, baseType,
+                beanDesc.getClassInfo());
     }
 }

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

@@ -835,7 +835,7 @@ protected JsonSerializer<Object> _createAndCacheUntypedSerializer(Class<?> rawTy
         JsonFormat.Value format = beanDesc.findExpectedFormat();
         JsonSerializer<Object> ser;
         try {
-            ser = _serializerFactory.createSerializer(this, beanDesc, fullType, format);
+            ser = _serializerFactory.createSerializer(this, fullType, beanDesc, format);
         } catch (IllegalArgumentException iae) {
             // We better only expose checked exceptions, since those are what caller is expected to handle
             throw _mappingProblem(iae, iae.getMessage());
@@ -853,7 +853,7 @@ protected JsonSerializer<Object> _createAndCacheUntypedSerializer(JavaType type)
         JsonFormat.Value format = beanDesc.findExpectedFormat();
         JsonSerializer<Object> ser;
         try {
-            ser = _serializerFactory.createSerializer(this, beanDesc, type, format);
+            ser = _serializerFactory.createSerializer(this, type, beanDesc, format);
         } catch (IllegalArgumentException iae) {
             // We better only expose checked exceptions, since those are what caller is expected to handle
             throw _mappingProblem(iae, iae.getMessage());

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -1553,8 +1553,8 @@ public TypeDeserializer findTypeDeserializer(final DeserializationConfig config,
         throws JsonMappingException
     {
         BeanDescription bean = config.introspectClassAnnotations(baseType.getRawClass());
-        return config.getTypeResolverProvider().findTypeDeserializer(config,
-                bean.getClassInfo(), baseType);
+        return config.getTypeResolverProvider().findTypeDeserializer(config, baseType,
+                bean.getClassInfo());
 
 //      JavaType defaultType = mapAbstractType(config, baseType);
 

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverProvider.java

@@ -50,7 +50,7 @@ public class TypeResolverProvider
      * @return Type resolver builder for given type, if one found; null if none
      */
     public TypeSerializer findTypeSerializer(SerializationConfig config,
-            AnnotatedClass classInfo, JavaType baseType)
+            JavaType baseType, AnnotatedClass classInfo)
         throws JsonMappingException
     {
         TypeResolverBuilder<?> b = _findTypeResolver(config, classInfo, baseType);
@@ -71,7 +71,7 @@ public TypeSerializer findTypeSerializer(SerializationConfig config,
     }
 
     public TypeDeserializer findTypeDeserializer(DeserializationConfig config,
-            AnnotatedClass classInfo, JavaType baseType)
+            JavaType baseType, AnnotatedClass classInfo)
         throws JsonMappingException
     {
         TypeResolverBuilder<?> b = _findTypeResolver(config, classInfo, baseType);
@@ -116,7 +116,7 @@ public TypeSerializer findPropertyTypeSerializer(SerializationConfig config,
         // No annotation on property? Then base it on actual type (and further, default typing if need be)
         if (b == null) {
             BeanDescription bean = config.introspectClassAnnotations(baseType.getRawClass());
-            return findTypeSerializer(config, bean.getClassInfo(), baseType);
+            return findTypeSerializer(config, baseType, bean.getClassInfo());
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByClass(
                 config, accessor, baseType);
@@ -136,9 +136,8 @@ public TypeDeserializer findPropertyTypeDeserializer(DeserializationConfig confi
         }
         // No annotation on property? Then base it on actual type (and further, default typing if need be)
         if (b == null) {
-            return findTypeDeserializer(config,
-                    config.introspectClassAnnotations(baseType.getRawClass()).getClassInfo(),
-                    baseType);
+            return findTypeDeserializer(config, baseType,
+                    config.introspectClassAnnotations(baseType.getRawClass()).getClassInfo());
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByTypeId(config,
                     accessor, baseType);
@@ -166,8 +165,8 @@ public TypeSerializer findPropertyContentTypeSerializer(SerializationConfig conf
         TypeResolverBuilder<?> b = _findTypeResolver(config, accessor, containerType);
         // No annotation on property? Then base it on actual type (and further, default typing if need be)
         if (b == null) {
-            BeanDescription bean = config.introspectClassAnnotations(contentType.getRawClass());
-            return findTypeSerializer(config, bean.getClassInfo(), contentType);
+            BeanDescription beanDesc = config.introspectClassAnnotations(contentType.getRawClass());
+            return findTypeSerializer(config, contentType, beanDesc.getClassInfo());
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByClass(
                 config, accessor, contentType);
@@ -186,9 +185,8 @@ public TypeDeserializer findPropertyContentTypeDeserializer(DeserializationConfi
         }
         TypeResolverBuilder<?> b = _findTypeResolver(config, accessor, containerType);
         if (b == null) {
-            return findTypeDeserializer(config,
-                    config.introspectClassAnnotations(contentType.getRawClass()).getClassInfo(),
-                    contentType);
+            return findTypeDeserializer(config, contentType,
+                    config.introspectClassAnnotations(contentType.getRawClass()).getClassInfo());
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByTypeId(config,
                 accessor, contentType);

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

@@ -239,10 +239,10 @@ public JsonSerializer<Object> createKeySerializer(SerializationConfig config,
      */
     @Override
     public TypeSerializer findTypeSerializer(SerializationConfig config,
-            BeanDescription beanDesc, JavaType baseType) throws JsonMappingException
+            JavaType baseType, BeanDescription beanDesc) throws JsonMappingException
     {
         return config.getTypeResolverProvider().findTypeSerializer(config,
-                beanDesc.getClassInfo(), baseType);
+                baseType, beanDesc.getClassInfo());
     }
 
     @Override

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

@@ -116,8 +116,8 @@ public SerializerFactory withConfig(SerializerFactoryConfig config)
      */
     @Override
     @SuppressWarnings("unchecked")
-    public JsonSerializer<Object> createSerializer(SerializerProvider ctxt,
-            BeanDescription beanDesc, JavaType origType, JsonFormat.Value format)
+    public JsonSerializer<Object> createSerializer(SerializerProvider ctxt, JavaType origType,
+            BeanDescription beanDesc, JsonFormat.Value format)
         throws JsonMappingException
     {
         // Very first thing, let's check if there is explicit serializer annotation:

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

@@ -27,7 +27,7 @@ public abstract class SerializerFactory
      * @since 3.0 (last argument added)
      */
     public abstract JsonSerializer<Object> createSerializer(SerializerProvider prov,
-            BeanDescription beanDesc, JavaType baseType, JsonFormat.Value format)
+            JavaType baseType, BeanDescription beanDesc, JsonFormat.Value format)
         throws JsonMappingException;
 
     /**
@@ -40,15 +40,14 @@ public abstract JsonSerializer<Object> createSerializer(SerializerProvider prov,
      * @return Type serializer to use for the base type, if one is needed; null if not.
      */
     public abstract TypeSerializer findTypeSerializer(SerializationConfig config,
-            BeanDescription beanDesc, JavaType baseType)
+            JavaType baseType, BeanDescription beanDesc)
         throws JsonMappingException;
 
     public TypeSerializer findTypeSerializer(SerializationConfig config,
             JavaType baseType) throws JsonMappingException
     {
-        return findTypeSerializer(config,
-                config.introspectClassAnnotations(baseType),
-                baseType);
+        return findTypeSerializer(config, baseType,
+                config.introspectClassAnnotations(baseType));
     }
 
     /**
@@ -126,7 +125,7 @@ public JsonSerializer<Object> createSerializer(SerializerProvider prov, JavaType
         throws JsonMappingException
     {
         BeanDescription beanDesc = prov.getConfig().introspect(baseType);
-        return createSerializer(prov, beanDesc, baseType,
+        return createSerializer(prov, baseType, beanDesc,
                 beanDesc.findExpectedFormat());
     }
 }

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

@@ -27,25 +27,21 @@ public class EnumSerializer
     private static final long serialVersionUID = 1L;
 
     /**
-     * This map contains pre-resolved values (since there are ways
-     * to customize actual String constants to use) to use as
-     * serializations.
+     * This map contains pre-resolved values (since there are ways to customize
+     * actual String constants to use) to use as serializations.
      */
     protected final EnumValues _values;
 
     /**
-     * Flag that is set if we statically know serialization choice
-     * between index and textual format (null if it needs to be dynamically
-     * checked).
-     * 
-     * @since 2.1
+     * Flag that is set if we statically know serialization choice between
+     * index and textual format (null if it needs to be dynamically checked).
      */
     protected final Boolean _serializeAsIndex;
 
     /*
-    /**********************************************************
-    /* Construction, initialization
-    /**********************************************************
+    /**********************************************************************
+    /* Life-cycle
+    /**********************************************************************
      */
 
     public EnumSerializer(EnumValues v, Boolean serializeAsIndex)
@@ -58,17 +54,14 @@ public EnumSerializer(EnumValues v, Boolean serializeAsIndex)
     /**
      * Factory method used by {@link com.fasterxml.jackson.databind.ser.BasicSerializerFactory}
      * for constructing serializer instance of Enum types.
-     * 
-     * @since 2.1
      */
     @SuppressWarnings("unchecked")
     public static EnumSerializer construct(Class<?> enumClass, SerializationConfig config,
             BeanDescription beanDesc, JsonFormat.Value format)
     {
-        /* 08-Apr-2015, tatu: As per [databind#749], we cannot statically determine
-         *   between name() and toString(), need to construct `EnumValues` with names,
-         *   handle toString() case dynamically (for example)
-         */
+        // 08-Apr-2015, tatu: As per [databind#749], we cannot statically determine
+        //   between name() and toString(), need to construct `EnumValues` with names,
+        //   handle toString() case dynamically (for example)
         EnumValues v = EnumValues.constructFromName(config, (Class<Enum<?>>) enumClass);
         Boolean serializeAsIndex = _isShapeWrittenUsingIndex(enumClass, format, true, null);
         return new EnumSerializer(v, serializeAsIndex);
@@ -80,10 +73,10 @@ public static EnumSerializer construct(Class<?> enumClass, SerializationConfig c
      * choice here, however.
      */
     @Override
-    public JsonSerializer<?> createContextual(SerializerProvider serializers,
+    public JsonSerializer<?> createContextual(SerializerProvider ctxt,
             BeanProperty property) throws JsonMappingException
     {
-        JsonFormat.Value format = findFormatOverrides(serializers,
+        JsonFormat.Value format = findFormatOverrides(ctxt,
                 property, handledType());
         if (format != null) {
             Class<?> type = handledType();
@@ -97,40 +90,40 @@ public JsonSerializer<?> createContextual(SerializerProvider serializers,
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Extended API for Jackson databind core
-    /**********************************************************
+    /**********************************************************************
      */
 
     public EnumValues getEnumValues() { return _values; }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Actual serialization
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
-    public final void serialize(Enum<?> en, JsonGenerator gen, SerializerProvider serializers)
+    public final void serialize(Enum<?> en, JsonGenerator g, SerializerProvider ctxt)
         throws IOException
     {
-        // [JACKSON-684]: serialize as index?
-        if (_serializeAsIndex(serializers)) {
-            gen.writeNumber(en.ordinal());
+        // Serialize as index?
+        if (_serializeAsIndex(ctxt)) {
+            g.writeNumber(en.ordinal());
             return;
         }
         // [databind#749]: or via toString()?
-        if (serializers.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) {
-            gen.writeString(en.toString());
+        if (ctxt.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) {
+            g.writeString(en.toString());
             return;
         }
-        gen.writeString(_values.serializedValueFor(en));
+        g.writeString(_values.serializedValueFor(en));
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Schema support
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -163,17 +156,17 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Helper methods
-    /**********************************************************
+    /**********************************************************************
      */
 
-    protected final boolean _serializeAsIndex(SerializerProvider serializers)
+    protected final boolean _serializeAsIndex(SerializerProvider ctxt)
     {
         if (_serializeAsIndex != null) {
             return _serializeAsIndex.booleanValue();
         }
-        return serializers.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX);
+        return ctxt.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX);
     }
 
     /**