Skip to content

Commit bd04034

Browse files
author
Vincent Potucek
committed
Pull #2287: Modernize codebase with Java improvements: Use modern Java collections API (toList() instead of collect(Collectors.toList()))
1 parent 3706aa1 commit bd04034

File tree

51 files changed

+80
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+80
-112
lines changed

‎compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.List;
2626
import java.util.Map;
2727
import java.util.Objects;
28-
import java.util.stream.Collectors;
2928
import java.util.stream.Stream;
3029

3130
import org.apache.maven.artifact.Artifact;
@@ -50,7 +49,7 @@ public DefaultArtifactTransformationManager(Map<String, ArtifactTransformation>
5049
this.artifactTransformations = Stream.of("release", "latest", "snapshot")
5150
.map(artifactTransformations::get)
5251
.filter(Objects::nonNull)
53-
.collect(Collectors.toList());
52+
.toList();
5453
}
5554

5655
public void transformForResolve(Artifact artifact, RepositoryRequest request)

‎compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.NoSuchElementException;
2929
import java.util.Set;
3030
import java.util.function.UnaryOperator;
31-
import java.util.stream.Collectors;
3231

3332
import org.apache.maven.RepositoryUtils;
3433
import org.apache.maven.api.Service;
@@ -226,7 +225,7 @@ private List<Artifact> resolveExtension(
226225
return result.getArtifactResults().stream()
227226
.filter(ArtifactResult::isResolved)
228227
.map(ArtifactResult::getArtifact)
229-
.collect(Collectors.toList());
228+
.toList();
230229
} catch (PluginResolutionException | InterpolatorException e) {
231230
throw new ExtensionResolutionException(extension, e);
232231
}

‎compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.util.Iterator;
2222
import java.util.Map;
23-
import java.util.stream.Collectors;
2423

2524
import org.apache.maven.api.model.Build;
2625
import org.apache.maven.api.model.BuildBase;
@@ -92,7 +91,7 @@ protected void mergeDependencyManagement_Dependencies(
9291
Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
9392
builder.dependencies(target.getDependencies().stream()
9493
.map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context))
95-
.collect(Collectors.toList()));
94+
.toList());
9695
}
9796

9897
@Override
@@ -135,7 +134,7 @@ protected void mergeModel_Profiles(
135134
Iterator<Profile> sourceIterator = source.getProfiles().iterator();
136135
builder.profiles(target.getProfiles().stream()
137136
.map(d -> mergeProfile(d, sourceIterator.next(), sourceDominant, context))
138-
.collect(Collectors.toList()));
137+
.toList());
139138
}
140139

141140
@Override
@@ -148,7 +147,7 @@ protected void mergeModelBase_Dependencies(
148147
Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
149148
builder.dependencies(target.getDependencies().stream()
150149
.map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context))
151-
.collect(Collectors.toList()));
150+
.toList());
152151
}
153152

154153
@Override
@@ -177,7 +176,7 @@ protected void mergePlugin_Dependencies(
177176
Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
178177
builder.dependencies(target.getDependencies().stream()
179178
.map(d -> mergeDependency(d, sourceIterator.next(), sourceDominant, context))
180-
.collect(Collectors.toList()));
179+
.toList());
181180
}
182181

183182
@Override

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.lang.reflect.ParameterizedType;
2323
import java.lang.reflect.Type;
2424
import java.util.List;
25-
import java.util.stream.Collectors;
2625
import java.util.stream.Stream;
2726

