Merge pull request #2 from FasterXML/master

Merge upstream

Author: lpandzic

pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-parent</artifactId>
-    <version>2.5.1</version>
+    <version>2.6.1</version>
   </parent>
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-module-parameter-names</artifactId>
   <name>Jackson-module-parameter-names</name>
-  <version>2.6.0-rc3-SNAPSHOT</version>
+  <version>2.6.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Add-on module for Jackson (http://jackson.codehaus.org) to support
 introspection of method/constructor parameter names, without having to add explicit property name annotation.
@@ -30,7 +30,7 @@ introspection of method/constructor parameter names, without having to add expli
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <version.jackson.core>2.6.0-rc2</version.jackson.core>
+    <version.jackson.core>2.6.0</version.jackson.core>
     <!-- explicitly target JDK 8 -->
     <javac.src.version>1.8</javac.src.version>
     <javac.target.version>1.8</javac.target.version>

release-notes/VERSION

@@ -4,6 +4,12 @@ Project: jackson-module-parameter-names
 = Releases
 ------------------------------------------------------------------------
 
+2.6.0 (19-Jul-2015)
+
+#21: Unable to associate parameter name with single non-annotated constructor argument
+ (reported by Michael H, michaelhixson@github)
+
+2.5.4 (09-Jun-2015)
 2.5.3 (24-Apr-2015)
 2.5.2 (29-Mar-2015)
 2.5.1 (06-Feb-2015)

src/main/java/com/fasterxml/jackson/module/paramnames/ParameterNamesAnnotationIntrospector.java

@@ -1,35 +1,30 @@
 package com.fasterxml.jackson.module.paramnames;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.*;
 
 import java.lang.reflect.*;
 
 /**
- * Introspector that uses parameter name information provided by the Java Reflection API additions in Java 8 to determine the parameter
- * name for methods and constructors.
+ * Introspector that uses parameter name information provided by the Java Reflection API additions in Java 8 to
+ * determine the parameter name for methods and constructors.
  *
  * @author Lovro Pandzic
  * @see AnnotationIntrospector
  * @see Parameter
  */
 class ParameterNamesAnnotationIntrospector extends NopAnnotationIntrospector
 {
-    // stateless, can just use static id
     private static final long serialVersionUID = 1L;
 
-    /**
-     * Since Jackson 2.4, there has been distinction between annotation-specified
-     * explicit names; and implicit name that comes from source.
-     */
-    /*
-    @Override
-    public PropertyName findNameForDeserialization(Annotated annotated) {
-        return null;
+    private final JsonCreator.Mode creatorBinding;
+
+    ParameterNamesAnnotationIntrospector(JsonCreator.Mode creatorBinding) {
+
+        this.creatorBinding = creatorBinding;
     }
-    */
 
-    // since 2.4
     @Override
     public String findImplicitPropertyName(AnnotatedMember m) {
         if (m instanceof AnnotatedParameter) {
@@ -38,6 +33,12 @@ public String findImplicitPropertyName(AnnotatedMember m) {
         return null;
     }
 
+    @Override
+    public JsonCreator.Mode findCreatorBinding(Annotated a) {
+
+        return creatorBinding;
+    }
+
     /**
      * Returns the parameter name, or {@code null} if it could not be determined.
      *
@@ -49,7 +50,7 @@ private String findParameterName(AnnotatedParameter annotatedParameter) {
 
         AnnotatedWithParams owner = annotatedParameter.getOwner();
         Parameter[] params;
-        
+
         if (owner instanceof AnnotatedConstructor) {
             params = ((AnnotatedConstructor) owner).getAnnotated().getParameters();
         } else if (owner instanceof AnnotatedMethod) {

src/main/java/com/fasterxml/jackson/module/paramnames/ParameterNamesModule.java

@@ -1,21 +1,29 @@
 package com.fasterxml.jackson.module.paramnames;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.json.PackageVersion;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
 public class ParameterNamesModule extends SimpleModule
 {
     private static final long serialVersionUID = 1L;
 
-    public ParameterNamesModule()
-    {
+    private final JsonCreator.Mode creatorBinding;
+
+    public ParameterNamesModule(JsonCreator.Mode creatorBinding) {
+        super(PackageVersion.VERSION);
+        this.creatorBinding = creatorBinding;
+    }
+
+    public ParameterNamesModule() {
         super(PackageVersion.VERSION);
+        this.creatorBinding = null;
     }
 
     @Override
     public void setupModule(SetupContext context) {
         super.setupModule(context);
-        context.insertAnnotationIntrospector(new ParameterNamesAnnotationIntrospector());
+        context.insertAnnotationIntrospector(new ParameterNamesAnnotationIntrospector(creatorBinding));
     }
 
     @Override

src/test/java/com/fasterxml/jackson/module/paramnames/ParameterNamesAnnotationIntrospectorTest.java

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.module.paramnames;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
@@ -16,7 +17,7 @@
  */
 public class ParameterNamesAnnotationIntrospectorTest {
 
-    private final ParameterNamesAnnotationIntrospector PN_AI = new ParameterNamesAnnotationIntrospector();
+    private final ParameterNamesAnnotationIntrospector PN_AI = new ParameterNamesAnnotationIntrospector(JsonCreator.Mode.DEFAULT);
 
     @Test
     public void shouldFindParameterNameFromConstructorForLegalIndex() throws Exception {

src/test/java/com/fasterxml/jackson/module/paramnames/SimplePerson.java

@@ -0,0 +1,16 @@
+package com.fasterxml.jackson.module.paramnames;
+
+public class SimplePerson {
+
+    private final String name;
+
+    public SimplePerson(String name) {
+
+        this.name = name;
+    }
+
+    public String getName() {
+
+        return name;
+    }
+}

src/test/java/com/fasterxml/jackson/module/paramnames/SimplePersonTest.java

@@ -0,0 +1,27 @@
+package com.fasterxml.jackson.module.paramnames;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+public class SimplePersonTest {
+
+    @Test
+    public void shouldBeAbleToDeserializeSimplePerson() throws IOException {
+
+        // given
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES));
+
+        // when
+        SimplePerson actual = objectMapper.readValue("{\"name\":\"joe\"}", SimplePerson.class);
+
+        // then
+        SimplePerson expected = new SimplePerson("joe");
+        then(actual).isEqualToComparingFieldByField(expected);
+    }
+}