Skip to content

Commit 36ed1b1

Browse files
vzicknervzickner
authored
Add support for Spring Boot 4
1 parent ce0865d commit 36ed1b1

20 files changed

Lines changed: 96 additions & 111 deletions

File tree

‎client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<dependencies>
1616
<dependency>
17-
<groupId>com.fasterxml.jackson.core</groupId>
17+
<groupId>tools.jackson.core</groupId>
1818
<artifactId>jackson-databind</artifactId>
1919
</dependency>
2020
<dependency>

‎client/src/main/java/org/flowable/external/client/ExternalWorkerJobCompletionBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.time.LocalDateTime;
1818
import java.util.Date;
1919

20-
import com.fasterxml.jackson.databind.JsonNode;
20+
import tools.jackson.databind.JsonNode;
2121

2222
/**
2323
* A builder that can be used to complete a specific job.

‎client/src/main/java/org/flowable/external/client/impl/JavaHttpClientRestInvoker.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
import java.util.function.Function;
2323
import java.util.function.Supplier;
2424

25-
import com.fasterxml.jackson.databind.node.ObjectNode;
2625
import org.flowable.external.client.FlowableClientException;
2726

27+
import tools.jackson.databind.node.ObjectNode;
28+
2829
/**
2930
* @author Filip Hrisafov
3031
*/

‎client/src/main/java/org/flowable/external/client/impl/RestExternalWorkerClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
*/
1313
package org.flowable.external.client.impl;
1414

15-
import com.fasterxml.jackson.databind.ObjectMapper;
1615
import org.flowable.external.client.AcquiredExternalWorkerJob;
1716
import org.flowable.external.client.ExternalWorkerClient;
1817
import org.flowable.external.client.ExternalWorkerJobAcquireBuilder;
1918
import org.flowable.external.client.ExternalWorkerJobCompletionBuilder;
2019
import org.flowable.external.client.ExternalWorkerJobFailureBuilder;
2120

21+
import tools.jackson.databind.ObjectMapper;
22+
2223
/**
2324
* @author Filip Hrisafov
2425
*/

‎client/src/main/java/org/flowable/external/client/impl/RestExternalWorkerCompletionBuilder.java‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,23 @@
1818
import java.util.Date;
1919
import java.util.function.Function;
2020

21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
24-
import com.fasterxml.jackson.core.JsonProcessingException;
25-
import com.fasterxml.jackson.databind.JsonNode;
26-
import com.fasterxml.jackson.databind.ObjectMapper;
27-
import com.fasterxml.jackson.databind.node.BooleanNode;
28-
import com.fasterxml.jackson.databind.node.DoubleNode;
29-
import com.fasterxml.jackson.databind.node.IntNode;
30-
import com.fasterxml.jackson.databind.node.LongNode;
31-
import com.fasterxml.jackson.databind.node.NullNode;
32-
import com.fasterxml.jackson.databind.node.ObjectNode;
33-
import com.fasterxml.jackson.databind.node.ShortNode;
34-
import com.fasterxml.jackson.databind.node.TextNode;
35-
import com.fasterxml.jackson.databind.util.ISO8601Utils;
3621
import org.flowable.external.client.AcquiredExternalWorkerJob;
3722
import org.flowable.external.client.ExternalWorkerJobCompletionBuilder;
3823
import org.flowable.external.client.FlowableClientException;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
27+
import tools.jackson.core.JacksonException;
28+
import tools.jackson.databind.JsonNode;
29+
import tools.jackson.databind.ObjectMapper;
30+
import tools.jackson.databind.node.BooleanNode;
31+
import tools.jackson.databind.node.DoubleNode;
32+
import tools.jackson.databind.node.IntNode;
33+
import tools.jackson.databind.node.LongNode;
34+
import tools.jackson.databind.node.NullNode;
35+
import tools.jackson.databind.node.ObjectNode;
36+
import tools.jackson.databind.node.ShortNode;
37+
import tools.jackson.databind.node.StringNode;
3938

