Merge branch '2.x' into 3.x

Author: cowtowncoder

src/main/java/tools/jackson/databind/DeserializationContext.java

@@ -483,7 +483,7 @@ public final Object findInjectableValue(Object valueId,
 "No 'injectableValues' configured, cannot inject value with id '%s'", valueId),
                     valueId, forProperty, beanInstance);
         }
-        return _injectableValues.findInjectableValue(valueId, this, forProperty, beanInstance, optional);
+        return _injectableValues.findInjectableValue(this, valueId, forProperty, beanInstance, optional);
     }
 
     /**

src/main/java/tools/jackson/databind/InjectableValues.java

@@ -19,16 +19,17 @@ public abstract class InjectableValues
      * (will be available when injected via field or setter; not available
      * when injected via constructor or factory method argument).
      *
+     * @param ctxt Deserialization context
      * @param valueId Object that identifies value to inject; may be a simple
      *   name or more complex identifier object, whatever provider needs
-     * @param ctxt Deserialization context
      * @param forProperty Bean property in which value is to be injected
      * @param beanInstance Bean instance that contains property to inject,
      *    if available; null if bean has not yet been constructed.
      * @param optional Flag used for configuring the behavior when the value
      *    to inject is not found
      */
-    public abstract Object findInjectableValue(Object valueId, DeserializationContext ctxt,
+    public abstract Object findInjectableValue(DeserializationContext ctxt,
+            Object valueId, 
             BeanProperty forProperty, Object beanInstance, Boolean optional);
 
     /*
@@ -76,7 +77,8 @@ public Std snapshot() {
         }
 
         @Override
-        public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
+        public Object findInjectableValue(DeserializationContext ctxt,
+                Object valueId,
                 BeanProperty forProperty, Object beanInstance, Boolean optional)
         {
             if (!(valueId instanceof String)) {

src/test/java/tools/jackson/databind/introspect/IntrospectorPairTest.java

@@ -672,7 +672,8 @@ public JacksonInject.Value findInjectableValue(MapperConfig<?> config,
 
     static class TestInjector extends InjectableValues {
         @Override
-        public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
+        public Object findInjectableValue(DeserializationContext ctxt,
+                Object valueId, 
                 BeanProperty forProperty, Object beanInstance, Boolean optional) {
             if (valueId == "jjj") {
                 UnreadableBean bean = new UnreadableBean();

src/test/java/tools/jackson/databind/tofix/JacksonInject4218Test.java

@@ -36,16 +36,16 @@ class MyInjectableValues extends InjectableValues.Std
 
         @Override
         public Object findInjectableValue(
-                Object valueId,
                 DeserializationContext ctxt,
+                Object valueId,
                 BeanProperty forProperty,
                 Object beanInstance,
                 Boolean optional
         ) {
             if (valueId.equals("id")) {
                 return "id" + nextId++;
             } else {
-                return super.findInjectableValue(valueId, ctxt, forProperty, beanInstance, optional);
+                return super.findInjectableValue(ctxt, valueId, forProperty, beanInstance, optional);
             }
         }
     }