Skip to content

Commit c928f06

Browse files
committed
fix: use offset date time when possible
1 parent 4fe571f commit c928f06

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

extension/client-java/src/main/java/io/camunda/tasklist/TasklistClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ record TaskFromSearch(
9494
String name,
9595
String taskDefinitionId,
9696
String processName,
97-
String creationDate,
98-
String completionDate,
97+
OffsetDateTime creationDate,
98+
OffsetDateTime completionDate,
9999
String assignee,
100100
TaskState taskState,
101101
Boolean isFirst,
@@ -118,8 +118,8 @@ record Task(
118118
String name,
119119
String taskDefinitionId,
120120
String processName,
121-
String creationDate,
122-
String completionDate,
121+
OffsetDateTime creationDate,
122+
OffsetDateTime completionDate,
123123
String assignee,
124124
TaskState taskState,
125125
String formKey,

extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV1.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import io.camunda.tasklist.generated.model.VariableResponse;
4141
import io.camunda.tasklist.generated.model.VariableSearchResponse;
4242
import io.camunda.tasklist.generated.model.VariablesSearchRequest;
43+
import java.time.OffsetDateTime;
4344
import java.util.List;
4445
import java.util.Optional;
4546

@@ -281,8 +282,12 @@ private static TaskFromSearch toTaskFromSearch(TaskSearchResponse taskSearchResp
281282
taskSearchResponse.getName(),
282283
taskSearchResponse.getTaskDefinitionId(),
283284
taskSearchResponse.getProcessName(),
284-
taskSearchResponse.getCreationDate(),
285-
taskSearchResponse.getCompletionDate(),
285+
Optional.ofNullable(taskSearchResponse.getCreationDate())
286+
.map(OffsetDateTime::parse)
287+
.orElse(null),
288+
Optional.ofNullable(taskSearchResponse.getCompletionDate())
289+
.map(OffsetDateTime::parse)
290+
.orElse(null),
286291
taskSearchResponse.getAssignee(),
287292
toTaskState(taskSearchResponse.getTaskState()),
288293
taskSearchResponse.getIsFirst(),
@@ -330,8 +335,12 @@ private static Task toTask(TaskResponse taskSearchResponse) {
330335
taskSearchResponse.getName(),
331336
taskSearchResponse.getTaskDefinitionId(),
332337
taskSearchResponse.getProcessName(),
333-
taskSearchResponse.getCreationDate(),
334-
taskSearchResponse.getCompletionDate(),
338+
Optional.ofNullable(taskSearchResponse.getCreationDate())
339+
.map(OffsetDateTime::parse)
340+
.orElse(null),
341+
Optional.ofNullable(taskSearchResponse.getCompletionDate())
342+
.map(OffsetDateTime::parse)
343+
.orElse(null),
335344
taskSearchResponse.getAssignee(),
336345
toTaskState(taskSearchResponse.getTaskState()),
337346
taskSearchResponse.getFormKey(),

extension/client-java/src/main/java/io/camunda/tasklist/TasklistClientV2.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.camunda.tasklist.TasklistClient.TaskSearch.Sort;
1515
import io.camunda.tasklist.TasklistClient.TaskSearch.TaskVariable;
1616
import io.camunda.tasklist.exception.CompatibilityException;
17-
import java.time.OffsetDateTime;
1817
import java.util.HashMap;
1918
import java.util.List;
2019
import java.util.Map;
@@ -91,8 +90,8 @@ private static TaskFromSearch toTaskFromSearch(UserTask userTask) {
9190
String.valueOf(userTask.getProcessDefinitionKey()),
9291
String.valueOf(userTask.getProcessInstanceKey()),
9392
userTask.getTenantId(),
94-
OffsetDateTime.parse(userTask.getDueDate()),
95-
OffsetDateTime.parse(userTask.getFollowUpDate()),
93+
(userTask.getDueDate()),
94+
(userTask.getFollowUpDate()),
9695
userTask.getCandidateGroups(),
9796
userTask.getCandidateUsers(),
9897
variables,
@@ -119,8 +118,8 @@ private static Task toTask(UserTask userTask) {
119118
String.valueOf(userTask.getProcessDefinitionKey()),
120119
String.valueOf(userTask.getProcessInstanceKey()),
121120
userTask.getTenantId(),
122-
OffsetDateTime.parse(userTask.getDueDate()),
123-
OffsetDateTime.parse(userTask.getFollowUpDate()),
121+
userTask.getDueDate(),
122+
userTask.getFollowUpDate(),
124123
userTask.getCandidateGroups(),
125124
userTask.getCandidateUsers(),
126125
implementation,

0 commit comments

Comments
 (0)