Skip to content

Commit 92cb782

Browse files
committed
Fix #17
1 parent b15e649 commit 92cb782

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

datatypes/src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalSerializer.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,15 @@ private final JsonSerializer<Object> _findCachedSerializer(SerializerProvider pr
321321
private final JsonSerializer<Object> _findSerializer(SerializerProvider provider,
322322
Class<?> type, BeanProperty prop) throws JsonMappingException
323323
{
324-
return provider.findTypedValueSerializer(type, true, prop);
324+
// 13-Mar-2017, tatu: To fix [modules-java8#17] change `findTypedValueSerializer()` int `findValueSerializer()`
325+
return provider.findValueSerializer(type, prop);
325326
}
326327

327328
private final JsonSerializer<Object> _findSerializer(SerializerProvider provider,
328329
JavaType type, BeanProperty prop) throws JsonMappingException
329330
{
330-
return provider.findTypedValueSerializer(type, true, prop);
331+
// 13-Mar-2017, tatu: To fix [modules-java8#17] change `findTypedValueSerializer()` int `findValueSerializer()`
332+
return provider.findValueSerializer(type, prop);
331333
}
332334

333335
// !!! 22-Mar-2016, tatu: Method added in jackson-databind 2.7.4; may be used

datatypes/src/test/java/com/fasterxml/jackson/failing/ContextualOptional17Test.java renamed to datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/ContextualOptional17Test.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.fasterxml.jackson.failing;
1+
package com.fasterxml.jackson.datatype.jdk8;
22

3-
import java.text.DateFormat;
43
import java.text.SimpleDateFormat;
54
import java.util.Date;
65
import java.util.Optional;
@@ -9,7 +8,6 @@
98
import com.fasterxml.jackson.annotation.JsonFormat;
109
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1110
import com.fasterxml.jackson.databind.ObjectMapper;
12-
import com.fasterxml.jackson.datatype.jdk8.ModuleTestBase;
1311

1412
public class ContextualOptional17Test extends ModuleTestBase
1513
{
@@ -45,7 +43,7 @@ public void testContextualOptionals() throws Exception
4543
final String json = mapper.writeValueAsString(input);
4644
//System.err.println("JSON:\n"+json);
4745
assertEquals(aposToQuotes(
48-
"{'date':'1970/01/01','date1':'1970+01+01','date2':'1970*01*01'"),
46+
"{'date':'1970/01/01','date1':'1970+01+01','date2':'1970*01*01'}"),
4947
json);
5048
}
5149
}

release-notes/VERSION

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ Modules:
88
=== Releases ===
99
------------------------------------------------------------------------
1010

11+
2.8.8 (not yet released)
12+
13+
#17: Cached `Optional` serializer does not apply annotations for POJO properties
14+
(reported by codicusmaximus@github)
15+
1116
2.8.7 (21-Feb-2017)
1217
2.8.6 (12-Jan-2017)
1318

0 commit comments

Comments
 (0)