Skip to content

Commit 5ac26bb

Browse files
filiphrfiliphr
committed
Remove Joda Time support
Add support for reading Joda Time variables as Joda Time by using flowable.joda-time-variable-support with value write
1 parent fd34a3f commit 5ac26bb

61 files changed

Lines changed: 681 additions & 447 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎distro/src/readme.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,26 @@ <h3>Release Notes - Flowable - 8.0.0</h3>
4040
Date properties e.g., Process Instance start time will be returned as an ISO 8601 in the UTC timezone.
4141
E.g., if the start time was returned as <code>2025-09-24T09:58:12.609+02:00</code> now it is returned as <code>2025-09-24T07:58:12.609Z</code>.
4242
</li>
43+
<li>
44+
Remove Joda Time support.
45+
If Joda Time variables were being used, then the Joda LocalDate variable is now an instance of java.time.LocalDate
46+
and the Joda DateTime variable is now an instance of java.time.Instant.
47+
If variables should keep being read as Joda Time (e.g., for custom scripts etc.), then with Spring Boot the property <code>flowable.joda-time-variable-support</code>
48+
can be set to <code>WRITE</code>.
49+
The available values for <code>flowable.joda-time-variable-support</code> are:
50+
<ul>
51+
<li><code>DISABLE</code> - Completely disables Joda Time. If you have Joda Time variables in the database then reading those variables will fail.
52+
</li>
53+
<li><code>READ_AS_JAVA_TIME</code> - Reads Joda Time variables from the database as Java LocalDate and DateTime. This is the default configuration.
54+
</li>
55+
<li><code>WRITE</code> - Reads and Writes Joda Time variables. This is the same as prior to Flowable 8. The joda-time dependency has to be available
56+
on the classpath.
57+
</li>
58+
</ul>
59+
Keep in mind that this only works for variables, Flowable itself no longer supports Joda Time, i.e., due dates, timers, etc. no longer support Joda Time
60+
values.
61+
</li>
62+
4363
</ul>
4464
<h3>Release Notes - Flowable - 7.2.0</h3>
4565

‎docs/docusaurus/docs/cmmn/ch06-cmmn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ Properties:
929929

930930
- **Timer expression**: an expression that defines when the timer should occur. The following options are possible:
931931

932-
- An expression resolving to a java.util.Date or org.joda.time.DateTime instance (for example, \_${someBean.calculateNextDate(someCaseInstanceVariable)})
932+
- An expression resolving to a java.util.Date, java.time.Instant, java.time.LocalDate or java.time.LocalDateTime instance (for example, \_${someBean.calculateNextDate(someCaseInstanceVariable)})
933933

934934
- An ISO8601 date
935935

‎modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@
1313
package org.flowable.app.rest.service;
1414

1515
import static org.assertj.core.api.Assertions.assertThat;
16-
import static org.assertj.core.api.Assertions.fail;
1716

1817
import java.io.IOException;
1918
import java.io.UncheckedIOException;
2019
import java.net.URLEncoder;
2120
import java.nio.charset.StandardCharsets;
2221
import java.text.DateFormat;
2322
import java.text.SimpleDateFormat;
23+
import java.time.Instant;
2424
import java.util.ArrayList;
2525
import java.util.Arrays;
2626
import java.util.Date;
2727
import java.util.Iterator;
2828
import java.util.LinkedList;
2929
import java.util.List;
30-
import java.util.TimeZone;
3130

3231
import org.apache.commons.io.IOUtils;
3332
import org.apache.commons.lang3.StringUtils;
@@ -50,8 +49,6 @@
5049
import org.flowable.common.engine.impl.test.EnsureCleanDb;
5150
import org.flowable.common.engine.impl.test.LoggingExtension;
5251
import org.flowable.common.rest.util.RestUrlBuilder;
53-
import org.joda.time.format.DateTimeFormatter;
54-
import org.joda.time.format.ISODateTimeFormat;
5552
import org.junit.jupiter.api.AfterEach;
5653
import org.junit.jupiter.api.BeforeEach;
5754
import org.junit.jupiter.api.extension.ExtendWith;
@@ -271,19 +268,11 @@ protected void assertErrorResult(String url, ObjectNode body, int statusCode) th
271268
* Extract a date from the given string. Assertion fails when invalid date has been provided.
272269
*/
273270
protected Date getDateFromISOString(String isoString) {
274-
DateTimeFormatter dateFormat = ISODateTimeFormat.dateTime();
275-
try {
276-
return dateFormat.parseDateTime(isoString).toDate();
277-
} catch (IllegalArgumentException iae) {
278-
fail("Illegal date provided: " + isoString);
279-
return null;
280-
}
271+
return Date.from(Instant.parse(isoString));
281272
}
282273

