commit 41484009964b69f81c91defe22b970f8f2dc5cd5
author Tatu Saloranta <tatu.saloranta@iki.fi> Mon Apr 14 22:19:46 2014 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Mon Apr 14 22:19:46 2014 -0700
tree 0ec37d2687e22097ae288a1e2371fb093b7c1719
parent 1c4a7b1ab12015ef36bbd61a553cd24f873bb4e5

Minor fixes to parameter name discovery/introspection

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

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
index 1a0a161..10869a2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
@@ -429,7 +429,7 @@
                     name = ctorPropNames[i];
                 }
                 if (name == null) {
-                    name = (param == null) ? null : intr.findNameForDeserialization(param);
+                    name = _findParamName(param, intr);
                 }
                 Object injectId = intr.findInjectableValueId(param);
                 if (name != null && name.hasSimpleName()) {
@@ -477,7 +477,7 @@
         // note: if we do have parameter name, it'll be "property constructor":
         AnnotatedParameter param = ctor.getParameter(0);
         if (name == null) {
-            name = (param == null) ? null : intr.findNameForDeserialization(param);
+            name = _findParamName(param, intr);
         }
         Object injectId = intr.findInjectableValueId(param);
     
@@ -548,7 +548,7 @@
             // some single-arg factory methods (String, number) are auto-detected
             if (argCount == 1) {
                 AnnotatedParameter param = factory.getParameter(0);
-                PropertyName pn = (param == null) ? null : intr.findNameForDeserialization(param);
+                PropertyName pn = _findParamName(param, intr);
                 String name = (pn == null) ? null : pn.getSimpleName();
                 Object injectId = intr.findInjectableValueId(param);
 
@@ -572,7 +572,7 @@
             int injectCount = 0;            
             for (int i = 0; i < argCount; ++i) {
                 AnnotatedParameter param = factory.getParameter(i);
-                PropertyName name = (param == null) ? null : intr.findNameForDeserialization(param);
+                PropertyName name = _findParamName(param, intr);
                 Object injectId = intr.findInjectableValueId(param);
                 if (name != null && name.hasSimpleName()) {
                     ++namedCount;
@@ -705,6 +705,24 @@
         }
         return prop;
     }
+
+    protected PropertyName _findParamName(AnnotatedParameter param, AnnotationIntrospector intr)
+    {
+        if (param != null && intr != null) {
+            PropertyName name = intr.findNameForDeserialization(param);
+            if (name != null) {
+                return name;
+            }
+            /* 14-Apr-2014, tatu: Need to also consider possible implicit name
+            *   (for JDK8, or via paranamer)
+            */
+            String str = intr.findParameterSourceName(param);
+            if (str != null && !str.isEmpty()) {
+                return new PropertyName(str);
+            }
+        }
+        return null;
+    }
     
     /*
     /**********************************************************