Support alternate date formats in StateMachine.fromJson().

aws · Feb 15, 2024 · 51f18de · 51f18de
1 parent 3966385
commit 51f18de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...tions/src/main/java/com/amazonaws/services/stepfunctions/builder/internal/DateModule.java b/...tions/src/main/java/com/amazonaws/services/stepfunctions/builder/internal/DateModule.java
@@ -14,6 +14,7 @@
  */
 package com.amazonaws.services.stepfunctions.builder.internal;
 
+import com.amazonaws.util.DateUtils;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -59,7 +60,7 @@ public Date deserialize(JsonParser jsonParser,
     }
 
     public static Date fromJson(String jsonText) {
-        return FORMATTER.parseDateTime(jsonText).toDate();
+        return DateUtils.parseISO8601Date(jsonText);
     }
 
 }
diff --git a/...s/src/test/java/com/amazonaws/services/stepfunctions/builder/StepFunctionBuilderTest.java b/...s/src/test/java/com/amazonaws/services/stepfunctions/builder/StepFunctionBuilderTest.java
@@ -667,4 +667,18 @@ public void stateMachineFromJson_MalformedJson_ThrowsException() {
         StateMachine.fromJson("{");
     }
 
+    @Test
+    public void stateMachineFromJson_JsonWithTimestampWithFractionalSeconds_DoesNotThrowException() {
+        StateMachine.fromJson(
+            "{\"StartAt\":\"TestTime\",\"States\":{\"TestTime\":{\"Type\":\"Wait\",\"Timestamp\":\"2016-03-14T01:59:00.000Z\",\"End\":true}}}"
+        );
+    }
+
+    @Test
+    public void stateMachineFromJson_JsonWithTimestampWithoutFractionalSeconds_DoesNotThrowException() {
+        StateMachine.fromJson(
+            "{\"StartAt\":\"TestTime\",\"States\":{\"TestTime\":{\"Type\":\"Wait\",\"Timestamp\":\"2016-03-14T01:59:00Z\",\"End\":true}}}"
+        );
+    }
+
 }