Merge pull request #45 from spdx/isdates

Update Verify to handle ISO 8601 date formats

Author: goneall

src/main/java/org/spdx/library/SpdxConstants.java

@@ -332,7 +332,7 @@ public class SpdxConstants {
 	@Deprecated
 	public static final String PROP_REVIEW_DATE = "reviewDate";
 
-	// Date format
+	// Date format - NOTE: This format does not handle milliseconds.  Use Instant.parse for full ISO 8601 parsing
 	public static final String SPDX_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
 
 	// license ID format

src/main/java/org/spdx/library/SpdxVerificationHelper.java

@@ -17,8 +17,8 @@
 package org.spdx.library;
 
 import java.net.URI;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
 import org.spdx.library.model.enumerations.ChecksumAlgorithm;
@@ -118,10 +118,9 @@ private static String verifyOriginatorOrSupplier(String originatorOrSupplier) {
 	 * @return
 	 */
 	public static String verifyDate(String creationDate) {
-		SimpleDateFormat format = new SimpleDateFormat(SpdxConstants.SPDX_DATE_FORMAT);
 		try {
-			format.parse(creationDate);
-		} catch (ParseException e) {
+			Instant.parse(creationDate);
+		} catch (DateTimeParseException e) {
 			return("Invalid date format: "+e.getMessage());
 		}
 		return null;

src/test/java/org/spdx/library/SpdxVerificationHelperTest.java

@@ -89,8 +89,11 @@ public void testVerifySupplier() {
 	 */
 	public void testVerifyDate() {
 		DateFormat format = new SimpleDateFormat(SpdxConstants.SPDX_DATE_FORMAT);
-		assertTrue(Objects.isNull(SpdxVerificationHelper.verifyDate(format.format(new Date()))));
+		String fullDate = format.format(new Date());
+		assertTrue(Objects.isNull(SpdxVerificationHelper.verifyDate(fullDate)));
 		assertFalse(Objects.isNull(SpdxVerificationHelper.verifyDate(new Date().toString())));
+		String withSubSeconds = fullDate.substring(0, fullDate.length()-1) + ".234Z";
+		assertTrue(Objects.isNull(SpdxVerificationHelper.verifyDate(withSubSeconds)));
 	}
 
 	/**