Fix timestamp unmarshalling off-by-one errors (#6071)

* Fix timestamp unmarshalling off-by-one errors

* Fall back UNIX_TIMESTAMP behavior to previous behavior for now

* Use the target member of the collection instead of the collection field

---------

Co-authored-by: Brandon Dahler <[email protected]>

Author: sugmanue

.changes/next-release/bugfix-AWSSDKforJavav2-2256787.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "brandondahler",
+    "description": "Fix timestamp unmarshalling off-by-one errors"
+}

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallingParser.java

@@ -159,7 +159,7 @@ private List<Object> parseList(JsonUnmarshallerContext c, SdkField<?> field, Jso
         if (isScalarType(marshallingType)) {
             MarshallingKnownType marshallingKnownType = marshallingType.getKnownType();
             while (currentToken != JsonToken.END_ARRAY) {
-                result.add(simpleValueFor(field, marshallingKnownType, c, parser, currentToken));
+                result.add(simpleValueFor(memberInfo, marshallingKnownType, c, parser, currentToken));
                 currentToken = parser.nextToken();
             }
             return result;
@@ -190,7 +190,7 @@ private Map<String, Object> parseMap(JsonUnmarshallerContext c, SdkField<?> fiel
             while (currentToken != JsonToken.END_OBJECT) {
                 String fieldName = parser.getText();
                 currentToken = parser.nextToken();
-                Object valueFor = simpleValueFor(field, valueMarshallingKnownType, c, parser, currentToken);
+                Object valueFor = simpleValueFor(valueInfo, valueMarshallingKnownType, c, parser, currentToken);
                 result.put(fieldName, valueFor);
                 currentToken = parser.nextToken();
             }
@@ -383,17 +383,14 @@ private Instant instantValueFor(
         JsonToken lookAhead
     ) throws IOException {
         TimestampFormatTrait.Format format = resolveTimestampFormat(field);
-        switch (format) {
-            case UNIX_TIMESTAMP:
-                return Instant.ofEpochMilli((long) (parser.getDoubleValue() * 1_000d));
-            case UNIX_TIMESTAMP_MILLIS:
-                return Instant.ofEpochMilli(parser.getLongValue());
-            default:
-                JsonUnmarshaller<Object> unmarshaller = unmarshallerRegistry.getUnmarshaller(MarshallLocation.PAYLOAD,
-                                                                                             field.marshallingType());
-                return (Instant) unmarshaller.unmarshall(context, jsonValueNodeFactory.node(parser, lookAhead),
-                                                         (SdkField<Object>) field);
+        if (format == TimestampFormatTrait.Format.UNIX_TIMESTAMP_MILLIS) {
+            return Instant.ofEpochMilli(parser.getLongValue());
         }
+
+        JsonUnmarshaller<Object> unmarshaller = unmarshallerRegistry.getUnmarshaller(MarshallLocation.PAYLOAD,
+                                                                                     field.marshallingType());
+        return (Instant) unmarshaller.unmarshall(context, jsonValueNodeFactory.node(parser, lookAhead),
+                                                 (SdkField<Object>) field);
     }
 
     /**

core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallingParserTest.java

@@ -19,11 +19,13 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.core.document.Document;
 import software.amazon.awssdk.core.protocol.MarshallLocation;
 import software.amazon.awssdk.thirdparty.jackson.core.JsonParseException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -99,6 +101,27 @@ public void parsingDocumentFieldWithBooleanValue() {
         assertTrue(doc.asBoolean());
     }
 
+    @Test
+    public void parsingTimestampWithoutRoundingNeeded() {
+        JsonUnmarshallingParser parser = parser();
+        TestRequest req = (TestRequest) parser.parse(TestRequest.builder(), from("{\"timestampMember\": 1099510880.773}"));
+        assertNotNull(req);
+        Instant timestamp = req.timestampMember();
+        assertNotNull(timestamp);
+        assertEquals(Instant.ofEpochMilli(1099510880773L), timestamp);
+    }
+
+    @Test
+    public void parsingTimestampWithRoundingNeeded() {
+        JsonUnmarshallingParser parser = parser();
+        // NOTE: 1099510880.771d * 1_000d == 1.0995108807709999E12
+        TestRequest req = (TestRequest) parser.parse(TestRequest.builder(), from("{\"timestampMember\": 1099510880.771}"));
+        assertNotNull(req);
+        Instant timestamp = req.timestampMember();
+        assertNotNull(timestamp);
+        assertEquals(Instant.ofEpochMilli(1099510880771L), timestamp);
+    }
+
     static JsonUnmarshallingParser parser() {
         ProtocolUnmarshallDependencies dependencies = JsonProtocolUnmarshaller.defaultProtocolUnmarshallDependencies();
         JsonUnmarshallingParser parser = JsonUnmarshallingParser

core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/NumberToInstant.java

@@ -51,7 +51,7 @@ public Instant convert(Number value, SdkField<Instant> field) {
         TimestampFormatTrait.Format format = resolveTimestampFormat(field);
         switch (format) {
             case UNIX_TIMESTAMP:
-                return Instant.ofEpochMilli((long) (value.doubleValue() * 1_000d));
+                return Instant.ofEpochMilli(Math.round(value.doubleValue() * 1_000d));
             case UNIX_TIMESTAMP_MILLIS:
                 return Instant.ofEpochMilli(value.longValue());
             default:

core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/NumberToInstantTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.protocols.core;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Instant;
+import java.util.EnumMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.core.traits.TimestampFormatTrait;
+
+class NumberToInstantTest {
+
+    @Test
+    public void unixTimestampWithoutRoundingNeeded() {
+        NumberToInstant instance = instance(TimestampFormatTrait.Format.UNIX_TIMESTAMP);
+        Instant timestamp = instance.convert(1099510880.773d, instantField());
+        assertNotNull(timestamp);
+        assertEquals(Instant.ofEpochMilli(1099510880773L), timestamp);
+    }
+
+    @Test
+    public void parsingTimestampWithRoundingNeeded() {
+        NumberToInstant instance = instance(TimestampFormatTrait.Format.UNIX_TIMESTAMP);
+        // NOTE: 1099510880.771d * 1_000d == 1.0995108807709999E12
+        Instant timestamp = instance.convert(1099510880.771d, instantField());
+        assertNotNull(timestamp);
+        assertEquals(Instant.ofEpochMilli(1099510880771L), timestamp);
+    }
+
+    static NumberToInstant instance(TimestampFormatTrait.Format format) {
+        Map<MarshallLocation, TimestampFormatTrait.Format> formats = new EnumMap<>(MarshallLocation.class);
+        formats.put(MarshallLocation.PAYLOAD, format);
+
+        return NumberToInstant.create(formats);
+    }
+
+    static SdkField<Instant> instantField() {
+        return SdkField.builder(MarshallingType.INSTANT)
+            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).build())
+            .build();
+    }
+}