fix: fix date function null and date handling, fixes #376 #377

improved null value handling, added support for parsing dates
fortify · Jul 28, 2023 · 11a9c4c · 11a9c4c
1 parent 5a819e4
commit 11a9c4c
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java b/...-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java
@@ -29,7 +29,17 @@ public class StandardSpelFunctions {
     private static final DateTimePeriodHelper PeriodHelper = DateTimePeriodHelper.all();
 
     public static final OffsetDateTime date(String s) {
-        return OffsetDateTime.parse(s);
+        if(s == null) { return null; }
+
+        OffsetDateTime dt = null;
+        try {
+            dt= OffsetDateTime.parse(s);
+        } catch(DateTimeParseException e) {
+            LocalDate d = LocalDate.parse(s);
+            dt = OffsetDateTime.of(d.atStartOfDay(), ZoneOffset.UTC);
+        }
+
+        return dt;
     }
 
     public static final OffsetDateTime now(String... s) {