283274
protected String getISODateString(Date time) {
284-
TimeZone tz = TimeZone.getTimeZone("UTC");
285-
longDateFormat.setTimeZone(tz);
286-
return longDateFormat.format(time);
275+
return time.toInstant().toString();
287276
}
288277

289278
protected String buildUrl(String[] fragments, Object... arguments) {

‎modules/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import org.flowable.common.engine.impl.el.ExpressionManager;
7070
import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
7171
import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
72+
import org.flowable.common.engine.impl.joda.JodaDeprecationLogger;
7273
import org.flowable.common.engine.impl.persistence.deploy.DefaultDeploymentCache;
7374
import org.flowable.common.engine.impl.persistence.deploy.DeploymentCache;
7475
import org.flowable.common.engine.impl.persistence.entity.TableDataManager;
@@ -80,6 +81,7 @@
8081
import org.flowable.variable.api.types.VariableType;
8182
import org.flowable.variable.api.types.VariableTypes;
8283
import org.flowable.variable.service.VariableServiceConfiguration;
84+
import org.flowable.variable.service.impl.JodaTimeVariableSupport;
8385
import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
8486
import org.flowable.variable.service.impl.types.BigDecimalType;
8587
import org.flowable.variable.service.impl.types.BigIntegerType;
@@ -91,8 +93,6 @@
9193
import org.flowable.variable.service.impl.types.EmptyCollectionType;
9294
import org.flowable.variable.service.impl.types.InstantType;
9395
import org.flowable.variable.service.impl.types.IntegerType;
94-
import org.flowable.variable.service.impl.types.JodaDateTimeType;
95-
import org.flowable.variable.service.impl.types.JodaDateType;
9696
import org.flowable.variable.service.impl.types.JsonType;
9797
import org.flowable.variable.service.impl.types.LocalDateTimeType;
9898
import org.flowable.variable.service.impl.types.LocalDateType;
@@ -156,6 +156,8 @@ public class AppEngineConfiguration extends AbstractBuildableEngineConfiguration
156156
*/
157157
protected boolean jsonVariableTypeTrackObjects = true;
158158

159+
protected JodaTimeVariableSupport jodaTimeVariableSupport = JodaTimeVariableSupport.READ_AS_JAVA_TIME;
160+
159161

160162
protected BusinessCalendarManager businessCalendarManager;
161163

@@ -402,8 +404,7 @@ public void initVariableTypes() {
402404
variableTypes.addType(new InstantType());
403405
variableTypes.addType(new LocalDateType());
404406
variableTypes.addType(new LocalDateTimeType());
405-
variableTypes.addType(new JodaDateType());
406-
variableTypes.addType(new JodaDateTimeType());
407+
jodaTimeVariableSupport.registerJodaTypes(variableTypes);
407408
variableTypes.addType(new DoubleType());
408409
variableTypes.addType(new BigDecimalType());
409410
variableTypes.addType(new BigIntegerType());
@@ -740,6 +741,19 @@ public AppEngineConfiguration setJsonVariableTypeTrackObjects(boolean jsonVariab
740741
return this;
741742
}
742743

744+
public JodaTimeVariableSupport getJodaTimeVariableSupport() {
745+
return jodaTimeVariableSupport;
746+
}
747+
748+
public AppEngineConfiguration setJodaTimeVariableSupport(JodaTimeVariableSupport jodaTimeVariableSupport) {
749+
//noinspection deprecation
750+
if (JodaTimeVariableSupport.WRITE == jodaTimeVariableSupport) {
751+
JodaDeprecationLogger.LOGGER.warn("Using deprecated joda time write support for the app engine configuration");
752+
}
753+
this.jodaTimeVariableSupport = jodaTimeVariableSupport;
754+
return this;
755+
}
756+
743757
public boolean isDisableIdmEngine() {
744758
return disableIdmEngine;
745759
}

‎modules/flowable-batch-service/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<groupId>org.springframework</groupId>
3939
<artifactId>spring-beans</artifactId>
4040
</dependency>
41-
<dependency>
42-
<groupId>joda-time</groupId>
43-
<artifactId>joda-time</artifactId>
44-
</dependency>
4541
<dependency>
4642
<groupId>org.slf4j</groupId>
4743
<artifactId>slf4j-api</artifactId>

‎modules/flowable-bpmn-converter/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
<groupId>org.apache.commons</groupId>
5454
<artifactId>commons-lang3</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>joda-time</groupId>
58-
<artifactId>joda-time</artifactId>
59-
</dependency>
6056
<dependency>
6157
<groupId>org.slf4j</groupId>
6258
<artifactId>slf4j-reload4j</artifactId>

‎modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@
255255
import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
256256
import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
257257
import org.flowable.common.engine.impl.javax.el.ELResolver;
258+
import org.flowable.common.engine.impl.joda.JodaDeprecationLogger;
258259
import org.flowable.common.engine.impl.persistence.deploy.DefaultDeploymentCache;
259260
import org.flowable.common.engine.impl.persistence.deploy.DeploymentCache;
260261
import org.flowable.common.engine.impl.persistence.entity.TableDataManager;
@@ -304,6 +305,7 @@
304305
import org.flowable.variable.api.types.VariableTypes;
305306
import org.flowable.variable.service.VariableServiceConfiguration;
306307
import org.flowable.variable.service.history.InternalHistoryVariableManager;
308+
import org.flowable.variable.service.impl.JodaTimeVariableSupport;
307309
import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
308310
import org.flowable.variable.service.impl.types.BigDecimalType;
309311
import org.flowable.variable.service.impl.types.BigIntegerType;
@@ -315,8 +317,6 @@
315317
import org.flowable.variable.service.impl.types.EmptyCollectionType;
316318
import org.flowable.variable.service.impl.types.InstantType;
317319
import org.flowable.variable.service.impl.types.IntegerType;
318-
import org.flowable.variable.service.impl.types.JodaDateTimeType;
319-
import org.flowable.variable.service.impl.types.JodaDateType;
320320
import org.flowable.variable.service.impl.types.JsonType;
321321
import org.flowable.variable.service.impl.types.LocalDateTimeType;
322322
import org.flowable.variable.service.impl.types.LocalDateType;
@@ -514,6 +514,8 @@ public class CmmnEngineConfiguration extends AbstractBuildableEngineConfiguratio
514514
*/
515515
protected boolean jsonVariableTypeTrackObjects = true;
516516

517+
protected JodaTimeVariableSupport jodaTimeVariableSupport = JodaTimeVariableSupport.READ_AS_JAVA_TIME;
518+
517519
protected List<CaseInstanceMigrationCallback> caseInstanceMigrationCallbacks;
518520

519521
// Set Http Client config defaults
@@ -1408,8 +1410,7 @@ public void initVariableTypes() {
14081410
variableTypes.addType(new InstantType());
14091411
variableTypes.addType(new LocalDateType());
14101412
variableTypes.addType(new LocalDateTimeType());
1411-
variableTypes.addType(new JodaDateType());
1412-
variableTypes.addType(new JodaDateTimeType());
1413+
jodaTimeVariableSupport.registerJodaTypes(variableTypes);
14131414
variableTypes.addType(new DoubleType());
14141415
variableTypes.addType(new BigDecimalType());
14151416
variableTypes.addType(new BigIntegerType());
@@ -2967,6 +2968,19 @@ public CmmnEngineConfiguration setJsonVariableTypeTrackObjects(boolean jsonVaria
29672968
return this;
29682969
}
29692970

2971+
public JodaTimeVariableSupport getJodaTimeVariableSupport() {
2972+
return jodaTimeVariableSupport;
2973+
}
2974+
2975+
public CmmnEngineConfiguration setJodaTimeVariableSupport(JodaTimeVariableSupport jodaTimeVariableSupport) {
2976+
//noinspection deprecation
2977+
if (JodaTimeVariableSupport.WRITE == jodaTimeVariableSupport) {
2978+
JodaDeprecationLogger.LOGGER.warn("Using deprecated joda time write support for the CMMN engine configuration");
2979+
}
2980+
this.jodaTimeVariableSupport = jodaTimeVariableSupport;
2981+
return this;
2982+
}
2983+
29702984
public CaseDiagramGenerator getCaseDiagramGenerator() {
29712985
return caseDiagramGenerator;
29722986
}

‎modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/TimerEventListenerActivityBehaviour.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@
4040
import org.flowable.common.engine.impl.calendar.DueDateBusinessCalendar;
4141
import org.flowable.common.engine.impl.el.ExpressionManager;
4242
import org.flowable.common.engine.impl.interceptor.CommandContext;
43-
import org.flowable.common.engine.impl.joda.JodaDeprecationLogger;
4443
import org.flowable.common.engine.impl.runtime.Clock;
4544
import org.flowable.common.engine.impl.util.DateUtil;
4645
import org.flowable.job.service.JobServiceConfiguration;
4746
import org.flowable.job.service.impl.persistence.entity.JobEntity;
4847
import org.flowable.job.service.impl.persistence.entity.TimerJobEntity;
4948
import org.flowable.job.service.impl.persistence.entity.TimerJobEntityManager;
50-
import org.joda.time.DateTime;
5149

5250
/**
5351
* {@link CmmnActivityBehavior} implementation for the CMMN Timer Event Listener.
@@ -101,12 +99,6 @@ protected void handleCreateTransition(CommandContext commandContext, PlanItemIns
10199
if (timerValue instanceof Date) {
102100
timerDueDate = (Date) timerValue;
103101

104-
} else if (timerValue instanceof DateTime timerDateTime) {
105-
JodaDeprecationLogger.LOGGER.warn(
106-
"Using Joda-Time DateTime has been deprecated and will be removed in a future version. Timer event listener expression {} in {} resolved to a Joda-Time DateTime. ",
107-
timerEventListener.getTimerExpression(), planItemInstance);
108-
timerDueDate = timerDateTime.toDate();
109-
110102
} else if (timerValue instanceof String timerString) {
111103

112104
BusinessCalendarManager businessCalendarManager = CommandContextUtil.getCmmnEngineConfiguration(commandContext).getBusinessCalendarManager();
@@ -146,7 +138,7 @@ protected void handleCreateTransition(CommandContext commandContext, PlanItemIns
146138
}
147139

148140
if (timerDueDate == null) {
149-
throw new FlowableException("Timer expression '" + timerEventListener.getTimerExpression() + "' did not resolve to java.util.Date, org.joda.time.DateTime, "
141+
throw new FlowableException("Timer expression '" + timerEventListener.getTimerExpression() + "' did not resolve to java.util.Date, "
150142
+ "java.time.Instant, java.time.LocalDate, java.time.LocalDateTime or "
151143
+ "an ISO8601 date/duration/repetition string or a cron expression for " + planItemInstance);
152144
}

‎modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delegate/JsonPlanItemVariableAggregator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.flowable.variable.service.impl.types.DoubleType;
3636
import org.flowable.variable.service.impl.types.InstantType;
3737
import org.flowable.variable.service.impl.types.IntegerType;
38-
import org.flowable.variable.service.impl.types.JodaDateTimeType;
39-
import org.flowable.variable.service.impl.types.JodaDateType;
38+
import org.flowable.variable.service.impl.types.JodaDateTimeFallbackType;
39+
import org.flowable.variable.service.impl.types.JodaDateFallbackType;
4040
import org.flowable.variable.service.impl.types.JsonType;
4141
import org.flowable.variable.service.impl.types.LocalDateTimeType;
4242
import org.flowable.variable.service.impl.types.LocalDateType;
@@ -140,8 +140,8 @@ public Object aggregateSingleVariable(DelegatePlanItemInstance planItemInstance,
140140
case InstantType.TYPE_NAME:
141141
case LocalDateType.TYPE_NAME:
142142
case LocalDateTimeType.TYPE_NAME:
143-
case JodaDateType.TYPE_NAME:
144-
case JodaDateTimeType.TYPE_NAME:
143+
case JodaDateFallbackType.TYPE_NAME:
144+
case JodaDateTimeFallbackType.TYPE_NAME:
145145
case UUIDType.TYPE_NAME:
146146
// For all these types it is OK to use toString as their string representation is what we want to have
147147
objectNode.put(targetVarName, varInstance.getValue().toString());

‎modules/flowable-common-rest/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
<artifactId>slf4j-api</artifactId>
5252
</dependency>
5353

54-
<!-- Joda time -->
55-
<dependency>
56-
<groupId>joda-time</groupId>
57-
<artifactId>joda-time</artifactId>
58-
</dependency>
59-
6054
<!--- Commons -->
6155
<dependency>
6256
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)