EPMRPP-88602 || refactor deserializer

reportportal · Apr 1, 2024 · c0f07a9 · c0f07a9
1 parent ebd10ab
commit c0f07a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...main/java/com/epam/ta/reportportal/ws/reporting/databind/MultiFormatDateDeserializer.java b/...main/java/com/epam/ta/reportportal/ws/reporting/databind/MultiFormatDateDeserializer.java
@@ -26,7 +26,6 @@
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
 
 /**
  * Deserialization class for parsing incoming dates of different formats.
@@ -48,6 +47,12 @@ public Instant deserialize(JsonParser parser, DeserializationContext context) th
     if (longDate > 0) {
       return Instant.ofEpochMilli(longDate);
     }
+    try {
+      long millis = Long.parseLong(parser.getText());
+      return Instant.ofEpochMilli(millis);
+    } catch (NumberFormatException e) {
+      // ignore
+    }
 
     String strDate = parser.getText();
     DateTimeFormatter formatter =

diff --git a/.../com/epam/ta/reportportal/ws/reporting/deserializers/MultiFormatDateDeserializerTest.java b/.../com/epam/ta/reportportal/ws/reporting/deserializers/MultiFormatDateDeserializerTest.java
@@ -48,6 +48,7 @@ class MultiFormatDateDeserializerTest {
       "2024-03-01T20:24:09.930Z",
       "2024-03-01T20:24:09.930",
       "2024-03-01T20:24:09.930+00:00",
+      "1709324649930"
   })
   void deserializeDates(String strDate) throws IOException {
     MultiFormatDateDeserializer a = new MultiFormatDateDeserializer();