Fixes #251: problem with buffering of Ion Timestamp value during deserialization (#479)

Author: cowtowncoder

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/TimestampSerializer.java

@@ -35,8 +35,12 @@ protected TimestampSerializer() {
     }
 
     @Override
-    public void serialize(Timestamp value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-        IonGenerator joiGenerator = (IonGenerator) jgen;
-        joiGenerator.writeValue(value);
+    public void serialize(Timestamp value, JsonGenerator g, SerializerProvider provider) throws IOException {
+        if (g instanceof IonGenerator) {
+            ((IonGenerator) g).writeValue(value);
+        } else {
+            // Otherwise probably `TokenBuffer`, so
+            g.writeEmbeddedObject(value);
+        }
     }
 }

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonTimestampDeser251Test.java

@@ -0,0 +1,78 @@
+package com.fasterxml.jackson.dataformat.ion;
+
+import org.junit.Test;
+
+import com.amazon.ion.Timestamp;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.dataformat.ion.ionvalue.IonValueModule;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+// For [dataformats-binary#251]
+public class IonTimestampDeser251Test
+{
+    static class MessageWithoutTimestamp {
+        final String message;
+        final Integer count;
+
+        @JsonCreator
+        public MessageWithoutTimestamp(@JsonProperty("message") String message,
+                       @JsonProperty("count") Integer count) {
+            this.message = message;
+            this.count = count;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+    }
+
+    static class MessageWithTimestamp {
+        final String message;
+        final Integer count;
+
+        public Timestamp timestamp;
+
+        @JsonCreator
+        public MessageWithTimestamp(@JsonProperty("message") String message,
+                       @JsonProperty("count") Integer count) {
+            this.message = message;
+            this.count = count;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+    }
+    
+    private final ObjectMapper ION_MAPPER = IonObjectMapper.builder()
+            .addModule(new IonValueModule())
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .build();
+
+    // [dataformats-binary#251]
+    @Test
+    public void testDeserWithIgnoredBufferedTimestamp() throws Exception {
+        String ion = "{message: \"Hello, world\", timestamp:2021-03-10T01:49:30.242-00:00}";
+        MessageWithoutTimestamp message = ION_MAPPER.readValue(ion,
+                MessageWithoutTimestamp.class);
+        assertNotNull(message);
+        assertEquals("Hello, world", message.message);
+    }
+
+    @Test
+    public void testDeserWithBufferedTimestamp() throws Exception {
+        String ion = "{message: \"Hello, world\", timestamp:2021-03-10T01:49:30.242-00:00}";
+        MessageWithTimestamp message = ION_MAPPER.readValue(ion,
+                MessageWithTimestamp.class);
+        assertNotNull(message);
+        assertEquals("Hello, world", message.message);
+        assertNotNull(message.timestamp);
+    }
+}

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/failing/IonTimestampDeser251Test.java

@@ -16,6 +16,8 @@ Active maintainers:
 
 2.17.0 (not yet released)
 
+#251 (ion) Unable to deserialize Object with unknown `Timestamp` field
+ (reported by @mgoertzen)
 #316 (cbor) Uncaught exception in
   `com.fasterxml.jackson.dataformat.cbor.CBORParser._finishShortText`
 #392: (cbor, smile) Support `StreamReadConstraints.maxDocumentLength`