This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch code-enhancement-jdk17
in repository https://gitbox.apache.org/repos/asf/maven.git
commit dbd5893b1fd89db6a6cce91fcaac95986351ad7a
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Thu Mar 7 17:47:55 2024 +0100
Improved.
---
.../transform/DefaultArtifactTransformationManager.java | 3 +--
maven-core/src/main/java/org/apache/maven/ReactorReader.java | 5 ++---
.../src/main/java/org/apache/maven/RepositoryUtils.java | 9 ++++-----
.../artifact/resolver/filter/ExclusionArtifactFilter.java | 3 +--
.../main/java/org/apache/maven/execution/MavenSession.java | 9 ++++-----
.../java/org/apache/maven/execution/ProjectActivation.java | 5 ++---
.../aether/DefaultRepositorySystemSessionFactory.java | 2 +-
.../java/org/apache/maven/internal/impl/AbstractNode.java | 2 --
.../java/org/apache/maven/internal/impl/AbstractSession.java | 3 +--
.../maven/internal/impl/DefaultChecksumAlgorithmService.java | 2 +-
.../apache/maven/internal/impl/DefaultDependencyResolver.java | 2 +-
.../src/main/java/org/apache/maven/internal/impl/Utils.java | 3 +--
.../transformation/impl/DefaultConsumerPomBuilder.java | 7 +++----
.../java/org/apache/maven/lifecycle/DefaultLifecycles.java | 2 +-
.../internal/DefaultLifecycleTaskSegmentCalculator.java | 3 +--
.../org/apache/maven/lifecycle/internal/ProjectBuildList.java | 2 +-
.../maven/model/plugin/DefaultLifecycleBindingsInjector.java | 3 +--
.../maven/plugin/internal/DefaultPluginValidationManager.java | 3 +--
.../java/org/apache/maven/project/DefaultProjectBuilder.java | 2 +-
.../src/main/java/org/apache/maven/project/ProjectSorter.java | 11 ++++-------
.../apache/maven/resolver/MavenChainedWorkspaceReader.java | 4 ++--
.../org/apache/maven/session/scope/internal/SessionScope.java | 3 +--
.../java/org/apache/maven/graph/DefaultGraphBuilderTest.java | 4 ++--
.../test/java/org/apache/maven/graph/ProjectSelectorTest.java | 3 ++-
.../src/test/java/org/apache/maven/internal/impl/TestApi.java | 3 +--
.../src/main/java/org/apache/maven/di/impl/InjectorImpl.java | 4 ++--
.../src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java | 6 +++---
src/mdo/model-v3.vm | 10 +++++-----
28 files changed, 50 insertions(+), 68 deletions(-)
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
index 8eef94e9f3..b046adce9f 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
@@ -25,7 +25,6 @@ import javax.inject.Singleton;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.maven.artifact.Artifact;
@@ -50,7 +49,7 @@ public class DefaultArtifactTransformationManager implements
ArtifactTransformat
this.artifactTransformations = Stream.of("release", "latest",
"snapshot")
.map(artifactTransformations::get)
.filter(Objects::nonNull)
- .collect(Collectors.toList());
+ .toList();
}
public void transformForResolve(Artifact artifact, RepositoryRequest
request)
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 2f3e197c8c..e288ded3e7 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -31,7 +31,6 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.maven.api.services.Lookup;
@@ -115,7 +114,7 @@ class ReactorReader implements MavenWorkspaceReader {
.values()
.stream()
.map(MavenProject::getVersion)
- .collect(Collectors.collectingAndThen(Collectors.toList(),
Collections::unmodifiableList));
+ .toList();
if (!versions.isEmpty()) {
return versions;
}
@@ -126,7 +125,7 @@ class ReactorReader implements MavenWorkspaceReader {
.stream()
.filter(p -> Objects.nonNull(findArtifact(p, artifact)))
.map(MavenProject::getVersion)
- .collect(Collectors.collectingAndThen(Collectors.toList(),
Collections::unmodifiableList));
+ .toList();
}
@Override
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index b2da5bc483..1eacf5192f 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -27,7 +27,6 @@ import java.util.List;
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 class RepositoryUtils {
List<Exclusion> 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<RemoteRepository> toRepos(List<ArtifactRepository>
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 class RepositoryUtils {
List<Exclusion> exclusions = dependency.getExclusions().stream()
.map(RepositoryUtils::toExclusion)
- .collect(Collectors.toList());
+ .toList();
return new Dependency(
artifact,
@@ -326,7 +325,7 @@ public class RepositoryUtils {
}
public static Collection<Artifact>
toArtifacts(Collection<org.apache.maven.artifact.Artifact> 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/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
index 1defc48556..7c92b057ce 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
+++
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
@@ -24,7 +24,6 @@ import java.nio.file.Path;
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<Exclusion> exclusions) {
this.exclusions = exclusions;
this.predicates =
-
exclusions.stream().map(ExclusionArtifactFilter::toPredicate).collect(Collectors.toList());
+
exclusions.stream().map(ExclusionArtifactFilter::toPredicate).toList();
}
@Override
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index f9f68d379a..39e463a784 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -27,7 +27,6 @@ import java.util.Map;
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;
@@ -418,13 +417,13 @@ public class MavenSession implements Cloneable {
.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/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
index 6cc400e7df..fbdcbb6d2e 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import static java.util.stream.Collectors.toSet;
@@ -118,7 +117,7 @@ public class ProjectActivation {
*/
@Deprecated
public void overwriteActiveProjects(List<String> activeProjectSelectors) {
- List<ProjectActivationSettings> projects = getProjects(pa ->
pa.active).collect(Collectors.toList());
+ List<ProjectActivationSettings> projects = getProjects(pa ->
pa.active).toList();
this.activations.removeAll(projects);
activeProjectSelectors.forEach(this::activateOptionalProject);
}
@@ -130,7 +129,7 @@ public class ProjectActivation {
*/
@Deprecated
public void overwriteInactiveProjects(List<String>
inactiveProjectSelectors) {
- List<ProjectActivationSettings> projects = getProjects(pa ->
!pa.active).collect(Collectors.toList());
+ List<ProjectActivationSettings> projects = getProjects(pa ->
!pa.active).toList();
this.activations.removeAll(projects);
inactiveProjectSelectors.forEach(this::deactivateOptionalProject);
}
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index adb3f950bb..30b7b12f66 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -312,7 +312,7 @@ class DefaultRepositorySystemSessionFactory implements
RepositorySystemSessionFa
XmlNode dom = server.getDelegate().getConfiguration();
List<XmlNode> children = dom.getChildren().stream()
.filter(c -> !"wagonProvider".equals(c.getName()))
- .collect(Collectors.toList());
+ .toList();
dom = new XmlNodeImpl(dom.getName(), null, null, children,
null);
PlexusConfiguration config =
XmlPlexusConfiguration.toPlexusConfiguration(dom);
configProps.put("aether.transport.wagon.config." +
server.getId(), config);
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
index 9b3cfeb86b..1b56891dc7 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
@@ -18,10 +18,8 @@
*/
package org.apache.maven.internal.impl;
-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;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
index ac7a9c96d3..72e098113e 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
@@ -29,7 +29,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.WeakHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
import org.apache.maven.api.*;
import org.apache.maven.api.annotations.Nonnull;
@@ -355,7 +354,7 @@ public abstract class AbstractSession implements
InternalSession {
public Map<Artifact, Path> resolveArtifacts(Artifact... artifacts) {
ArtifactCoordinateFactory acf =
getService(ArtifactCoordinateFactory.class);
List<ArtifactCoordinate> 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/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java
index 10baef3ccc..40c954691d 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java
@@ -50,7 +50,7 @@ public class DefaultChecksumAlgorithmService implements
ChecksumAlgorithmService
public Collection<String> getChecksumAlgorithmNames() {
return
checksumAlgorithmFactorySelector.getChecksumAlgorithmFactories().stream()
.map(ChecksumAlgorithmFactory::getName)
- .collect(Collectors.toList());
+ .toList();
}
@Override
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
index 37eac68cee..3552216147 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
@@ -88,7 +88,7 @@ public class DefaultDependencyResolver implements
DependencyResolver {
.map(Node::getDependency)
.filter(Objects::nonNull)
.map(Artifact::toCoordinate)
- .collect(Collectors.toList());
+ .toList();
Map<Artifact, Path> artifacts = session.resolveArtifacts(coordinates);
DefaultDependencyResolverResult result = new
DefaultDependencyResolverResult(
collectorResult.getExceptions(), collectorResult.getRoot(),
nodes.size());
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/Utils.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/Utils.java
index 3077ac6bd9..0f40779ed4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/Utils.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/Utils.java
@@ -21,7 +21,6 @@ package org.apache.maven.internal.impl;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
-import java.util.stream.Collectors;
class Utils {
static <T> T nonNull(T t) {
@@ -46,6 +45,6 @@ class Utils {
}
static <U, V> List<V> map(Collection<U> list, Function<U, V> mapper) {
- return list.stream().map(mapper).collect(Collectors.toList());
+ return list.stream().map(mapper).toList();
}
}
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
index 79f2cb7363..2f6537c12b 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
@@ -28,7 +28,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.stream.Collectors;
import org.apache.maven.api.model.Dependency;
import org.apache.maven.api.model.DependencyManagement;
@@ -256,7 +255,7 @@ class DefaultConsumerPomBuilder implements
ConsumerPomBuilder {
builder.packaging(POM_PACKAGING);
builder.profiles(model.getProfiles().stream()
.map(p -> prune(Profile.newBuilder(p, true), p).build())
- .collect(Collectors.toList()));
+ .toList());
model = builder.build();
String modelVersion = new
MavenModelVersion().getModelVersion(model);
@@ -271,7 +270,7 @@ class DefaultConsumerPomBuilder implements
ConsumerPomBuilder {
model);
builder.profiles(model.getProfiles().stream()
.map(p -> prune(Profile.newBuilder(p, true), p).build())
- .collect(Collectors.toList()));
+ .toList());
model = builder.build();
String modelVersion = new
MavenModelVersion().getModelVersion(model);
model = model.withModelVersion(modelVersion);
@@ -297,6 +296,6 @@ class DefaultConsumerPomBuilder implements
ConsumerPomBuilder {
private static List<Repository> pruneRepositories(List<Repository>
repositories) {
return repositories.stream()
.filter(r ->
!org.apache.maven.api.Repository.CENTRAL_ID.equals(r.getId()))
- .collect(Collectors.toList());
+ .toList();
}
}
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
index ed9313db75..a7b62de599 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
@@ -137,7 +137,7 @@ public class DefaultLifecycles {
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<String, Lifecycle> lookupLifecycles() {
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
index 39faca5300..99f172af18 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
@@ -24,7 +24,6 @@ import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.maven.execution.MavenSession;
@@ -79,7 +78,7 @@ public class DefaultLifecycleTaskSegmentCalculator implements
LifecycleTaskSegme
&& !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/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
index 1e1719eda0..3f3899cdc2 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
@@ -55,7 +55,7 @@ public class ProjectBuildList implements
Iterable<ProjectSegment> {
*/
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<MavenProject, ProjectSegment> selectSegment(TaskSegment
taskSegment) {
diff --git
a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index ce53874427..cf29ee19a2 100644
---
a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++
b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -28,7 +28,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.maven.api.model.Build;
import org.apache.maven.api.model.Model;
@@ -75,7 +74,7 @@ public class DefaultLifecycleBindingsInjector implements
LifecycleBindingsInject
} else if (!defaultPlugins.isEmpty()) {
List<Plugin> plugins = defaultPlugins.stream()
.map(org.apache.maven.model.Plugin::getDelegate)
- .collect(Collectors.toList());
+ .toList();
Model lifecycleModel = Model.newBuilder()
.build(Build.newBuilder().plugins(plugins).build())
.build();
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
index 0794a548f7..903f53193e 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
@@ -35,7 +35,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
import org.apache.maven.eventspy.AbstractEventSpy;
import org.apache.maven.execution.ExecutionEvent;
@@ -112,7 +111,7 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
return Arrays.stream(excludes.split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
- .collect(Collectors.toList());
+ .toList();
}
private ValidationReportLevel
validationReportLevel(RepositorySystemSession session) {
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 1c94df3da4..c4f21a0ba4 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -441,7 +441,7 @@ public class DefaultProjectBuilder implements
ProjectBuilder {
List<Callable<InterimResult>> tasks = pomFiles.stream()
.map(pomFile -> ((Callable<InterimResult>)
() -> build(projectIndex, pomFile,
concat(aggregatorFiles, pomFile), root, recursive)))
- .collect(Collectors.toList());
+ .toList();
try {
List<Future<InterimResult>> futures =
executor.invokeAll(tasks);
List<InterimResult> list = new ArrayList<>();
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
index 32be1fee59..dcb4a4c8b9 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
@@ -19,11 +19,9 @@
package org.apache.maven.project;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.maven.api.model.Build;
import org.apache.maven.api.model.Dependency;
@@ -175,9 +173,8 @@ public class ProjectSorter {
List<String> sortedProjectLabels = graph.visitAll();
- this.sortedProjects = sortedProjectLabels.stream()
- .map(id -> projectMap.get(id))
- .collect(Collectors.collectingAndThen(Collectors.toList(),
Collections::unmodifiableList));
+ this.sortedProjects =
+ sortedProjectLabels.stream().map(id ->
projectMap.get(id)).toList();
}
@SuppressWarnings("checkstyle:parameternumber")
@@ -262,11 +259,11 @@ public class ProjectSorter {
}
public List<String> 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<String> 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/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java
b/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java
index 0fbb894f91..915a261d6f 100644
---
a/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java
+++
b/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java
@@ -103,7 +103,7 @@ public class MavenChainedWorkspaceReader implements
MavenWorkspaceReader {
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);
}
@@ -124,7 +124,7 @@ public class MavenChainedWorkspaceReader implements
MavenWorkspaceReader {
private final String type;
Key(Collection<WorkspaceReader> 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/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index a29b16fb2d..a66284a2a2 100644
---
a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++
b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.inject.Key;
@@ -130,7 +129,7 @@ public class SessionScope implements Scope {
value = superType.getInterfaces();
}
List<Class<?>> nonInterfaces =
- Stream.of(value).filter(c ->
!c.isInterface()).collect(Collectors.toList());
+ Stream.of(value).filter(c ->
!c.isInterface()).toList();
if (!nonInterfaces.isEmpty()) {
throw new IllegalArgumentException(
"The Typed annotation must contain only
interfaces but the following types are not: "
diff --git
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 4bc76e44ec..f96459faf5 100644
---
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -466,7 +466,7 @@ class DefaultGraphBuilderTest {
when(result.getProject()).thenReturn(project);
return result;
})
- .collect(toList());
+ .toList();
}
static class ScenarioBuilder {
@@ -553,7 +553,7 @@ class DefaultGraphBuilderTest {
}
private List<String> prependWithColonIfNeeded(String[] selectors) {
- return
Arrays.stream(selectors).map(this::prependWithColonIfNeeded).collect(toList());
+ return
Arrays.stream(selectors).map(this::prependWithColonIfNeeded).toList();
}
private String prependWithColonIfNeeded(String selector) {
diff --git
a/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
b/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
index 2cdeac39b8..6e843ce772 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.graph;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -60,7 +61,7 @@ class ProjectSelectorTest {
@Test
void getBaseDirectoryFromRequestWhenDirectoryIsValidReturnFile() {
-
when(mavenExecutionRequest.getBaseDirectory()).thenReturn("path/to/file");
+
when(mavenExecutionRequest.getTopDirectory()).thenReturn(Path.of("path/to/file"));
final File baseDirectoryFromRequest =
sut.getBaseDirectoryFromRequest(mavenExecutionRequest);
diff --git
a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
index e4b74c9c57..e2f3687129 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.stream.Collectors;
import org.apache.maven.api.*;
import org.apache.maven.api.services.DependencyResolver;
@@ -227,7 +226,7 @@ class TestApi {
List<Dependency> 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/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
b/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
index a2ad2ca6f1..2cf148d900 100644
--- a/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
+++ b/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
@@ -72,7 +72,7 @@ public class InjectorImpl implements Injector {
try (InputStream is = enumeration.nextElement().openStream();
BufferedReader reader = new BufferedReader(new
InputStreamReader(Objects.requireNonNull(is)))) {
for (String line :
- reader.lines().filter(l ->
!l.startsWith("#")).collect(Collectors.toList())) {
+ reader.lines().filter(l ->
!l.startsWith("#")).toList()) {
Class<?> clazz = classLoader.loadClass(line);
bindImplicit(clazz);
}
@@ -147,7 +147,7 @@ public class InjectorImpl implements Injector {
Set<Binding<Object>> res2 = getBindings(key.getTypeParameter(0));
if (res2 != null) {
List<Supplier<Object>> bindingList =
-
res2.stream().map(this::compile).collect(Collectors.toList());
+ res2.stream().map(this::compile).toList();
//noinspection unchecked
return () -> (Q) new WrappingList<>(bindingList,
Supplier::get);
}
diff --git a/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java
b/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java
index d326d41fd7..25c6d44de2 100644
--- a/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java
+++ b/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java
@@ -29,7 +29,7 @@ import static org.apache.maven.di.impl.Types.simplifyType;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class TypeUtilsTest {
+class TypeUtilsTest {
TreeSet<String> aField;
@@ -42,7 +42,7 @@ public class TypeUtilsTest {
typesStr.remove("java.util.SequencedSet<java.lang.String>");
typesStr.remove("java.util.SequencedCollection<java.lang.String>");
assertEquals(
- Arrays.asList(
+ List.of(
"class java.lang.Object",
"interface java.io.Serializable",
"interface java.lang.Cloneable",
@@ -58,7 +58,7 @@ public class TypeUtilsTest {
}
@Test
- public void testSimplifyType() {
+ void testSimplifyType() {
{
Type type = Integer.class;
assertEquals(type, simplifyType(type));
diff --git a/src/mdo/model-v3.vm b/src/mdo/model-v3.vm
index f399783ba8..3d1799313e 100644
--- a/src/mdo/model-v3.vm
+++ b/src/mdo/model-v3.vm
@@ -212,7 +212,7 @@ public class ${class.name}
}
if (!Objects.equals(${field.name}, ${pfx}${cap}())) {
update(getDelegate().with${cap}(
- ${field.name}.stream().map(c ->
c.getDelegate()).collect(Collectors.toList())));
+ ${field.name}.stream().map(c -> c.getDelegate()).toList()));
${field.name}.forEach(e -> e.childrenTracking = this::replace);
}
#elseif ( $field.to && $field.to != "String" )
@@ -238,11 +238,11 @@ public class ${class.name}
#if ( $field.to == "String" )
update(getDelegate().with${cap}(
Stream.concat(getDelegate().get${cap}().stream(),
Stream.of(${v}))
- .collect(Collectors.toList())));
+ .toList()));
#else
update(getDelegate().with${cap}(
Stream.concat(getDelegate().get${cap}().stream(),
Stream.of(${v}.getDelegate()))
- .collect(Collectors.toList())));
+ .toList()));
${v}.childrenTracking = this::replace;
#end
}
@@ -252,12 +252,12 @@ public class ${class.name}
update(getDelegate().with${cap}(
getDelegate().get${cap}().stream()
.filter(e -> !Objects.equals(e, ${v}))
- .collect(Collectors.toList())));
+ .toList()));
#else
update(getDelegate().with${cap}(
getDelegate().get${cap}().stream()
.filter(e -> !Objects.equals(e, ${v}))
- .collect(Collectors.toList())));
+ .toList()));
${v}.childrenTracking = null;
#end
}
