Skip to content
This repository was archived by the owner on Nov 7, 2019. It is now read-only.

Commit f8303ae

Browse files
committed
Merge pull request #1 from FasterXML/master
fork sync
2 parents 12bb5ee + ae44bed commit f8303ae

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ class Person {
7272
Preconditions:
7373

7474
- class Person must be compiled with Java 8 compliant compiler with option to store formal parameter names turned on (`-parameters` option). For more information about Java 8 API for accessing parameter names at runtime see [this][2]
75-
- if there are multiple visible constructors and there is no default constructor, @JsonCreator is required to select constructor for deserialization
75+
- if there are multiple visible constructors and there is no default constructor, `@JsonCreator` is required to select constructor for deserialization
76+
- if used with `jackson-databind` lower than `2.6.0`, `@JsonCreator` is required
7677

7778
## More
7879

7980
See [Wiki](../../wiki) for more information (javadocs, downloads).
8081

8182
[1]: http://jackson.codehaus.org/1.1.2/javadoc/org/codehaus/jackson/annotate/JsonProperty.html
82-
[2]: http://docs.oracle.com/javase/tutorial/reflect/member/methodparameterreflection.html
83+
[2]: http://docs.oracle.com/javase/tutorial/reflect/member/methodparameterreflection.html

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<groupId>com.fasterxml.jackson</groupId>
66
<artifactId>jackson-parent</artifactId>
7-
<version>2.5</version>
7+
<version>2.5.1</version>
88
</parent>
99
<groupId>com.fasterxml.jackson.module</groupId>
1010
<artifactId>jackson-module-parameter-names</artifactId>
1111
<name>Jackson-module-parameter-names</name>
12-
<version>2.6.0-SNAPSHOT</version>
12+
<version>2.6.0-rc3-SNAPSHOT</version>
1313
<packaging>bundle</packaging>
1414
<description>Add-on module for Jackson (http://jackson.codehaus.org) to support
1515
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
3030
<tag>HEAD</tag>
3131
</scm>
3232
<properties>
33-
<version.jackson.core>2.6.0-SNAPSHOT</version.jackson.core>
33+
<version.jackson.core>2.6.0-rc2</version.jackson.core>
3434
<!-- explicitly target JDK 8 -->
3535
<javac.src.version>1.8</javac.src.version>
3636
<javac.target.version>1.8</javac.target.version>

release-notes/VERSION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Project: jackson-module-parameter-names
44
= Releases
55
------------------------------------------------------------------------
66

7+
2.5.3 (24-Apr-2015)
8+
2.5.2 (29-Mar-2015)
79
2.5.1 (06-Feb-2015)
810

911
No changes since 2.5.0

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,19 @@ public void setUp() {
2424
@Test
2525
public void shouldDeserializeClassWithMandatoryFields() throws IOException {
2626

27+
/*
2728
whenReadValue("{\"firstMandatoryField\":\"abc\"," +
2829
"\"secondMandatoryField\":true}",
2930
ClassWithMandatoryFields.class);
3031
3132
then(readValue).isEqualToComparingFieldByField(new ClassWithMandatoryFields("abc",
3233
true));
34+
*/
3335
}
3436

3537
@Test
3638
public void shouldDeserializeClassWithMandatoryAndOptionalFields() throws IOException {
37-
39+
/*
3840
whenReadValue("{\"firstMandatoryField\":\"abc\"," +
3941
"\"secondMandatoryField\":true," +
4042
"\"firstOptionalField\":10," +
@@ -45,6 +47,7 @@ public void shouldDeserializeClassWithMandatoryAndOptionalFields() throws IOExce
4547
expected.setFirstOptionalField(10);
4648
expected.setSecondOptionalField(new BigDecimal("2.3"));
4749
then(readValue).isEqualToComparingFieldByField(expected);
50+
*/
4851
}
4952

5053
private void whenReadValue(String json, Class<?> valueType) throws IOException {

0 commit comments

Comments
 (0)