Adding test (passing) for #46

Author: cowtowncoder

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/PolymorphicTest.java renamed to datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/DefaultTypingTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.datatype.jsr310;
+package com.fasterxml.jackson.datatype.jsr310.deser;
 
 import java.time.ZoneId;
 
@@ -7,8 +7,9 @@
 import static org.junit.Assert.assertEquals;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 
-public class PolymorphicTest extends ModuleTestBase
+public class DefaultTypingTest extends ModuleTestBase
 {
     private final ObjectMapper TYPING_MAPPER = newMapper();
     {

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateDeserialization.java renamed to datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/LocalDateDeserTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.datatype.jsr310;
+package com.fasterxml.jackson.datatype.jsr310.deser;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -16,8 +16,9 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 
-public class TestLocalDateDeserialization extends ModuleTestBase
+public class LocalDateDeserTest extends ModuleTestBase
 {
     private final ObjectReader READER = newMapper().readerFor(LocalDate.class);
 
@@ -47,30 +48,30 @@ public void testDeserializationAsArrayDisabled() throws Throwable
     @Test
     public void testDeserializationAsEmptyArrayDisabled() throws Throwable
     {
-    	// works even without the feature enabled
-    	assertNull(read("[]"));
+        // works even without the feature enabled
+        assertNull(read("[]"));
     }
-    
+
     @Test
     public void testDeserializationAsArrayEnabled() throws Throwable
     {
-    	String json="['2000-01-01']";
-    	LocalDate value= newMapper()
-    			.configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
-    			.readerFor(LocalDate.class).readValue(aposToQuotes(json));
-    	notNull(value);
+        String json="['2000-01-01']";
+        LocalDate value= newMapper()
+                .configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
+                .readerFor(LocalDate.class).readValue(aposToQuotes(json));
+        notNull(value);
         expect(LocalDate.of(2000, 1, 1), value);
     }
 
     @Test
     public void testDeserializationAsEmptyArrayEnabled() throws Throwable
     {
-    	String json="[]";
-    	LocalDate value= newMapper()
-    			.configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
-    			.configure(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT, true)
-    			.readerFor(LocalDate.class).readValue(aposToQuotes(json));
-    	assertNull(value);
+        String json="[]";
+        LocalDate value= newMapper()
+                .configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
+                .configure(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT, true)
+                .readerFor(LocalDate.class).readValue(aposToQuotes(json));
+        assertNull(value);
     }
 
     private void expectFailure(String json) throws Throwable {

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateSerialization.java renamed to datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalDateSerTest.java

@@ -14,12 +14,17 @@
  * limitations under the license.
  */
 
-package com.fasterxml.jackson.datatype.jsr310;
+package com.fasterxml.jackson.datatype.jsr310.ser;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
+import com.fasterxml.jackson.datatype.jsr310.MockObjectConfiguration;
+import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
+
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -33,7 +38,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class TestLocalDateSerialization
+public class LocalDateSerTest
 	extends ModuleTestBase
 {
     final static class Wrapper {
@@ -60,6 +65,19 @@ public VanillaWrapper() { }
         public VanillaWrapper(LocalDate v) { value = v; }
     }
 
+    // [modules-java8#46]
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+    static class Holder46 {
+        public LocalDate localDate;
+
+        public Object object;
+
+        public Holder46(LocalDate localDate, Object object) {
+            this.localDate = localDate;
+            this.object = object;
+        }
+    }    
+    
     private final ObjectMapper MAPPER = newMapper();
 
     @Test
@@ -263,4 +281,21 @@ public void testCustomFormatToEpochDay() throws Exception
         assertNotNull(date);
         assertEquals(LocalDate.ofEpochDay(1000), date);
     }
+
+    // [modules-java8#46]
+    public void testPolymorphicSerialization() throws Exception
+    {
+        ObjectMapper mapper = newMapper();
+        StdTypeResolverBuilder typeResolverBuilder =
+                new ObjectMapper.DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL)
+                        .init(JsonTypeInfo.Id.CLASS, null)
+                        .inclusion(JsonTypeInfo.As.WRAPPER_OBJECT);
+
+        mapper = new ObjectMapper();
+        mapper.setDefaultTyping(typeResolverBuilder);
+        final LocalDate localDate = LocalDate.of(2017, 12, 5);
+        String dateHolderStr = mapper.writeValueAsString(new Holder46(localDate, localDate));
+        assertEquals(aposToQuotes("{\"localDate\":[2017,12,5],\"object\":{\"java.time.LocalDate\":[2017,12,5]}}"),
+                dateHolderStr);
+    }
 }

pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.9.2</version>
+    <version>2.9.3-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-modules-java8</artifactId>