2827
import org.apache.maven.model.v4.MavenMerger;
@@ -63,7 +62,7 @@ void testOverriddenMergeMethods() {
6362
List<String> overriddenMethods = Stream.of(FileToRawModelMerger.class.getDeclaredMethods())
6463
.map(Method::getName)
6564
.filter(m -> m.startsWith("merge"))
66-
.collect(Collectors.toList());
65+
.toList();
6766

6867
assertThat(overriddenMethods, hasItems(methodNames.toArray(new String[0])));
6968
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.List;
3030
import java.util.Map;
3131
import java.util.Set;
32-
import java.util.stream.Collectors;
3332

3433
import org.apache.maven.api.model.Model;
3534
import org.apache.maven.model.v4.MavenStaxReader;
@@ -264,7 +263,7 @@ public void printAnalysis() {
264263
.map(e -> new ValueFrequency(e.getKey(), e.getValue()))
265264
.sorted((a, b) -> Long.compare(b.frequency, a.frequency))
266265
.limit(5)
267-
.collect(Collectors.toList());
266+
.toList();
268267

269268
return new GroupAnalysis(
270269
groupName, paths, totalUnique, totalOccurrences, totalMemory, totalSavings, topValues);

‎compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.nio.file.Paths;
2828
import java.util.List;
2929
import java.util.concurrent.TimeUnit;
30-
import java.util.stream.Collectors;
3130

3231
import org.apache.maven.api.model.InputSource;
3332
import org.openjdk.jmh.annotations.Benchmark;
@@ -62,7 +61,7 @@ public void setUp() throws IOException {
6261
Path userHome = Paths.get(System.getProperty("user.home"));
6362
poms = Files.walk(userHome.resolve(".m2/repository/org/apache/maven"))
6463
.filter(p -> p.getFileName().toString().endsWith(".pom"))
65-
.collect(Collectors.toList());
64+
.toList();
6665
}
6766
}
6867

‎compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.List;
2424
import java.util.Map;
2525
import java.util.Objects;
26-
import java.util.stream.Collectors;
2726

2827
import org.apache.maven.plugin.Mojo;
2928
import org.codehaus.plexus.component.repository.ComponentDescriptor;
@@ -168,7 +167,7 @@ public MojoDescriptor(PluginDescriptor pd, org.apache.maven.api.plugin.descripto
168167
this.setThreadSafe(true);
169168
this.setImplementation(md.getImplementation());
170169
try {
171-
this.setParameters(md.getParameters().stream().map(Parameter::new).collect(Collectors.toList()));
170+
this.setParameters(md.getParameters().stream().map(Parameter::new).toList());
172171
} catch (DuplicateParameterException e) {
173172
throw new IllegalArgumentException(e);
174173
}
@@ -659,7 +658,7 @@ public org.apache.maven.api.plugin.descriptor.MojoDescriptor getMojoDescriptorV4
659658
.parameters(getParameters().stream()
660659
.filter(p -> p.getRequirement() == null)
661660
.map(Parameter::getParameterV4)
662-
.collect(Collectors.toList()))
661+
.toList())
663662
.id(getId())
664663
.fullGoalName(getFullGoalName())
665664
.build();

‎compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.List;
2626
import java.util.Objects;
2727
import java.util.function.Predicate;
28-
import java.util.stream.Collectors;
2928
import java.util.stream.Stream;
3029

3130
import org.apache.maven.model.Model;
@@ -189,7 +188,7 @@ private Relocations parseRelocations(RepositorySystemSession session) {
189188
}
190189
return new Relocation(global, s, t);
191190
})
192-
.collect(Collectors.toList());
191+
.toList();
193192
LOGGER.info("Parsed {} user relocations", relocationList.size());
194193
return new Relocations(relocationList);
195194
}

‎impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.NoSuchElementException;
2626
import java.util.Set;
2727
import java.util.function.UnaryOperator;
28-
import java.util.stream.Collectors;
2928

3029
import org.apache.maven.RepositoryUtils;
3130
import org.apache.maven.api.Service;
@@ -231,7 +230,7 @@ private List<Artifact> resolveExtension(
231230
return result.getArtifactResults().stream()
232231
.filter(ArtifactResult::isResolved)
233232
.map(ArtifactResult::getArtifact)
234-
.collect(Collectors.toList());
233+
.toList();
235234
} catch (PluginResolutionException | InterpolatorException e) {
236235
throw new ExtensionResolutionException(extension, e);
237236
}

‎impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Map;
2828
import java.util.Objects;
2929
import java.util.Optional;
30-
import java.util.stream.Collectors;
3130

3231
import org.apache.maven.artifact.handler.ArtifactHandler;
3332
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@@ -171,14 +170,14 @@ public static Dependency toDependency(
171170

172171
List<Exclusion> excl = Optional.ofNullable(exclusions).orElse(Collections.emptyList()).stream()
173172
.map(RepositoryUtils::toExclusion)
174-
.collect(Collectors.toList());
173+
.toList();
175174
return new Dependency(result, artifact.getScope(), artifact.isOptional(), excl);
176175
}
177176

