Merge pull request #588 from CycloneDX/Support_extended_formats

Author: nscuro

src/main/java/org/cyclonedx/util/TimestampUtils.java

@@ -20,18 +20,22 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.Date;
 
 @SuppressWarnings("unused")
 public final class TimestampUtils {
-  private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
+  private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss[.SSS][XXX]");
 
   private TimestampUtils() {}
 
   public static Date parseTimestamp(String text) {
     try {
-      return DATE_FORMAT.parse(text);
-    } catch (ParseException | NullPointerException e) {
+      ZonedDateTime zdt = ZonedDateTime.parse(text, DATE_FORMAT);
+      return Date.from(zdt.toInstant());
+    } catch (DateTimeParseException | NullPointerException e) {
       return null;
     }
   }

src/test/java/org/cyclonedx/util/TimestampUtilsTest.java

@@ -0,0 +1,52 @@
+package org.cyclonedx.util;
+
+import java.util.Date;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class TimestampUtilsTest
+{
+  @Test
+  public void testParseTimestampValid() {
+    String validTimestamp = "2023-10-01T12:34:56.789+00:00";
+    Date date = TimestampUtils.parseTimestamp(validTimestamp);
+    assertNotNull(date);
+  }
+
+  @Test
+  public void testParseTimestampWithZ() {
+    String validTimestampWithZ = "2021-01-01T00:00:00.000Z";
+    Date date = TimestampUtils.parseTimestamp(validTimestampWithZ);
+    assertNotNull(date);
+  }
+
+  @Test
+  public void testParseTimestampValidWithoutMilliseconds() {
+    String validTimestamp = "2023-10-01T12:34:56+00:00";
+    Date date = TimestampUtils.parseTimestamp(validTimestamp);
+    assertNotNull(date);
+  }
+
+  @Test
+  public void testParseTimestampInvalid() {
+    String invalidTimestamp = "invalid-timestamp";
+    Date date = TimestampUtils.parseTimestamp(invalidTimestamp);
+    assertNull(date);
+  }
+
+  @Test
+  public void testParseTimestampNull() {
+    Date date = TimestampUtils.parseTimestamp(null);
+    assertNull(date);
+  }
+
+  @Test
+  public void testParseTimestampEmpty() {
+    String emptyTimestamp = "";
+    Date date = TimestampUtils.parseTimestamp(emptyTimestamp);
+    assertNull(date);
+  }
+}