Pull apache#2287: Modernize codebase with Java improvements - ReplaceStreamToListWithCollect

Author: Vincent Potucek

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProblemCollector.java

@@ -26,6 +26,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.LongAdder;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.maven.api.Constants;
@@ -216,7 +217,7 @@ class Impl<P extends BuilderProblem> implements ProblemCollector<P> {
         private static final List<BuilderProblem.Severity> REVERSED_ORDER = Arrays.stream(
                         BuilderProblem.Severity.values())
                 .sorted(Comparator.reverseOrder())
-                .toList();
+                .collect(Collectors.toList());
 
         private Impl(int maxCountLimit) {
             if (maxCountLimit < 0) {

compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.apache.maven.api.Lifecycle;
 import org.apache.maven.api.Packaging;
@@ -126,7 +127,7 @@ private static Plugin newPlugin(String artifactId, String... goals) {
                                 .id("default-" + goal)
                                 .goals(List.of(goal))
                                 .build())
-                        .toList())
+                        .collect(Collectors.toList()))
                 .build();
     }
 

compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java

@@ -58,7 +58,7 @@ void testOverriddenMergeMethods() {
                     }
                 })
                 .map(Method::getName)
-                .toList();
+                .collect(Collectors.toList());
 
         List<String> overriddenMethods = Stream.of(FileToRawModelMerger.class.getDeclaredMethods())
                 .map(Method::getName)

compat/maven-model/src/test/java/org/apache/maven/model/pom/PomMemoryAnalyzer.java

@@ -219,7 +219,7 @@ private List<ValueFrequency> getMostFrequentValues(Map<String, StringStats> stat
                 .map(e -> new ValueFrequency(e.getKey(), e.getValue().getOccurrences()))
                 .sorted((a, b) -> Long.compare(b.frequency, a.frequency))
                 .limit(limit)
-                .toList();
+                .collect(Collectors.toList());
     }
 
     public void printAnalysis() {
@@ -270,7 +270,7 @@ public void printAnalysis() {
                             groupName, paths, totalUnique, totalOccurrences, totalMemory, totalSavings, topValues);
                 })
                 .sorted((a, b) -> Long.compare(b.totalSavings, a.totalSavings))
