Fix #50

Author: cowtowncoder

release-notes/CREDITS

@@ -47,3 +47,7 @@ jukkasi@github:
 Ken Southerland (crowmagnumb@github):
   * Reported #45: Problem Deserializing `java.time.OffsetTime` from JSON Array
    (2.6.3)
+
+Peter Royal (osi@github)
+  * Reported #50: `Instant` schema representation is incorrect for timestamps serialization
+   (2.6.4)

release-notes/VERSION

@@ -3,6 +3,11 @@ Project: jackson-datatype-jsr310
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.4 (not yet released)
+
+#50: `Instant` schema representation is incorrect for timestamps serialization
+ (reported by Peter R)
+
 2.6.3 (12-Oct-2015)
 
 #44: Allows users to pass a custom DateTimeFormatter for the ZonedDateTimeSerializer

src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/InstantSerializerBase.java

@@ -16,17 +16,23 @@
 
 package com.fasterxml.jackson.datatype.jsr310.ser;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.datatype.jsr310.DecimalUtils;
-
 import java.io.IOException;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.Temporal;
 import java.util.function.ToIntFunction;
 import java.util.function.ToLongFunction;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser.NumberType;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonNumberFormatVisitor;
+import com.fasterxml.jackson.datatype.jsr310.DecimalUtils;
+
 /**
  * Base class for serializers used for {@link java.time.Instant} and related types.
  */
@@ -93,4 +99,24 @@ public void serialize(T value, JsonGenerator generator, SerializerProvider provi
             generator.writeString(str);
         }
     }
+
+    // Overridden to ensure that our timestamp handling is as expected
+    @Override
+    protected void _acceptTimestampVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
+        throws JsonMappingException
+    {
+        SerializerProvider prov = visitor.getProvider();
+        if ((prov != null) && 
+                prov.isEnabled(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)) {
+            JsonNumberFormatVisitor v2 = visitor.expectNumberFormat(typeHint);
+            if (v2 != null) {
+                v2.numberType(NumberType.BIG_DECIMAL);
+            }
+        } else {
+            JsonIntegerFormatVisitor v2 = visitor.expectIntegerFormat(typeHint);
+            if (v2 != null) {
+                v2.numberType(NumberType.LONG);
+            }
+        }
+    }
 }

src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/JSR310FormattedSerializerBase.java

@@ -123,22 +123,11 @@ public JsonSerializer<?> createContextual(SerializerProvider prov,
     @Override
     public JsonNode getSchema(SerializerProvider provider, Type typeHint)
     {
-        return this.createSchemaNode(
+        return createSchemaNode(
                 provider.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) ? "array" : "string", true
         );
     }
 
-    protected boolean useTimestamp(SerializerProvider provider) {
-        if (_useTimestamp != null) {
-            return _useTimestamp.booleanValue();
-        }
-        // assume that explicit formatter definition implies use of textual format
-        if (_formatter != null) { 
-            return false;
-        }
-        return provider.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    }
-
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException
     {
@@ -153,7 +142,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
             }
         }
     }
-    
+
     protected void _acceptTimestampVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException
     {
         // By default, most sub-types use JSON Array, so do this:
@@ -162,4 +151,15 @@ protected void _acceptTimestampVisitor(JsonFormatVisitorWrapper visitor, JavaTyp
             v2.itemsFormat(JsonFormatTypes.INTEGER);
         }
     }
+
+    protected boolean useTimestamp(SerializerProvider provider) {
+        if (_useTimestamp != null) {
+            return _useTimestamp.booleanValue();
+        }
+        // assume that explicit formatter definition implies use of textual format
+        if (_formatter != null) { 
+            return false;
+        }
+        return provider.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    }
 }

src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalDateSerializer.java

@@ -27,7 +27,7 @@
  * Serializer for Java 8 temporal {@link LocalDate}s.
  *
  * @author Nick Williams
- * @since 2.2.0
+ * @since 2.2
  */
 public class LocalDateSerializer extends JSR310FormattedSerializerBase<LocalDate>
 {

src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/OffsetTimeSerializer.java

@@ -52,30 +52,30 @@ protected OffsetTimeSerializer withFormat(Boolean useTimestamp, DateTimeFormatte
     }
 
     @Override
-    public void serialize(OffsetTime time, JsonGenerator generator, SerializerProvider provider) throws IOException
+    public void serialize(OffsetTime time, JsonGenerator gen, SerializerProvider provider) throws IOException
     {
         if (useTimestamp(provider)) {
-            generator.writeStartArray();
-            generator.writeNumber(time.getHour());
-            generator.writeNumber(time.getMinute());
+            gen.writeStartArray();
+            gen.writeNumber(time.getHour());
+            gen.writeNumber(time.getMinute());
             final int secs = time.getSecond();
             final int nanos = time.getNano();
             if (secs > 0 || nanos > 0)
             {
-                generator.writeNumber(secs);
+                gen.writeNumber(secs);
                 if (nanos > 0)
                 {
                     if(provider.isEnabled(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS))
-                        generator.writeNumber(nanos);
+                        gen.writeNumber(nanos);
                     else
-                        generator.writeNumber(time.get(ChronoField.MILLI_OF_SECOND));
+                        gen.writeNumber(time.get(ChronoField.MILLI_OF_SECOND));
                 }
             }
-            generator.writeString(time.getOffset().toString());
-            generator.writeEndArray();
+            gen.writeString(time.getOffset().toString());
+            gen.writeEndArray();
         } else {
             String str = (_formatter == null) ? time.toString() : time.format(_formatter);
-            generator.writeString(str);
+            gen.writeString(str);
         }
     }
 }