From 9958737b140952cb8efcceb1d5baa3f4292a55fe Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Sat, 3 May 2025 12:52:11 +0200 Subject: [PATCH] Pull #2287: Modernize codebase with Java improvements - Use modern Java collections API (toList() instead of collect(Collectors.toList())) --- .../extensions/BootstrapCoreExtensionManager.java | 3 +-- .../main/java/org/apache/maven/RepositoryUtils.java | 9 ++++----- .../resolver/filter/ExclusionArtifactFilter.java | 3 +-- .../execution/DefaultBuildResumptionAnalyzer.java | 3 +-- .../java/org/apache/maven/execution/MavenSession.java | 9 ++++----- .../maven/graph/DefaultProjectDependencyGraph.java | 3 +-- .../aether/DefaultRepositorySystemSessionFactory.java | 2 +- .../java/org/apache/maven/internal/impl/CoreUtils.java | 3 +-- .../maven/internal/impl/DefaultLifecycleRegistry.java | 5 ++--- .../transformation/impl/DefaultConsumerPomBuilder.java | 4 ++-- .../org/apache/maven/lifecycle/DefaultLifecycles.java | 2 +- .../DefaultLifecycleTaskSegmentCalculator.java | 3 +-- .../internal/LifecycleDependencyResolver.java | 3 +-- .../lifecycle/internal/MojoDescriptorCreator.java | 3 +-- .../maven/lifecycle/internal/ProjectBuildList.java | 2 +- .../concurrent/ConcurrentLifecycleStarter.java | 3 +-- .../lifecycle/internal/concurrent/PluginLifecycle.java | 10 +++++----- .../apache/maven/lifecycle/mapping/LifecyclePhase.java | 2 +- .../internal/DefaultPluginDependenciesResolver.java | 3 +-- .../internal/DefaultPluginValidationManager.java | 3 +-- .../apache/maven/project/DefaultProjectBuilder.java | 6 +++--- .../java/org/apache/maven/project/ProjectSorter.java | 4 ++-- .../maven/resolver/MavenChainedWorkspaceReader.java | 4 ++-- .../java/org/apache/maven/internal/impl/TestApi.java | 3 +-- .../project/harness/Xpp3DomAttributeIterator.java | 3 +-- .../java/org/apache/maven/di/impl/InjectorImpl.java | 2 +- .../java/org/apache/maven/di/impl/TypeUtilsTest.java | 7 +++---- .../main/java/org/apache/maven/impl/AbstractNode.java | 3 +-- .../java/org/apache/maven/impl/AbstractSession.java | 3 +-- .../org/apache/maven/impl/DefaultArtifactResolver.java | 2 +- .../maven/impl/DefaultChecksumAlgorithmService.java | 2 +- .../apache/maven/impl/DefaultDependencyResolver.java | 2 +- .../src/main/java/org/apache/maven/impl/ImplUtils.java | 3 +-- .../java/org/apache/maven/impl/SettingsUtilsV4.java | 4 ++-- .../apache/maven/impl/model/DefaultModelBuilder.java | 2 +- .../apache/maven/impl/model/FileToRawModelMerger.java | 9 ++++----- .../UserPropertiesArtifactRelocationSource.java | 3 +-- .../apache/maven/api/plugin/testing/MojoExtension.java | 3 +-- .../apache/maven/internal/xml/DefaultXmlService.java | 2 +- 39 files changed, 61 insertions(+), 84 deletions(-) diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java index 89dd0e0c0e3f..f729d64118a0 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java @@ -25,7 +25,6 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.function.UnaryOperator; -import java.util.stream.Collectors; import org.apache.maven.RepositoryUtils; import org.apache.maven.api.Service; @@ -231,7 +230,7 @@ private List resolveExtension( return result.getArtifactResults().stream() .filter(ArtifactResult::isResolved) .map(ArtifactResult::getArtifact) - .collect(Collectors.toList()); + .toList(); } catch (PluginResolutionException | InterpolatorException e) { throw new ExtensionResolutionException(extension, e); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index a093e4d90933..88a42d200bf1 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.artifact.handler.DefaultArtifactHandler; @@ -171,14 +170,14 @@ public static Dependency toDependency( List excl = Optional.ofNullable(exclusions).orElse(Collections.emptyList()).stream() .map(RepositoryUtils::toExclusion) - .collect(Collectors.toList()); + .toList(); return new Dependency(result, artifact.getScope(), artifact.isOptional(), excl); } public static List toRepos(List repos) { return Optional.ofNullable(repos).orElse(Collections.emptyList()).stream() .map(RepositoryUtils::toRepo) - .collect(Collectors.toList()); + .toList(); } public static RemoteRepository toRepo(ArtifactRepository repo) { @@ -294,7 +293,7 @@ public static Dependency toDependency( List exclusions = dependency.getExclusions().stream() .map(RepositoryUtils::toExclusion) - .collect(Collectors.toList()); + .toList(); return new Dependency( artifact, @@ -326,7 +325,7 @@ public ArtifactType get(String stereotypeId) { } public static Collection toArtifacts(Collection artifactsToConvert) { - return artifactsToConvert.stream().map(RepositoryUtils::toArtifact).collect(Collectors.toList()); + return artifactsToConvert.stream().map(RepositoryUtils::toArtifact).toList(); } public static WorkspaceRepository getWorkspace(RepositorySystemSession session) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java index 1defc485567f..7c92b057ce12 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java @@ -24,7 +24,6 @@ import java.nio.file.PathMatcher; import java.util.List; import java.util.function.Predicate; -import java.util.stream.Collectors; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Exclusion; @@ -40,7 +39,7 @@ public class ExclusionArtifactFilter implements ArtifactFilter { public ExclusionArtifactFilter(List exclusions) { this.exclusions = exclusions; this.predicates = - exclusions.stream().map(ExclusionArtifactFilter::toPredicate).collect(Collectors.toList()); + exclusions.stream().map(ExclusionArtifactFilter::toPredicate).toList(); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java index 0bc99bdb78dd..47a87e1cd101 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.maven.project.MavenProject; import org.slf4j.Logger; @@ -56,7 +55,7 @@ public Optional determineBuildResumptionData(final MavenExe .filter(project -> result.getBuildSummary(project) == null || result.getBuildSummary(project) instanceof BuildFailure) .map(project -> project.getGroupId() + ":" + project.getArtifactId()) - .collect(Collectors.toList()); + .toList(); if (remainingProjects.isEmpty()) { LOGGER.info("No remaining projects found, resuming the build would not make sense."); diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index 400e1653cc31..0ff0476c28fa 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -28,7 +28,6 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.stream.Collectors; import org.apache.maven.api.Session; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -423,13 +422,13 @@ private static Settings adaptSettings(MavenExecutionRequest request) { .localRepository(localRepo != null ? localRepo.getAbsolutePath() : null) .interactiveMode(request.isInteractiveMode()) .offline(request.isOffline()) - .proxies(request.getProxies().stream().map(Proxy::getDelegate).collect(Collectors.toList())) - .servers(request.getServers().stream().map(Server::getDelegate).collect(Collectors.toList())) - .mirrors(request.getMirrors().stream().map(Mirror::getDelegate).collect(Collectors.toList())) + .proxies(request.getProxies().stream().map(Proxy::getDelegate).toList()) + .servers(request.getServers().stream().map(Server::getDelegate).toList()) + .mirrors(request.getMirrors().stream().map(Mirror::getDelegate).toList()) .profiles(request.getProfiles().stream() .map(Profile::getDelegate) .map(SettingsUtilsV4::convertToSettingsProfile) - .collect(Collectors.toList())) + .toList()) .activeProfiles(request.getActiveProfiles()) .pluginGroups(request.getPluginGroups()) .build()); diff --git a/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java index d49670b438b3..323787e7d2ea 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java +++ b/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import org.apache.maven.execution.ProjectDependencyGraph; import org.apache.maven.project.CycleDetectedException; @@ -153,7 +152,7 @@ private List getSortedProjects(Set projectIds) { return projectIds.stream() .map(projects::get) .sorted(Comparator.comparingInt(order::get)) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 9d1a3441e7bf..2a42287f5b15 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -231,7 +231,7 @@ public SessionBuilder newRepositorySessionBuilder(MavenExecutionRequest request) XmlNode dom = server.getDelegate().getConfiguration(); List children = dom.children().stream() .filter(c -> !"wagonProvider".equals(c.name())) - .collect(Collectors.toList()); + .toList(); dom = XmlNode.newInstance(dom.name(), children); PlexusConfiguration config = XmlPlexusConfiguration.toPlexusConfiguration(dom); configProps.put("aether.transport.wagon.config." + server.getId(), config); diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java index b5c62658ec3e..369412923e95 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.function.Function; -import java.util.stream.Collectors; class CoreUtils { @@ -37,6 +36,6 @@ public static T cast(Class clazz, Object o, String name) { } public static List map(Collection list, Function mapper) { - return list.stream().map(mapper).filter(Objects::nonNull).collect(Collectors.toList()); + return list.stream().map(mapper).filter(Objects::nonNull).toList(); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java index 60a6c0b32a0b..7a43657a6de7 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java @@ -34,7 +34,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.DependencyScope; @@ -143,7 +142,7 @@ public List computePhases(Lifecycle lifecycle) { List allPhases = graph.visitAll(); Collections.reverse(allPhases); List computed = - allPhases.stream().filter(s -> !s.startsWith("$")).collect(Collectors.toList()); + allPhases.stream().filter(s -> !s.startsWith("$")).toList(); return computed; } @@ -211,7 +210,7 @@ public Collection provides() { && !Lifecycle.DEFAULT.equals(id) && !Lifecycle.SITE.equals(id)) .map(id -> wrap(all.get(id))) - .collect(Collectors.toList()); + .toList(); } catch (ComponentLookupException e) { throw new LookupException(e); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java index 9d74419c989e..5de4b1ab5cbf 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java @@ -288,7 +288,7 @@ private static List prune(List profiles) { return builder.build(null).build(); }) .filter(p -> !isEmpty(p)) - .collect(Collectors.toList()); + .toList(); } private static boolean isEmpty(Profile profile) { @@ -324,6 +324,6 @@ private static T prune(T builder, ModelBase model) private static List pruneRepositories(List repositories) { return repositories.stream() .filter(r -> !org.apache.maven.api.Repository.CENTRAL_ID.equals(r.getId())) - .collect(Collectors.toList()); + .toList(); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java index f85a9bc51d05..039064b2f160 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java @@ -161,7 +161,7 @@ public List getLifeCycles() { return lifecyclesMap.values().stream() .peek(l -> Objects.requireNonNull(l.getId(), "A lifecycle must have an id.")) .sorted(Comparator.comparing(Lifecycle::getId, comparator)) - .collect(Collectors.toList()); + .toList(); } private Map lookupLifecycles() { diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java index 6d17a835db70..5081b707f2c3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.Lifecycle; @@ -84,7 +83,7 @@ public List calculateTaskSegments(MavenSession session) && !rootProject.getDefaultGoal().isEmpty())) { tasks = Stream.of(rootProject.getDefaultGoal().split("\\s+")) .filter(g -> !g.isEmpty()) - .collect(Collectors.toList()); + .toList(); } return calculateTaskSegments(session, tasks); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index 96b3ff0b8fbd..4dc79f1b3390 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.apache.maven.RepositoryUtils; import org.apache.maven.api.services.MessageBuilderFactory; @@ -96,7 +95,7 @@ public static List getProjects(MavenProject project, MavenSession projectAndSubmodules.add(project); return session.getProjects().stream() // sorted all .filter(projectAndSubmodules::contains) - .collect(Collectors.toList()); // sorted and filtered to what we need + .toList(); // sorted and filtered to what we need } else { return Collections.singletonList(project); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 009e3712cdc9..1f6d9eef15ae 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import org.apache.maven.api.xml.XmlNode; import org.apache.maven.execution.MavenSession; @@ -102,7 +101,7 @@ public static XmlNode convert(org.apache.maven.api.plugin.descriptor.MojoDescrip : null, null, null)) - .collect(Collectors.toList()); + .toList(); return XmlNode.newInstance("configuration", children); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java index 1e1719eda05c..3f3899cdc2ee 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java @@ -55,7 +55,7 @@ public ProjectBuildList(List items) { */ public ProjectBuildList getByTaskSegment(TaskSegment taskSegment) { return new ProjectBuildList( - items.stream().filter(pb -> taskSegment == pb.getTaskSegment()).collect(Collectors.toList())); + items.stream().filter(pb -> taskSegment == pb.getTaskSegment()).toList()); } public Map selectSegment(TaskSegment taskSegment) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java index 3ba6c99499b6..07c1b61d20cb 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.Lifecycle; @@ -128,7 +127,7 @@ public List calculateTaskSegments(MavenSession session) throws Exce && !rootProject.getDefaultGoal().isEmpty())) { tasks = Stream.of(rootProject.getDefaultGoal().split("\\s+")) .filter(g -> !g.isEmpty()) - .collect(Collectors.toList()); + .toList(); } return calculateTaskSegments(session, tasks); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java index 81a319b7aea6..09a5f487adb0 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java @@ -21,11 +21,11 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.Lifecycle; import org.apache.maven.api.model.Plugin; +import org.apache.maven.api.model.PluginExecution; import org.apache.maven.plugin.descriptor.PluginDescriptor; class PluginLifecycle implements Lifecycle { @@ -47,7 +47,7 @@ public String id() { @Override public Collection phases() { return lifecycleOverlay.getPhases().stream() - .map(phase -> new Phase() { + .map(phase -> new Phase() { @Override public String name() { return phase.getId(); @@ -61,11 +61,11 @@ public List plugins() { .version(pluginDescriptor.getVersion()) .configuration(phase.getConfiguration()) .executions(phase.getExecutions().stream() - .map(exec -> org.apache.maven.api.model.PluginExecution.newBuilder() + .map(exec -> PluginExecution.newBuilder() .goals(exec.getGoals()) .configuration(exec.getConfiguration()) .build()) - .collect(Collectors.toList())) + .toList()) .build()); } @@ -84,7 +84,7 @@ public Stream allPhases() { return Stream.concat(Stream.of(this), phases().stream().flatMap(Phase::allPhases)); } }) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java index 7cc65939b074..4324599e08ca 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java @@ -56,7 +56,7 @@ public void set(String goals) { if (goals != null && !goals.isEmpty()) { String[] mojoGoals = goals.split(","); - mojos = Arrays.stream(mojoGoals).map(fromGoalIntoLifecycleMojo).collect(Collectors.toList()); + mojos = Arrays.stream(mojoGoals).map(fromGoalIntoLifecycleMojo).toList(); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index 16aee3db3130..09a77f9a9c28 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -25,7 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.RepositoryUtils; @@ -240,7 +239,7 @@ private DependencyResult resolveInternal( e.getResult().getArtifactResults().stream() .filter(r -> !r.isResolved()) .flatMap(r -> r.getExceptions().stream())) - .collect(Collectors.toList()); + .toList(); throw new PluginResolutionException(plugin, exceptions, e); } finally { RequestTraceHelper.exit(trace); diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java index 0bd14d1635d1..1774ccf29a61 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; import org.apache.maven.api.Constants; import org.apache.maven.eventspy.AbstractEventSpy; @@ -109,7 +108,7 @@ private List parsePluginExcludes(RepositorySystemSession session) { return Arrays.stream(excludes.split(",")) .map(String::trim) .filter(s -> !s.isEmpty()) - .collect(Collectors.toList()); + .toList(); } private ValidationReportLevel validationReportLevel(RepositorySystemSession session) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index a14dfaabe158..58f1c14b2825 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -505,7 +505,7 @@ List doBuild(List pomFiles, boolean recursive) { return pomFiles.stream() .map(pomFile -> build(pomFile, recursive)) .flatMap(List::stream) - .collect(Collectors.toList()); + .toList(); } finally { Thread.currentThread().setContextClassLoader(oldContextClassLoader); } @@ -551,7 +551,7 @@ private List build(File pomFile, boolean recursive) { project.setCollectedProjects(results(r) .filter(cr -> cr != r && cr.getEffectiveModel() != null) .map(cr -> projectIndex.get(cr.getEffectiveModel().getId())) - .collect(Collectors.toList())); + .toList()); DependencyResolutionResult resolutionResult = null; if (request.isResolveDependencies()) { @@ -944,7 +944,7 @@ private DependencyResolutionResult resolveDependencies(MavenProject project) { } private List getProfileIds(List profiles) { - return profiles.stream().map(Profile::getId).collect(Collectors.toList()); + return profiles.stream().map(Profile::getId).toList(); } private static ModelSource createStubModelSource(Artifact artifact) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java index 32be1fee5988..57c352a8784a 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java @@ -262,11 +262,11 @@ public boolean hasMultipleProjects() { } public List getDependents(String id) { - return graph.getVertex(id).getParents().stream().map(Vertex::getLabel).collect(Collectors.toList()); + return graph.getVertex(id).getParents().stream().map(Vertex::getLabel).toList(); } public List getDependencies(String id) { - return graph.getVertex(id).getChildren().stream().map(Vertex::getLabel).collect(Collectors.toList()); + return graph.getVertex(id).getChildren().stream().map(Vertex::getLabel).toList(); } public static String getId(MavenProject project) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java index 06ac4b0a0cf1..8417bc88ba86 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java +++ b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java @@ -109,7 +109,7 @@ public void setReaders(Collection readers) { requireNonNull(readers, "readers"); // skip possible null entries this.readers = Collections.unmodifiableList( - new ArrayList<>(readers.stream().filter(Objects::nonNull).collect(Collectors.toList()))); + new ArrayList<>(readers.stream().filter(Objects::nonNull).toList())); Key key = new Key(this.readers); this.repository = new WorkspaceRepository(key.getContentType(), key); } @@ -130,7 +130,7 @@ private static class Key { private final String type; Key(Collection readers) { - keys = readers.stream().map(r -> r.getRepository().getKey()).collect(Collectors.toList()); + keys = readers.stream().map(r -> r.getRepository().getKey()).toList(); type = readers.stream().map(r -> r.getRepository().getContentType()).collect(Collectors.joining("+")); } diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java index 7bb328744c18..b3c8a47e3952 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.maven.api.Artifact; import org.apache.maven.api.ArtifactCoordinates; @@ -243,7 +242,7 @@ void testProjectDependencies() { List deps2 = result.getNodes().stream() .map(Node::getDependency) .filter(Objects::nonNull) - .collect(Collectors.toList()); + .toList(); assertEquals(deps, deps2); for (Dependency dep : deps2) { dep.getVersion(); diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java index 90790c929db2..35119df05ce4 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodeIterator; @@ -49,7 +48,7 @@ class Xpp3DomAttributeIterator implements NodeIterator { this.attributes = this.node.attributes().entrySet().stream() .filter(a -> a.getKey().equals(qname.getName()) || "*".equals(qname.getName())) - .collect(Collectors.toList()); + .toList(); } public NodePointer getNodePointer() { diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java index 266122ef3155..ec4ee10d679c 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java @@ -220,7 +220,7 @@ public Supplier doGetCompiledBinding(Dependency dep) { if (key.getRawType() == List.class) { Set> res2 = getBindings(key.getTypeParameter(0)); if (res2 != null) { - List> list = res2.stream().map(this::compile).collect(Collectors.toList()); + List> list = res2.stream().map(this::compile).toList(); //noinspection unchecked return () -> (Q) list(list, Supplier::get); } diff --git a/impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java b/impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java index 581b92f43e9b..1b8fbf59ac47 100644 --- a/impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java +++ b/impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java @@ -19,11 +19,11 @@ package org.apache.maven.di.impl; import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.TreeSet; -import java.util.stream.Collectors; import org.apache.maven.di.Key; import org.junit.jupiter.api.Test; @@ -34,14 +34,13 @@ public class TypeUtilsTest { - TreeSet aField; - @Test void testGetSuperTypes() { Type type = new Key>() {}.getType(); Set types = Types.getAllSuperTypes(type); assertNotNull(types); - List typesStr = types.stream().map(Type::toString).sorted().collect(Collectors.toList()); + List typesStr = + new ArrayList<>(types.stream().map(Type::toString).sorted().toList()); typesStr.remove("java.util.SequencedSet"); typesStr.remove("java.util.SequencedCollection"); assertEquals( diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java index ad0dea065f5c..def557ad1fe5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Predicate; -import java.util.stream.Collectors; import org.apache.maven.api.Node; import org.apache.maven.api.NodeVisitor; @@ -45,7 +44,7 @@ public boolean accept(NodeVisitor visitor) { @Override public Node filter(Predicate filter) { List children = - getChildren().stream().filter(filter).map(n -> n.filter(filter)).collect(Collectors.toList()); + getChildren().stream().filter(filter).map(n -> n.filter(filter)).toList(); return new WrapperNode(this, Collections.unmodifiableList(children)); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java index e81a217a8e28..5eeb9010499d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java @@ -33,7 +33,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; import java.util.function.Supplier; -import java.util.stream.Collectors; import org.apache.maven.api.Artifact; import org.apache.maven.api.ArtifactCoordinates; @@ -707,7 +706,7 @@ public DownloadedArtifact resolveArtifact(Artifact artifact, List resolveArtifacts(Artifact... artifacts) { ArtifactCoordinatesFactory acf = getService(ArtifactCoordinatesFactory.class); List coords = - Arrays.stream(artifacts).map(a -> acf.create(this, a)).collect(Collectors.toList()); + Arrays.stream(artifacts).map(a -> acf.create(this, a)).toList(); return resolveArtifacts(coords); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java index acc0b23be5e2..a0d989e48312 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java @@ -240,7 +240,7 @@ public ArtifactResolverRequest getRequest() { @Nonnull @Override public Collection getArtifacts() { - return results.values().stream().map(ResultItem::getArtifact).collect(Collectors.toList()); + return results.values().stream().map(ResultItem::getArtifact).toList(); } @Override diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java index ef062acdc7ba..9bc6a1e8008f 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java @@ -58,7 +58,7 @@ public DefaultChecksumAlgorithmService(ChecksumAlgorithmFactorySelector checksum public Collection getChecksumAlgorithmNames() { return checksumAlgorithmFactorySelector.getChecksumAlgorithmFactories().stream() .map(ChecksumAlgorithmFactory::getName) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java index 7bab2446c6f0..3c7f744a8e32 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java @@ -189,7 +189,7 @@ public DependencyResolverResult resolve(DependencyResolverRequest request) .map(Node::getDependency) .filter(Objects::nonNull) .map(Artifact::toCoordinates) - .collect(Collectors.toList()); + .toList(); Predicate filter = request.getPathTypeFilter(); if (request.getRequestType() == DependencyResolverRequest.RequestType.FLATTEN) { DefaultDependencyResolverResult flattenResult = new DefaultDependencyResolverResult( diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java index 37e0f36e1bee..6e723e014339 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.function.Function; -import java.util.stream.Collectors; class ImplUtils { public static T nonNull(T t) { @@ -50,6 +49,6 @@ public static T cast(Class clazz, Object o, String name) { } public static List map(Collection list, Function mapper) { - return list.stream().map(mapper).filter(Objects::nonNull).collect(Collectors.toList()); + return list.stream().map(mapper).filter(Objects::nonNull).toList(); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java index 8a5d1e81a2bb..df984ccd4fbb 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java @@ -257,14 +257,14 @@ public static org.apache.maven.api.model.Profile convertFromSettingsProfile(Prof if (repos != null) { profile.repositories(repos.stream() .map(SettingsUtilsV4::convertFromSettingsRepository) - .collect(Collectors.toList())); + .toList()); } List pluginRepos = settingsProfile.getPluginRepositories(); if (pluginRepos != null) { profile.pluginRepositories(pluginRepos.stream() .map(SettingsUtilsV4::convertFromSettingsRepository) - .collect(Collectors.toList())); + .toList()); } org.apache.maven.api.model.Profile value = profile.build(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java index 82ebd5a770f1..2c4c0963a6d4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java @@ -1672,7 +1672,7 @@ private DependencyManagement loadDependencyManagement(Dependency dependency, Col List dependencies = importMgmt.getDependencies().stream() .filter(candidate -> exclusions.stream().noneMatch(exclusion -> match(exclusion, candidate))) .map(candidate -> addExclusions(candidate, exclusions)) - .collect(Collectors.toList()); + .toList(); importMgmt = importMgmt.withDependencies(dependencies); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java index b98d057b30ba..9b2ab8e8ec43 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.Map; -import java.util.stream.Collectors; import org.apache.maven.api.model.Build; import org.apache.maven.api.model.BuildBase; @@ -90,7 +89,7 @@ protected void mergeDependencyManagement_Dependencies( Iterator sourceIterator = source.getDependencies().iterator(); builder.dependencies(target.getDependencies().stream() .map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context)) - .collect(Collectors.toList())); + .toList()); } @Override @@ -133,7 +132,7 @@ protected void mergeModel_Profiles( Iterator sourceIterator = source.getProfiles().iterator(); builder.profiles(target.getProfiles().stream() .map(d -> mergeProfile(d, sourceIterator.next(), sourceDominant, context)) - .collect(Collectors.toList())); + .toList()); } @Override @@ -146,7 +145,7 @@ protected void mergeModelBase_Dependencies( Iterator sourceIterator = source.getDependencies().iterator(); builder.dependencies(target.getDependencies().stream() .map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context)) - .collect(Collectors.toList())); + .toList()); } @Override @@ -175,7 +174,7 @@ protected void mergePlugin_Dependencies( Iterator sourceIterator = source.getDependencies().iterator(); builder.dependencies(target.getDependencies().stream() .map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context)) - .collect(Collectors.toList())); + .toList()); } @Override diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java index 966ceaa06fe5..363350459dc6 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.Constants; @@ -185,7 +184,7 @@ private Relocations parseRelocations(RepositorySystemSession session) { } return new Relocation(global, s, t); }) - .collect(Collectors.toList()); + .toList(); LOGGER.info("Parsed {} user relocations", relocationList.size()); return new Relocations(relocationList); } diff --git a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java b/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java index e06ea7c58e7d..4f04a2354b62 100644 --- a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java +++ b/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java @@ -40,7 +40,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.MojoExecution; @@ -270,7 +269,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte .orElseGet(() -> XmlNode.newInstance("config")); List children = mojoParameters.stream() .map(mp -> XmlNode.newInstance(mp.name(), mp.value())) - .collect(Collectors.toList()); + .toList(); XmlNode config = XmlNode.newInstance("configuration", null, null, children, null); pluginConfiguration = XmlService.merge(config, pluginConfiguration); diff --git a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java index bb99243ccf9d..2f6fbf18752d 100644 --- a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java +++ b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java @@ -312,7 +312,7 @@ public XmlNode doMerge(XmlNode dominant, XmlNode recessive, Boolean childMergeOv Iterator it = commonChildren.computeIfAbsent(name, n1 -> Stream.of(dominant.children().stream() .filter(n2 -> n2.name().equals(n1)) - .collect(Collectors.toList())) + .toList()) .filter(l -> !l.isEmpty()) .map(List::iterator) .findFirst()