This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch code-enhancement-jdk17
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/code-enhancement-jdk17 by this
push:
new 98bb1377f4 Use Stream.toList() when possible
98bb1377f4 is described below
commit 98bb1377f418af5a3a63bc9b43403b418a98c7fd
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Mar 11 10:41:07 2024 +0100
Use Stream.toList() when possible
---
.../maven/lifecycle/internal/LifecycleDependencyResolver.java | 3 +--
.../apache/maven/lifecycle/internal/builder/BuilderCommon.java | 3 +--
.../java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java | 2 +-
.../java/org/apache/maven/project/DefaultProjectBuilder.java | 9 ++++-----
.../src/main/java/org/apache/maven/settings/SettingsUtilsV4.java | 4 ++--
.../apache/maven/project/harness/Xpp3DomAttributeIterator.java | 3 +--
.../src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java | 3 +--
.../apache/maven/cli/internal/BootstrapCoreExtensionManager.java | 3 +--
.../org/apache/maven/model/building/DefaultModelBuilder.java | 7 +++----
.../org/apache/maven/model/building/FileToRawModelMerger.java | 9 ++++-----
.../org/apache/maven/model/profile/DefaultProfileSelector.java | 6 ++----
.../java/org/apache/maven/model/profile/ProfileSelector.java | 6 ++----
.../apache/maven/model/building/FileToRawModelMergerTest.java | 5 ++---
.../src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java | 3 +--
.../java/org/apache/maven/plugin/descriptor/MojoDescriptor.java | 5 ++---
.../org/apache/maven/plugin/descriptor/PluginDescriptor.java | 2 +-
.../relocation/UserPropertiesArtifactRelocationSource.java | 3 +--
.../src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java | 4 ++--
.../test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java | 3 +--
19 files changed, 33 insertions(+), 50 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 6b1df8b775..8dd057caf5 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -30,7 +30,6 @@ import java.util.LinkedHashSet;
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 class LifecycleDependencyResolver {
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/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index 81bb5596b3..ec9e367b77 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -24,7 +24,6 @@ import javax.inject.Singleton;
import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildFailure;
@@ -149,7 +148,7 @@ public class BuilderCommon {
p.getLocation("version").getSource().getModelId()))
.distinct()
.map(Plugin::getArtifactId) // managed by us, groupId is
always o.a.m.plugins
- .collect(Collectors.toList());
+ .toList();
if (!unversionedPlugins.isEmpty()) {
logger.warn("Version not locked for default bindings plugins " +
unversionedPlugins
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
index 7cc65939b0..4324599e08 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
@@ -56,7 +56,7 @@ public class LifecyclePhase {
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/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index c4f21a0ba4..b62e6fda6a 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
@@ -28,7 +28,6 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
import org.apache.maven.ProjectCycleException;
import org.apache.maven.RepositoryUtils;
@@ -602,7 +601,7 @@ public class DefaultProjectBuilder implements
ProjectBuilder {
List<Callable<List<ProjectBuildingResult>>> callables =
interimResults.stream()
.map(interimResult ->
(Callable<List<ProjectBuildingResult>>) () ->
doBuild(projectIndex, interimResult))
- .collect(Collectors.toList());
+ .toList();
try {
List<Future<List<ProjectBuildingResult>>> futures =
executor.invokeAll(callables);
@@ -619,7 +618,7 @@ public class DefaultProjectBuilder implements
ProjectBuilder {
}
})
.flatMap(List::stream)
- .collect(Collectors.toList());
+ .toList();
} catch (InterruptedException e) {
uncheckedThrow(e);
return null;
@@ -653,7 +652,7 @@ public class DefaultProjectBuilder implements
ProjectBuilder {
project.setExecutionRoot(interimResult.root);
project.setCollectedProjects(
-
results.stream().map(ProjectBuildingResult::getProject).collect(Collectors.toList()));
+
results.stream().map(ProjectBuildingResult::getProject).toList());
DependencyResolutionResult resolutionResult = null;
if (request.isResolveDependencies()) {
resolutionResult = resolveDependencies(project);
@@ -957,7 +956,7 @@ public class DefaultProjectBuilder implements
ProjectBuilder {
}
private List<String> getProfileIds(List<org.apache.maven.model.Profile>
profiles) {
- return
profiles.stream().map(org.apache.maven.model.Profile::getId).collect(Collectors.toList());
+ return
profiles.stream().map(org.apache.maven.model.Profile::getId).toList();
}
private static ModelSource createStubModelSource(Artifact artifact) {
diff --git
a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
index 656219802d..ecb636e7a7 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
@@ -222,14 +222,14 @@ public final class SettingsUtilsV4 {
if (repos != null) {
profile.repositories(repos.stream()
.map(SettingsUtilsV4::convertFromSettingsRepository)
- .collect(Collectors.toList()));
+ .toList());
}
List<Repository> 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/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
index 7349b65e1c..7ad3b71097 100644
---
a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
+++
b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
@@ -20,7 +20,6 @@ package org.apache.maven.project.harness;
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.getAttributes().entrySet().stream()
.filter(a -> a.getKey().equals(qname.getName()) ||
"*".equals(qname.getName()))
- .collect(Collectors.toList());
+ .toList();
}
public NodePointer getNodePointer() {
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 25c6d44de2..b73ed17a00 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
@@ -20,7 +20,6 @@ package org.apache.maven.di.impl;
import java.lang.reflect.Type;
import java.util.*;
-import java.util.stream.Collectors;
import org.apache.maven.di.Key;
import org.junit.jupiter.api.Test;
@@ -38,7 +37,7 @@ class TypeUtilsTest {
Type type = new Key<TreeSet<String>>() {}.getType();
Set<Type> types = Types.getAllSuperTypes(type);
assertNotNull(types);
- List<String> typesStr =
types.stream().map(Type::toString).sorted().collect(Collectors.toList());
+ List<String> typesStr =
types.stream().map(Type::toString).sorted().toList();
typesStr.remove("java.util.SequencedSet<java.lang.String>");
typesStr.remove("java.util.SequencedCollection<java.lang.String>");
assertEquals(
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
index a78d2a1231..009f83dc35 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.model.Plugin;
@@ -192,7 +191,7 @@ public class BootstrapCoreExtensionManager {
return result.getArtifactResults().stream()
.filter(ArtifactResult::isResolved)
.map(ArtifactResult::getArtifact)
- .collect(Collectors.toList());
+ .toList();
} catch (PluginResolutionException e) {
throw new ExtensionResolutionException(extension, e.getCause());
} catch (InterpolationException e) {
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index bc84b81c21..a6de3304a9 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -38,7 +38,6 @@ import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
import org.apache.maven.api.VersionRange;
import org.apache.maven.api.feature.Features;
@@ -815,7 +814,7 @@ public class DefaultModelBuilder implements ModelBuilder {
List<org.apache.maven.api.model.Profile> activePomProfiles =
profileSelector.getActiveProfilesV4(interpolatedProfiles,
profileActivationContext, problems);
result.setActivePomProfiles(
- modelId,
activePomProfiles.stream().map(Profile::new).collect(Collectors.toList()));
+ modelId,
activePomProfiles.stream().map(Profile::new).toList());
modelv4 = profileInjector.injectProfiles(modelv4,
activePomProfiles, request, problems);
if (currentData == resultData) {
for (Profile activeProfile : activeExternalProfiles) {
@@ -865,7 +864,7 @@ public class DefaultModelBuilder implements ModelBuilder {
// inject external profile into current model
tmpModel.update(profileInjector.injectProfiles(
tmpModel.getDelegate(),
-
activeExternalProfiles.stream().map(Profile::getDelegate).collect(Collectors.toList()),
+
activeExternalProfiles.stream().map(Profile::getDelegate).toList(),
request,
problems));
@@ -1786,7 +1785,7 @@ public class DefaultModelBuilder implements ModelBuilder {
List<org.apache.maven.api.model.Dependency> dependencies =
importMgmt.getDependencies().stream()
.filter(candidate ->
exclusions.stream().noneMatch(exclusion -> match(exclusion, candidate)))
.map(candidate -> candidate.withExclusions(exclusions))
- .collect(Collectors.toList());
+ .toList();
importMgmt = importMgmt.withDependencies(dependencies);
}
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
index e35e6b8d08..81d5499b0f 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
@@ -20,7 +20,6 @@ package org.apache.maven.model.building;
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 @@ class FileToRawModelMerger extends MavenMerger {
Iterator<Dependency> 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 @@ class FileToRawModelMerger extends MavenMerger {
Iterator<Profile> 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 @@ class FileToRawModelMerger extends MavenMerger {
Iterator<Dependency> 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 @@ class FileToRawModelMerger extends MavenMerger {
Iterator<Dependency> 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/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
index b2d0e9a801..96e5744698 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
@@ -67,10 +66,9 @@ public class DefaultProfileSelector implements
ProfileSelector {
Collection<org.apache.maven.api.model.Profile> profiles,
ProfileActivationContext context,
ModelProblemCollector problems) {
- return
getActiveProfiles(profiles.stream().map(Profile::new).collect(Collectors.toList()),
context, problems)
- .stream()
+ return getActiveProfiles(profiles.stream().map(Profile::new).toList(),
context, problems).stream()
.map(Profile::getDelegate)
- .collect(Collectors.toList());
+ .toList();
}
@Override
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
index a87d695e5c..510e3005ae 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
@@ -20,7 +20,6 @@ package org.apache.maven.model.profile;
import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelProblemCollector;
@@ -58,9 +57,8 @@ public interface ProfileSelector {
Collection<org.apache.maven.api.model.Profile> profiles,
ProfileActivationContext context,
ModelProblemCollector problems) {
- return
getActiveProfiles(profiles.stream().map(Profile::new).collect(Collectors.toList()),
context, problems)
- .stream()
+ return getActiveProfiles(profiles.stream().map(Profile::new).toList(),
context, problems).stream()
.map(Profile::getDelegate)
- .collect(Collectors.toList());
+ .toList();
}
}
diff --git
a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
index 920e8142c6..53fe3f8dbe 100644
---
a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
+++
b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.List;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.maven.model.v4.MavenMerger;
@@ -57,12 +56,12 @@ class FileToRawModelMergerTest {
}
})
.map(Method::getName)
- .collect(Collectors.toList());
+ .toList();
List<String> overriddenMethods =
Stream.of(FileToRawModelMerger.class.getDeclaredMethods())
.map(Method::getName)
.filter(m -> m.startsWith("merge"))
- .collect(Collectors.toList());
+ .toList();
assertThat(overriddenMethods, hasItems(methodNames.toArray(new
String[0])));
}
diff --git
a/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java
b/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java
index e591122d4f..d6dbe65ab0 100644
--- a/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java
@@ -27,7 +27,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
import org.apache.maven.api.model.InputSource;
import org.openjdk.jmh.annotations.*;
@@ -53,7 +52,7 @@ public class Xpp3DomPerfTest {
Path userHome = Paths.get(System.getProperty("user.home"));
poms =
Files.walk(userHome.resolve(".m2/repository/org/apache/maven"))
.filter(p -> p.getFileName().toString().endsWith(".pom"))
- .collect(Collectors.toList());
+ .toList();
}
}
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 4c067effac..1e772be15c 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -23,7 +23,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
import org.apache.maven.plugin.Mojo;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
@@ -169,7 +168,7 @@ public class MojoDescriptor extends
ComponentDescriptor<Mojo> implements Cloneab
this.setV4Api(true);
this.setImplementation(md.getImplementation());
try {
-
this.setParameters(md.getParameters().stream().map(Parameter::new).collect(Collectors.toList()));
+
this.setParameters(md.getParameters().stream().map(Parameter::new).toList());
} catch (DuplicateParameterException e) {
throw new IllegalArgumentException(e);
}
@@ -665,7 +664,7 @@ public class MojoDescriptor extends
ComponentDescriptor<Mojo> implements Cloneab
.parameters(getParameters().stream()
.filter(p -> p.getRequirement() == null)
.map(Parameter::getParameterV4)
- .collect(Collectors.toList()))
+ .toList())
.id(getId())
.fullGoalName(getFullGoalName())
.build();
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index b806830879..5bdde46340 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -476,7 +476,7 @@ public class PluginDescriptor extends
ComponentSetDescriptor implements Cloneabl
.requiredMavenVersion(requiredMavenVersion)
.mojos(getMojos().stream()
.map(MojoDescriptor::getMojoDescriptorV4)
- .collect(Collectors.toList()))
+ .toList())
.build();
}
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
index 70ae05c7db..b222ea4f1f 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
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.model.Model;
@@ -188,7 +187,7 @@ public final class UserPropertiesArtifactRelocationSource
implements MavenArtifa
}
return new Relocation(global, s, t);
})
- .collect(Collectors.toList());
+ .toList();
LOGGER.info("Parsed {} user relocations", relocationList.size());
return new Relocations(relocationList);
}
diff --git
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
index 0be92e9369..fa735293c1 100644
---
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
+++
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java
@@ -264,7 +264,7 @@ public class XmlNodeImpl implements Serializable, XmlNode {
for (String name : names) {
List<XmlNode> dominantChildren =
dominant.getChildren().stream()
.filter(n -> n.getName().equals(name))
- .collect(Collectors.toList());
+ .toList();
if (!dominantChildren.isEmpty()) {
commonChildren.put(name, dominantChildren.iterator());
}
@@ -310,7 +310,7 @@ public class XmlNodeImpl implements Serializable, XmlNode {
Iterator<XmlNode> it =
commonChildren.computeIfAbsent(name, n1 ->
Stream.of(dominant.getChildren().stream()
.filter(n2 ->
n2.getName().equals(n1))
- .collect(Collectors.toList()))
+ .toList())
.filter(l -> !l.isEmpty())
.map(List::iterator)
.findFirst()
diff --git
a/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java
b/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java
index 973f990df2..47319ad5cf 100644
---
a/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java
+++
b/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java
@@ -28,7 +28,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.maven.api.xml.XmlNode;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -627,7 +626,7 @@ class XmlNodeImplTest {
}
private static List<XmlNode> getChildren(XmlNode node, String name) {
- return node.getChildren().stream().filter(n ->
n.getName().equals(name)).collect(Collectors.toList());
+ return node.getChildren().stream().filter(n ->
n.getName().equals(name)).toList();
}
private static XmlNode getNthChild(XmlNode node, String name, int nth) {
