[JBPM-10225] Considering time for Dates (#2397)

kiegroup · Mar 14, 2024 · 605dfe8 · 605dfe8
1 parent 3b6411d
commit 605dfe8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/datatype/impl/type/ObjectDataType.java b/jbpm-flow/src/main/java/org/jbpm/process/core/datatype/impl/type/ObjectDataType.java
@@ -137,11 +137,12 @@ private Optional<Object> getObjectFromClass(final Object value) {
     }
 
     private static Collection<DateFormat> dateFormats = Arrays.asList(new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"),
+            new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),
             new SimpleDateFormat("yyyy-MM-dd"), new SimpleDateFormat("HH:mm:ss"), DateFormat.getDateInstance(),
             DateFormat.getTimeInstance(),
             DateFormat.getDateTimeInstance());
 
-    private Date parseDate(String toBeParsed) {
+    private static Date parseDate(String toBeParsed) {
         StringBuilder sb = new StringBuilder();
         for (DateFormat dateFormat : dateFormats) {
             try {

diff --git a/jbpm-flow/src/test/java/org/jbpm/process/core/datatype/impl/ObjectDataTypeTest.java b/jbpm-flow/src/test/java/org/jbpm/process/core/datatype/impl/ObjectDataTypeTest.java
@@ -23,6 +23,7 @@
 import java.time.ZonedDateTime;
 import java.util.Date;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.jbpm.process.core.datatype.impl.type.ObjectDataType;
 import org.junit.Test;
 
@@ -44,6 +45,8 @@ public void testReadValueDate() {
         assertThat(dateType.readValue("12:12:12")).isInstanceOf(Date.class);
         assertThat(dateType.valueOf("2012-02-02")).isInstanceOf(Date.class);
         assertThat(dateType.valueOf("12:12:12")).isInstanceOf(Date.class);
+        assertThat(dateType.valueOf("2016-01-11T01:06:32")).isInstanceOf(Date.class)
+                .asInstanceOf(InstanceOfAssertFactories.DATE).hasHourOfDay(1).hasMinute(6).hasSecond(32);
         assertThat(dateType.valueOf("pepe")).isInstanceOf(String.class);
         assertThatThrownBy(() -> dateType.readValue("pepe")).isInstanceOf(IllegalArgumentException.class);
     }