-                .toList();
+                .collect(Collectors.toList());
 
         // Print each group
         for (GroupAnalysis group : sortedGroups) {
@@ -290,7 +290,7 @@ public void printAnalysis() {
             System.out.println("----------------------------------------");
             for (PathAnalysis path : group.paths.stream()
                     .sorted((a, b) -> Long.compare(b.potentialSavings, a.potentialSavings))
-                    .toList()) {
+                    .collect(Collectors.toList())) {
                 System.out.printf(
                         "%-90s %6dKB %6dKB%n", path.path, path.totalMemory / 1024, path.potentialSavings / 1024);
             }

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java

@@ -25,6 +25,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.apache.maven.api.cli.Options;
 import org.apache.maven.api.cli.ParserRequest;
@@ -49,7 +50,7 @@ public Optional<Map<String, String>> userProperties() {
     @Override
     public String source() {
         return String.format(
-                "layered(%s)", options.stream().map(Options::source).toList());
+                "layered(%s)", options.stream().map(Options::source).collect(Collectors.toList()));
     }
 
     @Override

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java

@@ -37,6 +37,7 @@
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
 
 import org.apache.maven.api.Constants;
 import org.apache.maven.api.ProtoSession;
@@ -700,7 +701,7 @@ protected Runnable settings(C context, boolean emitSettingsWarnings, SettingsBui
 
             if (context.invokerRequest.options().showErrors().orElse(false)) {
                 for (BuilderProblem problem :
-                        settingsResult.getProblems().problems().toList()) {
+                        settingsResult.getProblems().problems().collect(Collectors.toList())) {
                     context.logger.warn(problem.getMessage() + " @ " + problem.getLocation());
                 }
             }
@@ -892,7 +893,7 @@ protected void populateRequestFromSettings(MavenExecutionRequest request, Settin
                     }
                 })
                 .filter(Objects::nonNull)
-                .toList());
+                .collect(Collectors.toList()));
         request.setPluginArtifactRepositories(remotePluginRepositories.values().stream()
                 .map(r -> {
                     try {
@@ -904,7 +905,7 @@ protected void populateRequestFromSettings(MavenExecutionRequest request, Settin
                     }
                 })
                 .filter(Objects::nonNull)
-                .toList());
+                .collect(Collectors.toList()));
     }
 
     protected int calculateDegreeOfConcurrency(String threadConfiguration) {

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
@@ -94,7 +95,7 @@ protected DefaultPlexusContainer container(
                 coreEntry.getExportedArtifacts(),
                 coreExtensionSelector.selectCoreExtensions(invoker, context));
         List<CoreExtensionEntry> loadedExtensionsEntries =
-                loadedExtensions.stream().map(LoadedCoreExtension::entry).toList();
+                loadedExtensions.stream().map(LoadedCoreExtension::entry).collect(Collectors.toList());
         ClassRealm containerRealm =
                 setupContainerRealm(context.logger, classWorld, coreRealm, extClassPath, loadedExtensionsEntries);
         ContainerConfiguration cc = new DefaultContainerConfiguration()

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java

@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
 
 import org.apache.maven.api.cli.mvn.MavenOptions;
 import org.apache.maven.cling.invoker.LayeredOptions;
@@ -35,7 +36,7 @@
  */
 public class LayeredMavenOptions<O extends MavenOptions> extends LayeredOptions<O> implements MavenOptions {
     public static MavenOptions layerMavenOptions(Collection<MavenOptions> options) {
-        List<MavenOptions> o = options.stream().filter(Objects::nonNull).toList();
+        List<MavenOptions> o = options.stream().filter(Objects::nonNull).collect(Collectors.toList());
         if (o.isEmpty()) {
             throw new IllegalArgumentException("No options specified (or all were null)");
         } else if (o.size() == 1) {

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java

@@ -213,7 +213,7 @@ protected void toolchains(MavenContext context, MavenExecutionRequest request) t
 
             if (context.invokerRequest.options().showErrors().orElse(false)) {
                 for (BuilderProblem problem :
-                        toolchainsResult.getProblems().problems().toList()) {
+                        toolchainsResult.getProblems().problems().collect(Collectors.toList())) {
                     context.logger.warn(problem.getMessage() + " @ " + problem.getLocation());
                 }
             }

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java

@@ -24,6 +24,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.cli.ParseException;
@@ -67,7 +68,7 @@ protected MavenOptions parseMavenCliOptions(List<String> args) {
     protected MavenOptions parseMavenAtFileOptions(Path atFile) {
         try (Stream<String> lines = Files.lines(atFile, Charset.defaultCharset())) {
             List<String> args =
-                    lines.filter(arg -> !arg.isEmpty() && !arg.startsWith("#")).toList();
+                    lines.filter(arg -> !arg.isEmpty() && !arg.startsWith("#")).collect(Collectors.toList());
             return parseArgs("atFile", args);
         } catch (ParseException e) {
             throw new IllegalArgumentException(
@@ -80,7 +81,7 @@ protected MavenOptions parseMavenAtFileOptions(Path atFile) {
     protected MavenOptions parseMavenConfigOptions(Path configFile) {
         try (Stream<String> lines = Files.lines(configFile, Charset.defaultCharset())) {
             List<String> args =
-                    lines.filter(arg -> !arg.isEmpty() && !arg.startsWith("#")).toList();
+                    lines.filter(arg -> !arg.isEmpty() && !arg.startsWith("#")).collect(Collectors.toList());
             MavenOptions options = parseArgs("maven.config", args);
             if (options.goals().isPresent()) {
                 // This file can only contain options, not args (goals or phases)