Skip to content

Commit c1e22aa

Browse files
fix(deps): update dependency io.camunda:zeebe-bom to v8.8.0-alpha7-rc1 (main) (#358)
* fix(deps): update dependency io.camunda:zeebe-bom to v8.8.0-alpha7-rc1 * adjusted to new page api --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jonathan Lukas <[email protected]>
1 parent 171cbe2 commit c1e22aa

File tree

6 files changed

+62
-32
lines changed

6 files changed

+62
-32
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ private static TasklistClient.TaskSearch toTaskSearch(TaskSearch search) {
118118
toSearch(SearchType.AFTER_OR_EQUAL, search.getPagination()),
119119
toSearch(SearchType.BEFORE, search.getPagination()),
120120
toSearch(SearchType.BEFORE_OR_EQUAL, search.getPagination()),
121+
search.getAfter(),
122+
search.getBefore(),
121123
mapIfPresent(search.getIncludeVariables(), CamundaTaskListClient::toIncludeVariable),
122124
toImplementation(search.getImplementation()),
123125
toPriority(search.getPriority()));

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ enum TaskState {
4848
COMPLETED,
4949
CANCELED,
5050
FAILED,
51+
ASSIGNING,
52+
UPDATING,
53+
COMPLETING,
54+
CANCELING,
5155
UNKNOWN_ENUM_VALUE
5256
}
5357

@@ -94,7 +98,6 @@ record TaskFromSearch(
9498
String completionDate,
9599
String assignee,
96100
TaskState taskState,
97-
List<String> sortValues,
98101
Boolean isFirst,
99102
String formKey,
100103
String formId,
@@ -154,6 +157,8 @@ record TaskSearch(
154157
List<String> searchAfterOrEqual,
155158
List<String> searchBefore,
156159
List<String> searchBeforeOrEqual,
160+
String after,
161+
String before,
157162
List<IncludeVariable> includeVariables,
158163
Implementation implementation,
159164
Priority priority) {
@@ -172,7 +177,8 @@ public enum Field {
172177
creationTime,
173178
followUpDate,
174179
dueDate,
175-
priority
180+
priority,
181+
name
176182
}
177183

178184
public enum Order {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ private static FieldEnum fromField(Field field) {
230230
case creationTime -> FieldEnum.CREATION_TIME;
231231
case followUpDate -> FieldEnum.FOLLOW_UP_DATE;
232232
case completionTime -> FieldEnum.COMPLETION_TIME;
233+
case name -> null;
233234
};
234235
}
235236

@@ -269,7 +270,8 @@ private static StateEnum fromState(TaskState state) {
269270
case FAILED -> StateEnum.FAILED;
270271
case CANCELED -> StateEnum.CANCELED;
271272
case COMPLETED -> StateEnum.COMPLETED;
272-
case UNKNOWN_ENUM_VALUE -> null;
273+
case ASSIGNING, UPDATING, COMPLETING, CANCELING, UNKNOWN_ENUM_VALUE ->
274+
throw new IllegalArgumentException("Task state '" + state + "' does not exist in V1 API");
273275
};
274276
}
275277

@@ -283,7 +285,6 @@ private static TaskFromSearch toTaskFromSearch(TaskSearchResponse taskSearchResp
283285
taskSearchResponse.getCompletionDate(),
284286
taskSearchResponse.getAssignee(),
285287
toTaskState(taskSearchResponse.getTaskState()),
286-
taskSearchResponse.getSortValues(),
287288
taskSearchResponse.getIsFirst(),
288289
taskSearchResponse.getFormKey(),
289290
taskSearchResponse.getFormId(),

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

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import io.camunda.client.api.search.filter.UserTaskFilter;
77
import io.camunda.client.api.search.filter.UserTaskVariableFilter;
88
import io.camunda.client.api.search.request.SearchRequestPage;
9+
import io.camunda.client.api.search.response.Form;
910
import io.camunda.client.api.search.response.SearchResponse;
1011
import io.camunda.client.api.search.response.UserTask;
12+
import io.camunda.client.api.search.response.Variable;
1113
import io.camunda.client.api.search.sort.UserTaskSort;
1214
import io.camunda.tasklist.TasklistClient.TaskSearch.Sort;
1315
import io.camunda.tasklist.TasklistClient.TaskSearch.TaskVariable;
1416
import io.camunda.tasklist.exception.CompatibilityException;
1517
import java.time.OffsetDateTime;
16-
import java.util.ArrayList;
1718
import java.util.HashMap;
1819
import java.util.List;
1920
import java.util.Map;
@@ -68,9 +69,8 @@ private static Consumer<UserTaskVariableFilter> fromVariableSearchToFilter(
6869
};
6970
}
7071

71-
private static TaskFromSearch toTaskFromSearch(UserTask userTask, List<Object> sort) {
72+
private static TaskFromSearch toTaskFromSearch(UserTask userTask) {
7273
String processName = null; // can be found in process definition
73-
List<String> sortValues = sort != null ? sort.stream().map(Object::toString).toList() : null;
7474
Boolean isFirst = null;
7575
Boolean isFormEmbedded = null;
7676
List<VariableFromSearch> variables = null;
@@ -84,7 +84,6 @@ private static TaskFromSearch toTaskFromSearch(UserTask userTask, List<Object> s
8484
userTask.getCompletionDate(),
8585
userTask.getAssignee(),
8686
toTaskState(userTask.getState()),
87-
sortValues,
8887
isFirst,
8988
String.valueOf(userTask.getFormKey()),
9089
userTask.getExternalFormReference(),
@@ -137,20 +136,25 @@ private static Variable toVariable(io.camunda.client.api.search.response.Variabl
137136
variable.getTenantId());
138137
}
139138

140-
private static TasklistClient.TaskState toTaskState(UserTaskState state) {
139+
private static TaskState toTaskState(UserTaskState state) {
141140
if (state == null) {
142141
return null;
143142
}
144143
return switch (state) {
145-
case COMPLETED -> TasklistClient.TaskState.COMPLETED;
146-
case FAILED -> TasklistClient.TaskState.FAILED;
147-
case CREATED -> TasklistClient.TaskState.CREATED;
148-
case CANCELED -> TasklistClient.TaskState.CANCELED;
149-
case UNKNOWN_ENUM_VALUE -> TasklistClient.TaskState.UNKNOWN_ENUM_VALUE;
144+
case COMPLETED -> TaskState.COMPLETED;
145+
case FAILED -> TaskState.FAILED;
146+
case CREATING -> null;
147+
case CREATED -> TaskState.CREATED;
148+
case CANCELED -> TaskState.CANCELED;
149+
case UNKNOWN_ENUM_VALUE -> TaskState.UNKNOWN_ENUM_VALUE;
150+
case ASSIGNING -> TaskState.ASSIGNING;
151+
case UPDATING -> TaskState.UPDATING;
152+
case COMPLETING -> TaskState.COMPLETING;
153+
case CANCELING -> TaskState.CANCELING;
150154
};
151155
}
152156

153-
private static UserTaskState toTaskState(TasklistClient.TaskState state) {
157+
private static UserTaskState toTaskState(TaskState state) {
154158
if (state == null) {
155159
return null;
156160
}
@@ -159,6 +163,10 @@ private static UserTaskState toTaskState(TasklistClient.TaskState state) {
159163
case FAILED -> UserTaskState.FAILED;
160164
case CREATED -> UserTaskState.CREATED;
161165
case CANCELED -> UserTaskState.CANCELED;
166+
case ASSIGNING -> UserTaskState.ASSIGNING;
167+
case UPDATING -> UserTaskState.UPDATING;
168+
case COMPLETING -> UserTaskState.COMPLETING;
169+
case CANCELING -> UserTaskState.CANCELING;
162170
case UNKNOWN_ENUM_VALUE -> UserTaskState.UNKNOWN_ENUM_VALUE;
163171
};
164172
}
@@ -278,16 +286,22 @@ private static Consumer<SearchRequestPage> fromTaskSearchToPage(TaskSearch taskS
278286
page.limit(taskSearch.pageSize());
279287
}
280288
if (taskSearch.searchAfter() != null) {
281-
page.searchAfter(taskSearch.searchAfter().stream().map(Object.class::cast).toList());
289+
LOG.warn("searchAfter is not supported, please use after");
282290
}
283291
if (taskSearch.searchBefore() != null) {
284-
page.searchBefore(taskSearch.searchBefore().stream().map(Object.class::cast).toList());
292+
LOG.warn("searchBefore is not supported, please use before");
285293
}
286294
if (taskSearch.searchAfterOrEqual() != null) {
287-
LOG.warn("searchAfterOrEqual is not supported, please use searchAfter");
295+
LOG.warn("searchAfterOrEqual is not supported, please use after");
288296
}
289297
if (taskSearch.searchBeforeOrEqual() != null) {
290-
LOG.warn("searchBeforeOrEqual is not supported, please use searchBefore");
298+
LOG.warn("searchBeforeOrEqual is not supported, please use before");
299+
}
300+
if (taskSearch.before() != null) {
301+
page.before(taskSearch.before());
302+
}
303+
if (taskSearch.after() != null) {
304+
page.after(taskSearch.after());
291305
}
292306
};
293307
}
@@ -359,18 +373,7 @@ public List<TaskFromSearch> searchTasks(TaskSearch taskSearch) {
359373
taskSearch, camundaClient.getConfiguration().getJsonMapper()))
360374
.send()
361375
.join();
362-
List<UserTask> items = searchResponse.items();
363-
List<TaskFromSearch> result = new ArrayList<>();
364-
for (UserTask item : items) {
365-
if (isFirst(item, items)) {
366-
result.add(toTaskFromSearch(item, searchResponse.page().firstSortValues()));
367-
} else if (isLast(item, items)) {
368-
result.add(toTaskFromSearch(item, searchResponse.page().lastSortValues()));
369-
} else {
370-
result.add(toTaskFromSearch(item, null));
371-
}
372-
}
373-
return result;
376+
return searchResponse.items().stream().map(TasklistClientV2::toTaskFromSearch).toList();
374377
}
375378

376379
@Override

extension/client-java/src/main/java/io/camunda/tasklist/dto/TaskSearch.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@ public class TaskSearch implements Cloneable {
3232
private Pagination pagination;
3333
private Implementation implementation;
3434
private Priority priority;
35+
private String before;
36+
private String after;
37+
38+
public String getBefore() {
39+
return before;
40+
}
41+
42+
public void setBefore(String before) {
43+
this.before = before;
44+
}
45+
46+
public String getAfter() {
47+
return after;
48+
}
49+
50+
public void setAfter(String after) {
51+
this.after = after;
52+
}
3553

3654
public List<String> getAssignees() {
3755
return assignees;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>io.camunda</groupId>
6767
<artifactId>zeebe-bom</artifactId>
68-
<version>8.8.0-alpha5</version>
68+
<version>8.8.0-alpha7-rc1</version>
6969
<type>pom</type>
7070
<scope>import</scope>
7171
</dependency>

0 commit comments

Comments
 (0)