Fix for Marshalling List/Map of TimeStamps

Author: joviegas

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

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Fix for NullPointerException while Marshalling List/Map of TimeStamps"
+}

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypeJsonMarshaller.java

@@ -105,7 +105,7 @@ public void marshall(Boolean val, StructuredJsonGenerator jsonGenerator, JsonMar
         if (paramName != null) {
             jsonGenerator.writeFieldName(paramName);
         }
-        TimestampFormatTrait trait = sdkField.getTrait(TimestampFormatTrait.class);
+        TimestampFormatTrait trait = sdkField != null ? sdkField.getTrait(TimestampFormatTrait.class) : null;
         if (trait != null) {
             switch (trait.format()) {
                 case UNIX_TIMESTAMP:

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/json-core-input.json

@@ -474,5 +474,45 @@
         }
       }
     }
+  },
+  {
+    "description": "TimeStampMap member in the payload is marshalled as seconds with millisecond precision",
+    "given": {
+      "input": {
+        "MapOfTimeStamp": {
+          "key1": 1422172801123
+        }
+      }
+    },
+    "when": {
+      "action": "marshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "serializedAs": {
+        "body": {
+          "jsonEquals":"{\"MapOfTimeStamp\": {\"key1\": 1422172801.123}}"
+        }
+      }
+    }
+  },
+  {
+    "description": "TimestampList member in the payload is marshalled as seconds with millisecond precision",
+    "given": {
+      "input": {
+        "ListOfTimeStamp": [1422172801123]
+      }
+    },
+    "when": {
+      "action": "marshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "serializedAs": {
+        "body": {
+          "jsonEquals": "{\"ListOfTimeStamp\": [1422172801.123]}"
+        }
+      }
+    }
   }
 ]

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/json-core-output.json

@@ -525,5 +525,43 @@
 	      ]
 	  }
       }
+  },
+  {
+    "description": "ListOfTimeStamp  with known values unmarshalled correctly",
+    "given": {
+      "response": {
+        "status_code": 200,
+        "body": "{\"ListOfTimeStamp\": [1398796238.123]}"
+      }
+    },
+    "when": {
+      "action": "unmarshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "deserializedAs": {
+        "ListOfTimeStamp": [1398796238123]
+      }
+    }
+  },
+  {
+    "description": "MapOfTimeStamp with known values unmarshalled correctly",
+    "given": {
+      "response": {
+        "status_code": 200,
+        "body": "{\"MapOfTimeStamp\": { \"key1\": 1398796238.123}}"
+      }
+    },
+    "when": {
+      "action": "unmarshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "deserializedAs": {
+        "MapOfTimeStamp": {
+          "key1": 1398796238123
+        }
+      }
+    }
   }
 ]

test/protocol-tests/src/main/resources/codegen-resources/awsjson/service-2.json

@@ -91,7 +91,9 @@
         "PolymorphicTypeWithoutSubTypes":{"shape":"SubTypeOne"},
         "EnumMember":{"shape":"EnumType"},
         "ListOfEnums":{"shape":"ListOfEnums"},
-        "MapOfEnumToEnum":{"shape":"MapOfEnumToEnum"}
+        "MapOfEnumToEnum":{"shape":"MapOfEnumToEnum"},
+        "ListOfTimeStamp":{"shape":"ListOfTimeStamp"},
+        "MapOfTimeStamp":{"shape":"MapOfTimeStamp"}
       }
     },
     "BaseType":{
@@ -294,6 +296,15 @@
         "SubTypeOneMember":{"shape":"String"}
       }
     },
-    "Timestamp":{"type":"timestamp"}
+    "Timestamp":{"type":"timestamp"},
+    "ListOfTimeStamp":{
+      "type":"list",
+      "member":{"shape":"Timestamp"}
+    },
+    "MapOfTimeStamp":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"Timestamp"}
+    }
   }
 }

test/protocol-tests/src/main/resources/codegen-resources/restjson/service-2.json

@@ -239,7 +239,9 @@
         "PolymorphicTypeWithoutSubTypes":{"shape":"SubTypeOne"},
         "EnumMember":{"shape":"EnumType"},
         "ListOfEnums":{"shape":"ListOfEnums"},
-        "MapOfEnumToEnum":{"shape":"MapOfEnumToEnum"}
+        "MapOfEnumToEnum":{"shape":"MapOfEnumToEnum"},
+        "ListOfTimeStamp":{"shape":"ListOfTimeStamp"},
+        "MapOfTimeStamp":{"shape":"MapOfTimeStamp"}
       }
     },
     "BaseType":{
@@ -753,6 +755,15 @@
       }
     },
     "Timestamp":{"type":"timestamp"},
+    "ListOfTimeStamp":{
+      "type":"list",
+      "member":{"shape":"Timestamp"}
+    },
+    "MapOfTimeStamp":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"Timestamp"}
+    },
     "EventStreamOperationRequest": {
       "type": "structure",
       "required": [