4039
/**
4140
* @author Filip Hrisafov
@@ -59,7 +58,7 @@ public RestExternalWorkerCompletionBuilder(AcquiredExternalWorkerJob workerJob,
5958

6059
@Override
6160
public ExternalWorkerJobCompletionBuilder variable(String name, String value) {
62-
return addVariableToRequest(name, "string", value, TextNode::valueOf);
61+
return addVariableToRequest(name, "string", value, StringNode::valueOf);
6362
}
6463

6564
@Override
@@ -89,22 +88,22 @@ public ExternalWorkerJobCompletionBuilder variable(String name, Boolean value) {
8988

9089
@Override
9190
public ExternalWorkerJobCompletionBuilder variable(String name, Date value) {
92-
return addVariableToRequest(name, "date", value, v -> TextNode.valueOf(ISO8601Utils.format(v)));
91+
return addVariableToRequest(name, "date", value, v -> StringNode.valueOf(v.toInstant().toString()));
9392
}
9493

9594
@Override
9695
public ExternalWorkerJobCompletionBuilder variable(String name, Instant value) {
97-
return addVariableToRequest(name, "instant", value, v -> TextNode.valueOf(v.toString()));
96+
return addVariableToRequest(name, "instant", value, v -> StringNode.valueOf(v.toString()));
9897
}
9998

10099
@Override
101100
public ExternalWorkerJobCompletionBuilder variable(String name, LocalDate value) {
102-
return addVariableToRequest(name, "localDate", value, v -> TextNode.valueOf(v.toString()));
101+
return addVariableToRequest(name, "localDate", value, v -> StringNode.valueOf(v.toString()));
103102
}
104103

105104
@Override
106105
public ExternalWorkerJobCompletionBuilder variable(String name, LocalDateTime value) {
107-
return addVariableToRequest(name, "localDateTime", value, v -> TextNode.valueOf(v.toString()));
106+
return addVariableToRequest(name, "localDateTime", value, v -> StringNode.valueOf(v.toString()));
108107
}
109108

110109
@Override
@@ -130,7 +129,7 @@ protected JsonNode convertToJson(Object value) {
130129
try {
131130
String serializedValue = objectMapper.writeValueAsString(value);
132131
return objectMapper.readTree(serializedValue);
133-
} catch (JsonProcessingException e) {
132+
} catch (JacksonException e) {
134133
throw new FlowableClientException("Failed to convert value of type " + value.getClass().getName() + " to json", e);
135134
}
136135
}

‎client/src/main/java/org/flowable/external/client/impl/RestExternalWorkerFailureBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
import java.io.UncheckedIOException;
1919
import java.time.Duration;
2020

21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
24-
import com.fasterxml.jackson.databind.ObjectMapper;
25-
import com.fasterxml.jackson.databind.node.ObjectNode;
2621
import org.flowable.external.client.AcquiredExternalWorkerJob;
2722
import org.flowable.external.client.ExternalWorkerJobFailureBuilder;
2823
import org.flowable.external.client.FlowableClientException;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
27+
import tools.jackson.databind.ObjectMapper;
28+
import tools.jackson.databind.node.ObjectNode;
2929

3030
/**
3131
* @author Filip Hrisafov

‎client/src/main/java/org/flowable/external/client/impl/RestExternalWorkerJobAcquireBuilder.java‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,24 @@
1212
*/
1313
package org.flowable.external.client.impl;
1414

15-
import java.text.ParseException;
16-
import java.text.ParsePosition;
1715
import java.time.Instant;
1816
import java.time.LocalDate;
1917
import java.time.LocalDateTime;
2018
import java.util.ArrayList;
19+
import java.util.Date;
2120
import java.util.List;
2221
import java.util.function.BiConsumer;
2322

23+
import org.flowable.external.client.AcquiredExternalWorkerJob;
24+
import org.flowable.external.client.FlowableClientException;
2425
import org.slf4j.Logger;
2526
import org.slf4j.LoggerFactory;
2627

