diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java index b995ccb2b5..9ecc538427 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.stream.Collectors; import org.json.JSONObject; import pro.taskana.common.api.exceptions.SystemException; @@ -56,7 +55,7 @@ public static String determineChangesInAttributes(T oldObject, T newObject) .map(wrap(field -> Triplet.of(field, field.get(oldObject), field.get(newObject)))) .filter(not(t -> Objects.equals(t.getMiddle(), t.getRight()))) .map(t -> generateChangedAttribute(t.getLeft(), t.getMiddle(), t.getRight())) - .collect(Collectors.toList()); + .toList(); JSONObject changes = new JSONObject(); changes.put("changes", changedAttributes); diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java index 641d4aa632..e94476bb05 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java @@ -10,7 +10,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public class ReflectionUtil { @@ -38,7 +37,7 @@ public static List retrieveAllFields(Class currentClass) { fields.addAll(Arrays.asList(currentClass.getDeclaredFields())); currentClass = currentClass.getSuperclass(); } - return fields.stream().filter(not(Field::isSynthetic)).collect(Collectors.toList()); + return fields.stream().filter(not(Field::isSynthetic)).toList(); } public static Class getRawClass(Type type) { diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java index fc0cf55300..f02fb133a1 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java @@ -2,7 +2,6 @@ import java.util.List; import java.util.ServiceLoader; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; public class SpiLoader { @@ -13,6 +12,6 @@ private SpiLoader() { public static List load(Class clazz) { ServiceLoader serviceLoader = ServiceLoader.load(clazz); - return StreamSupport.stream(serviceLoader.spliterator(), false).collect(Collectors.toList()); + return StreamSupport.stream(serviceLoader.spliterator(), false).toList(); } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java index d6b5216d47..c74c16c9f2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java @@ -238,7 +238,7 @@ public static boolean shouldUseLowerCaseForAccessIds() { public List getAllClassificationCategories() { return this.classificationCategoriesByType.values().stream() .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); } public List getClassificationCategoriesByType(String type) { @@ -1353,18 +1353,15 @@ private void setFieldValue(Field field, Object value) { } private void adjustConfiguration() { - domains = domains.stream().map(String::toUpperCase).collect(Collectors.toList()); - classificationTypes = - classificationTypes.stream().map(String::toUpperCase).collect(Collectors.toList()); + domains = domains.stream().map(String::toUpperCase).toList(); + classificationTypes = classificationTypes.stream().map(String::toUpperCase).toList(); classificationCategoriesByType = classificationCategoriesByType.entrySet().stream() .map( e -> Map.entry( e.getKey().toUpperCase(), - e.getValue().stream() - .map(String::toUpperCase) - .collect(Collectors.toList()))) + e.getValue().stream().map(String::toUpperCase).toList())) .sorted(Comparator.comparingInt(e -> classificationTypes.indexOf(e.getKey()))) .collect( Collectors.toMap( diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/JobRunner.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/JobRunner.java index eb8c7ddf15..6e52c2df86 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/JobRunner.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/JobRunner.java @@ -3,7 +3,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.List; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.common.api.ScheduledJob; @@ -34,8 +33,7 @@ public void runJobs() { private List findAndLockJobsToRun() { return TaskanaTransactionProvider.executeInTransactionIfPossible( - txProvider, - () -> jobService.findJobsToRun().stream().map(this::lockJob).collect(Collectors.toList())); + txProvider, () -> jobService.findJobsToRun().stream().map(this::lockJob).toList()); } private void runJobTransactionally(ScheduledJob scheduledJob) { diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TaskStatusReport.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TaskStatusReport.java index ec49bac8be..d3b58b6033 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TaskStatusReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/TaskStatusReport.java @@ -1,7 +1,6 @@ package pro.taskana.monitor.api.reports; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.monitor.api.reports.header.ColumnHeader; @@ -25,7 +24,7 @@ public TaskStatusReport(List filter) { super( (filter != null ? filter.stream() : Stream.of(TaskState.values())) .map(TaskStatusColumnHeader::new) - .collect(Collectors.toList()), + .toList(), new String[] {"DOMAINS"}); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/WorkingDaysToDaysReportConverter.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/WorkingDaysToDaysReportConverter.java index e3b73fd68d..de1a142639 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/WorkingDaysToDaysReportConverter.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/WorkingDaysToDaysReportConverter.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.common.api.WorkingTimeCalculator; @@ -91,7 +90,7 @@ public List convertWorkingDaysToDays(int amountOfWorkdays) { cacheDaysToWorkingDays.entrySet().stream() .filter(entry -> entry.getValue() == amountOfWorkdays) .map(Entry::getKey) - .collect(Collectors.toList()); + .toList(); if (listOfAllMatchingDays.isEmpty()) { return Collections.singletonList(amountOfWorkdays); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java index 0ce22d60f8..98c9745e4a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java @@ -5,7 +5,6 @@ import java.time.Instant; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import pro.taskana.common.api.IntInterval; import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.WorkingTimeCalculator; @@ -619,7 +618,7 @@ private List convertWorkingDaysToDays( s.getSubKey(), Collections.min(instance.convertWorkingDaysToDays(s.getLowerAgeLimit())), Collections.max(instance.convertWorkingDaysToDays(s.getUpperAgeLimit())))) - .collect(Collectors.toList()); + .toList(); } private boolean subKeyIsSet(List selectedItems) { diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java index 672c645a18..911b6aa558 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.stream.Collectors; import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -71,7 +70,7 @@ public TimestampReport buildReport() throws InvalidArgumentException, NotAuthori // That's why "the loop" is done outside mybatis. .map(this::getTasksCountForStatusGroupedByOrgLevel) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); report.addItems( items, diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceHandler.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceHandler.java index 3442fc04fa..5b208fabb9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceHandler.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceHandler.java @@ -56,9 +56,7 @@ void insertNewSecondaryObjectReferencesOnTaskCreation(TaskImpl task) void insertAndDeleteObjectReferencesOnTaskUpdate(TaskImpl newTaskImpl, TaskImpl oldTaskImpl) throws ObjectReferencePersistenceException, InvalidArgumentException { List newObjectReferences = - newTaskImpl.getSecondaryObjectReferences().stream() - .filter(Objects::nonNull) - .collect(Collectors.toList()); + newTaskImpl.getSecondaryObjectReferences().stream().filter(Objects::nonNull).toList(); newTaskImpl.setSecondaryObjectReferences(newObjectReferences); for (ObjectReference objectReference : newObjectReferences) { @@ -81,7 +79,7 @@ private void insertNewObjectReferencesOnTaskUpdate(TaskImpl newTaskImpl, TaskImp List newObjectReferences = newTaskImpl.getSecondaryObjectReferences().stream() .filter(not(o -> oldObjectReferencesIds.contains(o.getId()))) - .collect(Collectors.toList()); + .toList(); for (ObjectReference objectReference : newObjectReferences) { insertNewObjectReferenceOnTaskUpdate(newTaskImpl, objectReference); @@ -115,8 +113,7 @@ private void deleteRemovedObjectReferencesOnTaskUpdate( final List newObjectReferences = newTaskImpl.getSecondaryObjectReferences(); List newObjectReferencesIds = new ArrayList<>(); if (newObjectReferences != null && !newObjectReferences.isEmpty()) { - newObjectReferencesIds = - newObjectReferences.stream().map(ObjectReference::getId).collect(Collectors.toList()); + newObjectReferencesIds = newObjectReferences.stream().map(ObjectReference::getId).toList(); } List oldObjectReferences = oldTaskImpl.getSecondaryObjectReferences(); if (oldObjectReferences != null && !oldObjectReferences.isEmpty()) { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java index 028bd70a78..28ee08c9ba 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java @@ -71,9 +71,7 @@ public void refreshPriorityAndDueDatesOfTasks( } if (priorityChanged) { List tasksWithoutManualPriority = - tasks.stream() - .filter(not(MinimalTaskSummary::isManualPriorityActive)) - .collect(Collectors.toList()); + tasks.stream().filter(not(MinimalTaskSummary::isManualPriorityActive)).toList(); updateTaskPriorityOnClassificationUpdate( tasksWithoutManualPriority, attachments, allInvolvedClassifications); } @@ -214,7 +212,7 @@ private Map> getPriorityToTasksIdsMap( t.getTaskId(), determinePriorityForATask( t, classificationIdToPriorityMap, taskIdToClassificationIdsMap))) - .collect(Collectors.toList()); + .toList(); return taskIdPriorities.stream() .collect( groupingBy( @@ -425,8 +423,7 @@ private BulkLog updateDuePropertyOfAffectedTasks( referenceTask.setPlanned(durationHolder.getPlanned()); referenceTask.setModified(Instant.now()); referenceTask.setDue(calculateDue(referenceTask.getPlanned(), durationHolder.getDuration())); - List taskIdsToUpdate = - taskDurationList.stream().map(TaskDuration::getTaskId).collect(Collectors.toList()); + List taskIdsToUpdate = taskDurationList.stream().map(TaskDuration::getTaskId).toList(); Pair, BulkLog> existingAndAuthorizedTasks = taskServiceImpl.getMinimalTaskSummaries(taskIdsToUpdate); bulkLog.addAllErrors(existingAndAuthorizedTasks.getRight()); @@ -565,9 +562,7 @@ private List resolveDurationsInClassific private List getAttachmentSummaries( List existingTasksAuthorizedFor) { List existingTaskIdsAuthorizedFor = - existingTasksAuthorizedFor.stream() - .map(MinimalTaskSummary::getTaskId) - .collect(Collectors.toList()); + existingTasksAuthorizedFor.stream().map(MinimalTaskSummary::getTaskId).toList(); return existingTaskIdsAuthorizedFor.isEmpty() ? new ArrayList<>() diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java index 2ee0394554..29f4c7c56d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java @@ -707,7 +707,7 @@ public BulkOperationResults deleteTasks(List t } if (historyEventManager.isEnabled()) { taskIds.forEach(this::createTaskDeletedEvent); - } + } } return bulkLog; } finally { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java index a49def5386..67498ed4de 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.TaskanaConfiguration; @@ -108,7 +107,7 @@ private List getTasksCompletedBefore(Instant untilDate) { .filter(not(entry -> entry.getKey().isEmpty())) .filter(not(entry -> entry.getValue().equals(countParentTask.get(entry.getKey())))) .map(Map.Entry::getKey) - .collect(Collectors.toList()); + .toList(); tasksToDelete = tasksToDelete.stream() @@ -116,7 +115,7 @@ private List getTasksCompletedBefore(Instant untilDate) { taskSummary -> !taskIdsNotAllCompletedSameParentBusiness.contains( taskSummary.getParentBusinessProcessId())) - .collect(Collectors.toList()); + .toList(); } return tasksToDelete; @@ -138,8 +137,7 @@ private int deleteTasksTransactionally(List tasksToBeDeleted) { private int deleteTasks(List tasksToBeDeleted) throws InvalidArgumentException, NotAuthorizedException { - List tasksIdsToBeDeleted = - tasksToBeDeleted.stream().map(TaskSummary::getId).collect(Collectors.toList()); + List tasksIdsToBeDeleted = tasksToBeDeleted.stream().map(TaskSummary::getId).toList(); BulkOperationResults results = taskanaEngineImpl.getTaskService().deleteTasks(tasksIdsToBeDeleted); if (LOGGER.isDebugEnabled()) { diff --git a/lib/taskana-core/src/main/java/pro/taskana/user/internal/UserServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/user/internal/UserServiceImpl.java index 5455e20a7b..91d93751f2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/user/internal/UserServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/user/internal/UserServiceImpl.java @@ -89,7 +89,7 @@ public List getUsers(Set userIds) throws InvalidArgumentException users.forEach(user -> user.setDomains(determineDomains(user))); - return users.stream().map(User.class::cast).collect(Collectors.toList()); + return users.stream().map(User.class::cast).toList(); } @Override diff --git a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/util/ServiceProviderExtractor.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/util/ServiceProviderExtractor.java index 730782d6c4..a27fb82f78 100644 --- a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/util/ServiceProviderExtractor.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/util/ServiceProviderExtractor.java @@ -82,7 +82,7 @@ private static List instantiateServiceProviders( List> serviceProviders, Map, Object> enclosingTestInstancesByClass) { return serviceProviders.stream() .map(clz -> instantiateClass(clz, enclosingTestInstancesByClass)) - .collect(Collectors.toList()); + .toList(); } private static Object instantiateClass( diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaRestExceptionHandler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaRestExceptionHandler.java index dbec165e37..70ff42d418 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaRestExceptionHandler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaRestExceptionHandler.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.springframework.beans.BeanInstantiationException; import org.springframework.beans.TypeMismatchException; @@ -220,13 +219,13 @@ private List extractMalformedQueryParameters(FieldError Arrays.stream(targetType.getEnumConstants()) .map(Enum.class::cast) .map(Enum::name) - .collect(Collectors.toList()); + .toList(); Set enumConstantSet = new HashSet<>(enumConstants); return getRejectedValues(typeMismatchException) .filter(not(enumConstantSet::contains)) .map(value -> new MalformedQueryParameter(queryParameter, value, enumConstants)) - .collect(Collectors.toList()); + .toList(); } } } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java index ed376f872e..45c1dd3eec 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java @@ -588,7 +588,7 @@ List checkForMissingConfigurations() { .filter(not(LdapSettings.TASKANA_LDAP_GROUPS_OF_USER_NAME::equals)) .filter(not(LdapSettings.TASKANA_LDAP_GROUPS_OF_USER_TYPE::equals)) .filter(p -> p.getValueFromEnv(env) == null) - .collect(Collectors.toList()); + .toList(); } void testMinSearchForLength(final String name) throws InvalidArgumentException { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/MonitorController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/MonitorController.java index dd4f4ea27a..1798d09372 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/MonitorController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/MonitorController.java @@ -3,7 +3,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.config.EnableHypermediaSupport; import org.springframework.http.HttpStatus; @@ -122,7 +121,7 @@ public ResponseEntity computePriorityWorkbasketReport List priorityColumnHeaders = Arrays.stream(columnHeaders) .map(priorityColumnHeaderRepresentationModelAssembler::toEntityModel) - .collect(Collectors.toList()); + .toList(); builder.withColumnHeaders(priorityColumnHeaders); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java index 4f5b35b7d7..c78796e73b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java @@ -10,7 +10,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.BiConsumer; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.config.EnableHypermediaSupport; import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; @@ -111,7 +110,7 @@ public ResponseEntity createTask( if (!taskRepresentationModel.getAttachments().stream() .filter(att -> Objects.nonNull(att.getTaskId())) .filter(att -> !att.getTaskId().equals(taskRepresentationModel.getTaskId())) - .collect(Collectors.toList()) + .toList() .isEmpty()) { throw new InvalidArgumentException( "An attachments' taskId must be empty or equal to the id of the task it belongs to"); @@ -715,17 +714,14 @@ public ResponseEntity deleteTasks( List taskSummaries = query.list(); - List taskIdsToDelete = - taskSummaries.stream().map(TaskSummary::getId).collect(Collectors.toList()); + List taskIdsToDelete = taskSummaries.stream().map(TaskSummary::getId).toList(); BulkOperationResults result = taskService.deleteTasks(taskIdsToDelete); Set failedIds = new HashSet<>(result.getFailedIds()); List successfullyDeletedTaskSummaries = - taskSummaries.stream() - .filter(not(summary -> failedIds.contains(summary.getId()))) - .collect(Collectors.toList()); + taskSummaries.stream().filter(not(summary -> failedIds.contains(summary.getId()))).toList(); return ResponseEntity.ok( taskSummaryRepresentationModelAssembler.toTaskanaCollectionModel( diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssembler.java index c684ca780a..3ce6a4c687 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssembler.java @@ -79,22 +79,16 @@ public TaskRepresentationModel toModel(Task task) { repModel.setSecondaryObjectReferences( task.getSecondaryObjectReferences().stream() .map(objectReferenceAssembler::toModel) - .collect(Collectors.toList())); + .toList()); repModel.setRead(task.isRead()); repModel.setTransferred(task.isTransferred()); repModel.setGroupByCount(task.getGroupByCount()); repModel.setAttachments( - task.getAttachments().stream() - .map(attachmentAssembler::toModel) - .collect(Collectors.toList())); + task.getAttachments().stream().map(attachmentAssembler::toModel).toList()); repModel.setCustomAttributes( - task.getCustomAttributeMap().entrySet().stream() - .map(CustomAttribute::of) - .collect(Collectors.toList())); + task.getCustomAttributeMap().entrySet().stream().map(CustomAttribute::of).toList()); repModel.setCallbackInfo( - task.getCallbackInfo().entrySet().stream() - .map(CustomAttribute::of) - .collect(Collectors.toList())); + task.getCallbackInfo().entrySet().stream().map(CustomAttribute::of).toList()); repModel.setCustom1(task.getCustomField(TaskCustomField.CUSTOM_1)); repModel.setCustom2(task.getCustomField(TaskCustomField.CUSTOM_2)); repModel.setCustom3(task.getCustomField(TaskCustomField.CUSTOM_3)); @@ -186,13 +180,11 @@ public Task toEntityModel(TaskRepresentationModel repModel) throws InvalidArgume task.setCustomIntField(TaskCustomIntField.CUSTOM_INT_7, repModel.getCustomInt7()); task.setCustomIntField(TaskCustomIntField.CUSTOM_INT_8, repModel.getCustomInt8()); task.setAttachments( - repModel.getAttachments().stream() - .map(attachmentAssembler::toEntityModel) - .collect(Collectors.toList())); + repModel.getAttachments().stream().map(attachmentAssembler::toEntityModel).toList()); task.setSecondaryObjectReferences( repModel.getSecondaryObjectReferences().stream() .map(objectReferenceAssembler::toEntity) - .collect(Collectors.toList())); + .toList()); task.setCustomAttributeMap( repModel.getCustomAttributes().stream() .collect(Collectors.toMap(CustomAttribute::getKey, CustomAttribute::getValue))); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssembler.java index 7dbd6f4a40..d0cd0ab663 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssembler.java @@ -2,7 +2,6 @@ import java.util.Collection; import java.util.List; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -79,14 +78,12 @@ public TaskSummaryRepresentationModel toModel(@NonNull TaskSummary taskSummary) repModel.setSecondaryObjectReferences( taskSummary.getSecondaryObjectReferences().stream() .map(objectReferenceAssembler::toModel) - .collect(Collectors.toList())); + .toList()); repModel.setRead(taskSummary.isRead()); repModel.setTransferred(taskSummary.isTransferred()); repModel.setGroupByCount(taskSummary.getGroupByCount()); repModel.setAttachmentSummaries( - taskSummary.getAttachmentSummaries().stream() - .map(attachmentAssembler::toModel) - .collect(Collectors.toList())); + taskSummary.getAttachmentSummaries().stream().map(attachmentAssembler::toModel).toList()); repModel.setCustom1(taskSummary.getCustomField(TaskCustomField.CUSTOM_1)); repModel.setCustom2(taskSummary.getCustomField(TaskCustomField.CUSTOM_2)); repModel.setCustom3(taskSummary.getCustomField(TaskCustomField.CUSTOM_3)); @@ -146,14 +143,14 @@ public TaskSummary toEntityModel(TaskSummaryRepresentationModel repModel) { taskSummary.setSecondaryObjectReferences( repModel.getSecondaryObjectReferences().stream() .map(objectReferenceAssembler::toEntity) - .collect(Collectors.toList())); + .toList()); taskSummary.setRead(repModel.isRead()); taskSummary.setTransferred(repModel.isTransferred()); taskSummary.setGroupByCount(repModel.getGroupByCount()); taskSummary.setAttachmentSummaries( repModel.getAttachmentSummaries().stream() .map(attachmentAssembler::toEntityModel) - .collect(Collectors.toList())); + .toList()); taskSummary.setCustom1(repModel.getCustom1()); taskSummary.setCustom2(repModel.getCustom2()); taskSummary.setCustom3(repModel.getCustom3()); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java index f26b9e3ec2..6e103b1c42 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java @@ -3,7 +3,6 @@ import java.sql.PreparedStatement; import java.time.Duration; import java.util.List; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.TaskanaConfiguration; @@ -64,9 +63,7 @@ protected void execute() { List users = ldapClient.searchUsersInUserRole(); List usersAfterProcessing = - users.stream() - .map(refreshUserPostprocessorManager::processUserAfterRefresh) - .collect(Collectors.toList()); + users.stream().map(refreshUserPostprocessorManager::processUserAfterRefresh).toList(); addExistingConfigurationDataToUsers(usersAfterProcessing); clearExistingUsersAndGroupsAndPermissions(); insertNewUsers(usersAfterProcessing); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/WorkbasketController.java index 2bea63de99..439e29d013 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/WorkbasketController.java @@ -4,7 +4,6 @@ import java.beans.ConstructorProperties; import java.util.List; import java.util.function.BiConsumer; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -313,7 +312,7 @@ public ResponseEntity setWork List wbAccessItems = workbasketAccessItemRepModels.getContent().stream() .map(workbasketAccessItemRepresentationModelAssembler::toEntityModel) - .collect(Collectors.toList()); + .toList(); workbasketService.setWorkbasketAccessItems(workbasketId, wbAccessItems); List updatedWbAccessItems = workbasketService.getWorkbasketAccessItems(workbasketId);