Closes Taskana#2521 - Fix code smells Stream.collect(Collectors.toLis…

…t()) to Stream.toList()
jamesrdi · Mar 22, 2024 · 283672e · 283672e
1 parent 150fe15
commit 283672e
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 87 deletions.
diff --git a/...-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java b/...-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 <T> 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
@@ -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<Field> 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
@@ -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 <T> List<T> load(Class<T> clazz) {
     ServiceLoader<T> 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
@@ -238,7 +238,7 @@ public static boolean shouldUseLowerCaseForAccessIds() {
   public List<String> getAllClassificationCategories() {
     return this.classificationCategoriesByType.values().stream()
         .flatMap(Collection::stream)
-        .collect(Collectors.toList());
+        .toList();
   }
 
   public List<String> 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
@@ -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<ScheduledJob> 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
@@ -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<TaskState> filter) {
     super(
         (filter != null ? filter.stream() : Stream.of(TaskState.values()))
             .map(TaskStatusColumnHeader::new)
-            .collect(Collectors.toList()),
+            .toList(),
         new String[] {"DOMAINS"});
   }
 

diff --git a/...main/java/pro/taskana/monitor/internal/preprocessor/WorkingDaysToDaysReportConverter.java b/...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<Integer> 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/...ore/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java b/...ore/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<SelectedItem> convertWorkingDaysToDays(
                     s.getSubKey(),
                     Collections.min(instance.convertWorkingDaysToDays(s.getLowerAgeLimit())),
                     Collections.max(instance.convertWorkingDaysToDays(s.getUpperAgeLimit()))))
-        .collect(Collectors.toList());
+        .toList();
   }
 
   private boolean subKeyIsSet(List<SelectedItem> selectedItems) {

diff --git a/...a-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java b/...a-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
@@ -56,9 +56,7 @@ void insertNewSecondaryObjectReferencesOnTaskCreation(TaskImpl task)
   void insertAndDeleteObjectReferencesOnTaskUpdate(TaskImpl newTaskImpl, TaskImpl oldTaskImpl)
       throws ObjectReferencePersistenceException, InvalidArgumentException {
     List<ObjectReference> 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<ObjectReference> 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<ObjectReference> newObjectReferences = newTaskImpl.getSecondaryObjectReferences();
     List<String> 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<ObjectReference> 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
@@ -71,9 +71,7 @@ public void refreshPriorityAndDueDatesOfTasks(
     }
     if (priorityChanged) {
       List<MinimalTaskSummary> 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<Integer, List<String>> 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<String> taskIdsToUpdate =
-        taskDurationList.stream().map(TaskDuration::getTaskId).collect(Collectors.toList());
+    List<String> taskIdsToUpdate = taskDurationList.stream().map(TaskDuration::getTaskId).toList();
     Pair<List<MinimalTaskSummary>, BulkLog> existingAndAuthorizedTasks =
         taskServiceImpl.getMinimalTaskSummaries(taskIdsToUpdate);
     bulkLog.addAllErrors(existingAndAuthorizedTasks.getRight());
@@ -565,9 +562,7 @@ private List<ClassificationWithServiceLevelResolved> resolveDurationsInClassific
   private List<AttachmentSummaryImpl> getAttachmentSummaries(
       List<MinimalTaskSummary> existingTasksAuthorizedFor) {
     List<String> 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
@@ -707,7 +707,7 @@ public BulkOperationResults<String, TaskanaException> deleteTasks(List<String> 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
@@ -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,15 +107,15 @@ private List<TaskSummary> 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()
               .filter(
                   taskSummary ->
                       !taskIdsNotAllCompletedSameParentBusiness.contains(
                           taskSummary.getParentBusinessProcessId()))
-              .collect(Collectors.toList());
+              .toList();
     }
 
     return tasksToDelete;
@@ -138,8 +137,7 @@ private int deleteTasksTransactionally(List<TaskSummary> tasksToBeDeleted) {
   private int deleteTasks(List<TaskSummary> tasksToBeDeleted)
       throws InvalidArgumentException, NotAuthorizedException {
 
-    List<String> tasksIdsToBeDeleted =
-        tasksToBeDeleted.stream().map(TaskSummary::getId).collect(Collectors.toList());
+    List<String> tasksIdsToBeDeleted = tasksToBeDeleted.stream().map(TaskSummary::getId).toList();
     BulkOperationResults<String, TaskanaException> 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
@@ -89,7 +89,7 @@ public List<User> getUsers(Set<String> 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
@@ -82,7 +82,7 @@ private static List<Object> instantiateServiceProviders(
       List<Class<?>> serviceProviders, Map<Class<?>, Object> enclosingTestInstancesByClass) {
     return serviceProviders.stream()
         .map(clz -> instantiateClass(clz, enclosingTestInstancesByClass))
-        .collect(Collectors.toList());
+        .toList();
   }
 
   private static Object instantiateClass(

diff --git a/...askana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaRestExceptionHandler.java b/...askana-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<MalformedQueryParameter> extractMalformedQueryParameters(FieldError
               Arrays.stream(targetType.getEnumConstants())
                   .map(Enum.class::cast)
                   .map(Enum::name)
-                  .collect(Collectors.toList());
+                  .toList();
           Set<String> 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
@@ -588,7 +588,7 @@ List<LdapSettings> 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
@@ -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<ReportRepresentationModel> computePriorityWorkbasketReport
       List<PriorityColumnHeader> 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
@@ -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<TaskRepresentationModel> 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<TaskSummaryCollectionRepresentationModel> deleteTasks(
 
     List<TaskSummary> taskSummaries = query.list();
 
-    List<String> taskIdsToDelete =
-        taskSummaries.stream().map(TaskSummary::getId).collect(Collectors.toList());
+    List<String> taskIdsToDelete = taskSummaries.stream().map(TaskSummary::getId).toList();
 
     BulkOperationResults<String, TaskanaException> result =
         taskService.deleteTasks(taskIdsToDelete);
 
     Set<String> failedIds = new HashSet<>(result.getFailedIds());
     List<TaskSummary> 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(