27-
import com.fasterxml.jackson.core.JsonProcessingException;
28-
import com.fasterxml.jackson.databind.JsonNode;
29-
import com.fasterxml.jackson.databind.ObjectMapper;
30-
import com.fasterxml.jackson.databind.node.ArrayNode;
31-
import com.fasterxml.jackson.databind.node.ObjectNode;
32-
import com.fasterxml.jackson.databind.util.ISO8601Utils;
33-
import org.flowable.external.client.AcquiredExternalWorkerJob;
34-
import org.flowable.external.client.FlowableClientException;
28+
import tools.jackson.core.JacksonException;
29+
import tools.jackson.databind.JsonNode;
30+
import tools.jackson.databind.ObjectMapper;
31+
import tools.jackson.databind.node.ArrayNode;
32+
import tools.jackson.databind.node.ObjectNode;
3533

3634
/**
3735
* @author Filip Hrisafov
@@ -104,7 +102,7 @@ protected List<AcquiredExternalWorkerJob> asList(String response) {
104102
}
105103

106104
return jobs;
107-
} catch (JsonProcessingException e) {
105+
} catch (JacksonException e) {
108106
throw new FlowableClientException("Failed to read response", e);
109107
}
110108
}
@@ -182,13 +180,7 @@ protected Object parseVariableValue(String type, JsonNode valueNode) {
182180
case "boolean" -> valueNode.booleanValue();
183181
case "double" -> valueNode.doubleValue();
184182
case "long" -> valueNode.longValue();
185-
case "date" -> {
186-
try {
187-
yield ISO8601Utils.parse(valueNode.textValue(), new ParsePosition(0));
188-
} catch (ParseException e) {
189-
yield null;
190-
}
191-
}
183+
case "date" -> Date.from(Instant.parse(valueNode.textValue()));
192184
case "instant" -> Instant.parse(valueNode.textValue());
193185
case "localDate" -> LocalDate.parse(valueNode.textValue());
194186
case "localDateTime" -> LocalDateTime.parse(valueNode.textValue());

‎client/src/main/java/org/flowable/external/client/impl/RestInvoker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.flowable.external.client.impl;
1414

15-
import com.fasterxml.jackson.databind.node.ObjectNode;
15+
import tools.jackson.databind.node.ObjectNode;
1616

1717
/**
1818
* @author Filip Hrisafov

‎client/src/test/java/org/flowable/external/client/impl/JavaHttpClientRestInvokerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import org.microhttp.Request;
4141
import org.microhttp.Response;
4242

43-
import com.fasterxml.jackson.databind.ObjectMapper;
44-
import com.fasterxml.jackson.databind.node.ObjectNode;
43+
import tools.jackson.databind.ObjectMapper;
44+
import tools.jackson.databind.node.ObjectNode;
4545

4646
/**
4747
* @author Filip Hrisafov

‎client/src/test/java/org/flowable/external/client/impl/RestExternalWorkerClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
import java.util.List;
2727
import java.util.Map;
2828

29+
import org.flowable.external.client.AcquiredExternalWorkerJob;
30+
import org.flowable.external.client.ExternalWorkerClient;
31+
import org.flowable.external.client.ExternalWorkerJob;
32+
import org.flowable.external.client.FlowableClientException;
2933
import org.junit.jupiter.api.BeforeEach;
3034
import org.junit.jupiter.api.Test;
3135
import org.junit.jupiter.params.ParameterizedTest;
3236
import org.junit.jupiter.params.provider.ValueSource;
3337
import org.junit.platform.commons.util.ExceptionUtils;
3438

35-
import com.fasterxml.jackson.databind.ObjectMapper;
36-
import com.fasterxml.jackson.databind.node.ObjectNode;
37-
import org.flowable.external.client.AcquiredExternalWorkerJob;
38-
import org.flowable.external.client.ExternalWorkerClient;
39-
import org.flowable.external.client.ExternalWorkerJob;
40-
import org.flowable.external.client.FlowableClientException;
39+
import tools.jackson.databind.ObjectMapper;
40+
import tools.jackson.databind.node.ObjectNode;
4141

4242
/**
4343
* @author Filip Hrisafov

0 commit comments

Comments
 (0)