178177
public static List<RemoteRepository> toRepos(List<ArtifactRepository> repos) {
179178
return Optional.ofNullable(repos).orElse(Collections.emptyList()).stream()
180179
.map(RepositoryUtils::toRepo)
181-
.collect(Collectors.toList());
180+
.toList();
182181
}
183182

184183
public static RemoteRepository toRepo(ArtifactRepository repo) {
@@ -294,7 +293,7 @@ public static Dependency toDependency(
294293

295294
List<Exclusion> exclusions = dependency.getExclusions().stream()
296295
.map(RepositoryUtils::toExclusion)
297-
.collect(Collectors.toList());
296+
.toList();
298297

299298
return new Dependency(
300299
artifact,
@@ -326,7 +325,7 @@ public ArtifactType get(String stereotypeId) {
326325
}
327326

328327
public static Collection<Artifact> toArtifacts(Collection<org.apache.maven.artifact.Artifact> artifactsToConvert) {
329-
return artifactsToConvert.stream().map(RepositoryUtils::toArtifact).collect(Collectors.toList());
328+
return artifactsToConvert.stream().map(RepositoryUtils::toArtifact).toList();
330329
}
331330

332331
public static WorkspaceRepository getWorkspace(RepositorySystemSession session) {

‎impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.nio.file.PathMatcher;
2525
import java.util.List;
2626
import java.util.function.Predicate;
27-
import java.util.stream.Collectors;
2827

2928
import org.apache.maven.artifact.Artifact;
3029
import org.apache.maven.model.Exclusion;
@@ -40,7 +39,7 @@ public class ExclusionArtifactFilter implements ArtifactFilter {
4039
public ExclusionArtifactFilter(List<Exclusion> exclusions) {
4140
this.exclusions = exclusions;
4241
this.predicates =
43-
exclusions.stream().map(ExclusionArtifactFilter::toPredicate).collect(Collectors.toList());
42+
exclusions.stream().map(ExclusionArtifactFilter::toPredicate).toList();
4443
}
4544

4645
@Override

‎impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import java.util.List;
2525
import java.util.Optional;
26-
import java.util.stream.Collectors;
2726

2827
import org.apache.maven.project.MavenProject;
2928
import org.slf4j.Logger;
@@ -56,7 +55,7 @@ public Optional<BuildResumptionData> determineBuildResumptionData(final MavenExe
5655
.filter(project -> result.getBuildSummary(project) == null
5756
|| result.getBuildSummary(project) instanceof BuildFailure)
5857
.map(project -> project.getGroupId() + ":" + project.getArtifactId())
59-
.collect(Collectors.toList());
58+
.toList();
6059

6160
if (remainingProjects.isEmpty()) {
6261
LOGGER.info("No remaining projects found, resuming the build would not make sense.");

‎impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Properties;
2929
import java.util.concurrent.ConcurrentHashMap;
3030
import java.util.concurrent.ConcurrentMap;
31-
import java.util.stream.Collectors;
3231

3332
import org.apache.maven.api.Session;
3433
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -423,13 +422,13 @@ private static Settings adaptSettings(MavenExecutionRequest request) {
423422
.localRepository(localRepo != null ? localRepo.getAbsolutePath() : null)
424423
.interactiveMode(request.isInteractiveMode())
425424
.offline(request.isOffline())
426-
.proxies(request.getProxies().stream().map(Proxy::getDelegate).collect(Collectors.toList()))
427-
.servers(request.getServers().stream().map(Server::getDelegate).collect(Collectors.toList()))
428-
.mirrors(request.getMirrors().stream().map(Mirror::getDelegate).collect(Collectors.toList()))
425+
.proxies(request.getProxies().stream().map(Proxy::getDelegate).toList())
426+
.servers(request.getServers().stream().map(Server::getDelegate).toList())
427+
.mirrors(request.getMirrors().stream().map(Mirror::getDelegate).toList())
429428
.profiles(request.getProfiles().stream()
430429
.map(Profile::getDelegate)
431430
.map(SettingsUtilsV4::convertToSettingsProfile)
432-
.collect(Collectors.toList()))
431+
.toList())
433432
.activeProfiles(request.getActiveProfiles())
434433
.pluginGroups(request.getPluginGroups())
435434
.build());

‎impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Map;
2929
import java.util.Objects;
3030
import java.util.Set;
31-
import java.util.stream.Collectors;
3231

3332
import org.apache.maven.execution.ProjectDependencyGraph;
3433
import org.apache.maven.project.CycleDetectedException;
@@ -153,7 +152,7 @@ private List<MavenProject> getSortedProjects(Set<String> projectIds) {
153152
return projectIds.stream()
154153
.map(projects::get)
155154
.sorted(Comparator.comparingInt(order::get))
156-
.collect(Collectors.toList());
155+
.toList();
157156
}
158157

159158
@Override

‎impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public SessionBuilder newRepositorySessionBuilder(MavenExecutionRequest request)
231231
XmlNode dom = server.getDelegate().getConfiguration();
232232
List<XmlNode> children = dom.children().stream()
233233
.filter(c -> !"wagonProvider".equals(c.name()))
234-
.collect(Collectors.toList());
234+
.toList();
235235
dom = XmlNode.newInstance(dom.name(), children);
236236
PlexusConfiguration config = XmlPlexusConfiguration.toPlexusConfiguration(dom);
237237
configProps.put("aether.transport.wagon.config." + server.getId(), config);

‎impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.List;
2323
import java.util.Objects;
2424
import java.util.function.Function;
25-
import java.util.stream.Collectors;
2625

2726
class CoreUtils {
2827

@@ -37,6 +36,6 @@ public static <T> T cast(Class<T> clazz, Object o, String name) {
3736
}
3837

3938
public static <U, V> List<V> map(Collection<U> list, Function<U, V> mapper) {
40-
return list.stream().map(mapper).filter(Objects::nonNull).collect(Collectors.toList());
39+
return list.stream().map(mapper).filter(Objects::nonNull).toList();
4140
}
4241
}

‎impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Objects;
3535
import java.util.Optional;
3636
import java.util.Set;
37-
import java.util.stream.Collectors;
3837
import java.util.stream.Stream;
3938

4039
import org.apache.maven.api.DependencyScope;
@@ -143,7 +142,7 @@ public List<String> computePhases(Lifecycle lifecycle) {
143142
List<String> allPhases = graph.visitAll();
144143
Collections.reverse(allPhases);
145144
List<String> computed =
146-
allPhases.stream().filter(s -> !s.startsWith("$")).collect(Collectors.toList());
145+
allPhases.stream().filter(s -> !s.startsWith("$")).toList();
147146
return computed;
148147
}
149148

@@ -211,7 +210,7 @@ public Collection<Lifecycle> provides() {
211210
&& !Lifecycle.DEFAULT.equals(id)
212211
&& !Lifecycle.SITE.equals(id))
213212
.map(id -> wrap(all.get(id)))
214-
.collect(Collectors.toList());
213+
.toList();
215214
} catch (ComponentLookupException e) {
216215
throw new LookupException(e);
217216
}

‎impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private static List<Profile> prune(List<Profile> profiles) {
288288
return builder.build(null).build();
289289
})
290290
.filter(p -> !isEmpty(p))
291-
.collect(Collectors.toList());
291+
.toList();
292292
}
293293

294294
private static boolean isEmpty(Profile profile) {
@@ -324,6 +324,6 @@ private static <T extends ModelBase.Builder> T prune(T builder, ModelBase model)
324324
private static List<Repository> pruneRepositories(List<Repository> repositories) {
325325
return repositories.stream()
326326
.filter(r -> !org.apache.maven.api.Repository.CENTRAL_ID.equals(r.getId()))
327-
.collect(Collectors.toList());
327+
.toList();
328328
}
329329
}

‎impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public List<Lifecycle> getLifeCycles() {
161161
return lifecyclesMap.values().stream()
162162
.peek(l -> Objects.requireNonNull(l.getId(), "A lifecycle must have an id."))
163163
.sorted(Comparator.comparing(Lifecycle::getId, comparator))
164-
.collect(Collectors.toList());
164+
.toList();
165165
}
166166

167167
private Map<String, Lifecycle> lookupLifecycles() {

0 commit comments

Comments
 (0)