Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ record TaskFromSearch(
String name,
String taskDefinitionId,
String processName,
String creationDate,
String completionDate,
OffsetDateTime creationDate,
OffsetDateTime completionDate,
String assignee,
TaskState taskState,
Boolean isFirst,
Expand All @@ -118,8 +118,8 @@ record Task(
String name,
String taskDefinitionId,
String processName,
String creationDate,
String completionDate,
OffsetDateTime creationDate,
OffsetDateTime completionDate,
String assignee,
TaskState taskState,
String formKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import io.camunda.tasklist.generated.model.VariableResponse;
import io.camunda.tasklist.generated.model.VariableSearchResponse;
import io.camunda.tasklist.generated.model.VariablesSearchRequest;
import java.time.OffsetDateTime;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -281,8 +282,12 @@ private static TaskFromSearch toTaskFromSearch(TaskSearchResponse taskSearchResp
taskSearchResponse.getName(),
taskSearchResponse.getTaskDefinitionId(),
taskSearchResponse.getProcessName(),
taskSearchResponse.getCreationDate(),
taskSearchResponse.getCompletionDate(),
Optional.ofNullable(taskSearchResponse.getCreationDate())
.map(OffsetDateTime::parse)
.orElse(null),
Optional.ofNullable(taskSearchResponse.getCompletionDate())
.map(OffsetDateTime::parse)
.orElse(null),
taskSearchResponse.getAssignee(),
toTaskState(taskSearchResponse.getTaskState()),
taskSearchResponse.getIsFirst(),
Expand Down Expand Up @@ -330,8 +335,12 @@ private static Task toTask(TaskResponse taskSearchResponse) {
taskSearchResponse.getName(),
taskSearchResponse.getTaskDefinitionId(),
taskSearchResponse.getProcessName(),
taskSearchResponse.getCreationDate(),
taskSearchResponse.getCompletionDate(),
Optional.ofNullable(taskSearchResponse.getCreationDate())
.map(OffsetDateTime::parse)
.orElse(null),
Optional.ofNullable(taskSearchResponse.getCompletionDate())
.map(OffsetDateTime::parse)
.orElse(null),
taskSearchResponse.getAssignee(),
toTaskState(taskSearchResponse.getTaskState()),
taskSearchResponse.getFormKey(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import io.camunda.tasklist.TasklistClient.TaskSearch.Sort;
import io.camunda.tasklist.TasklistClient.TaskSearch.TaskVariable;
import io.camunda.tasklist.exception.CompatibilityException;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -91,8 +90,8 @@ private static TaskFromSearch toTaskFromSearch(UserTask userTask) {
String.valueOf(userTask.getProcessDefinitionKey()),
String.valueOf(userTask.getProcessInstanceKey()),
userTask.getTenantId(),
OffsetDateTime.parse(userTask.getDueDate()),
OffsetDateTime.parse(userTask.getFollowUpDate()),
(userTask.getDueDate()),
(userTask.getFollowUpDate()),
userTask.getCandidateGroups(),
userTask.getCandidateUsers(),
variables,
Expand All @@ -119,8 +118,8 @@ private static Task toTask(UserTask userTask) {
String.valueOf(userTask.getProcessDefinitionKey()),
String.valueOf(userTask.getProcessInstanceKey()),
userTask.getTenantId(),
OffsetDateTime.parse(userTask.getDueDate()),
OffsetDateTime.parse(userTask.getFollowUpDate()),
userTask.getDueDate(),
userTask.getFollowUpDate(),
userTask.getCandidateGroups(),
userTask.getCandidateUsers(),
implementation,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>io.camunda</groupId>
<artifactId>zeebe-bom</artifactId>
<version>8.8.0-alpha8</version>
<version>8.8.0-rc1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down