You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2024/03/07 16:49:26 UTC
(maven) branch code-enhancement-jdk17 created (now dbd5893b1f)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch code-enhancement-jdk17
in repository https://gitbox.apache.org/repos/asf/maven.git
at dbd5893b1f Improved.
This branch includes the following new commits:
new df8c8d0e14 Enhancements JDK17
new 480c5c1175 Fixed.
new dbd5893b1f Improved.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven) 03/03: Improved.
Posted by kh...@apache.org.
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 <kh...@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
}
(maven) 01/03: Enhancements JDK17
Posted by kh...@apache.org.
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 df8c8d0e148cf6b7fb38530bcf06619d837d3e58
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Mar 7 01:30:21 2024 +0100
Enhancements JDK17
---
.../org/apache/maven/api/feature/Features.java | 4 ++--
api/maven-api-model/src/main/mdo/maven.mdo | 3 +--
.../src/main/mdo/toolchains.mdo | 3 +--
.../org/apache/maven/artifact/ArtifactUtils.java | 25 +++++++++++-----------
.../manager/DefaultArtifactHandlerManager.java | 5 ++---
.../manager/LegacyArtifactHandlerManager.java | 5 ++---
.../resolver/filter/AndArtifactFilter.java | 4 +---
.../filter/CumulativeScopeArtifactFilter.java | 4 +---
.../resolver/filter/ExclusionSetFilter.java | 4 +---
.../resolver/filter/IncludesArtifactFilter.java | 2 +-
.../resolver/filter/ScopeArtifactFilter.java | 4 +---
.../apache/maven/bridge/MavenRepositorySystem.java | 5 ++---
.../maven/classrealm/DefaultClassRealmManager.java | 4 ++--
.../internal/DefaultBeanConfigurator.java | 12 +++++------
.../internal/EnhancedConfigurationConverter.java | 8 +++----
.../maven/execution/BuildResumptionData.java | 21 +++---------------
.../execution/DefaultBuildResumptionAnalyzer.java | 3 +--
.../DefaultBuildResumptionDataRepository.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 2 +-
.../apache/maven/execution/ProjectActivation.java | 21 +++++-------------
.../scope/internal/MojoExecutionScope.java | 4 ++--
.../maven/extension/internal/CoreExports.java | 3 +--
.../maven/graph/DefaultProjectDependencyGraph.java | 3 +--
.../org/apache/maven/graph/ProjectSelector.java | 6 ++++--
.../DefaultRepositorySystemSessionFactory.java | 2 +-
.../internal/aether/LoggingRepositoryListener.java | 4 ++--
.../aether/ReverseTreeRepositoryListener.java | 4 ++--
.../maven/internal/aether/TypeRegistryAdapter.java | 4 ++--
.../apache/maven/internal/impl/AbstractNode.java | 4 ++--
.../maven/internal/impl/AbstractSession.java | 16 +++++++-------
.../maven/internal/impl/DefaultArtifact.java | 2 +-
.../internal/impl/DefaultArtifactManager.java | 4 ++--
.../DefaultBuildResumptionAnalyzerTest.java | 8 +++----
.../src/main/java/org/apache/maven/di/Key.java | 4 ++--
.../org/apache/maven/di/impl/InjectorImplTest.java | 12 +++++------
src/mdo/java/WrapperProperties.java | 4 ++--
36 files changed, 92 insertions(+), 133 deletions(-)
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java
index 2f49928e62..71c2abc7bb 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java
@@ -69,8 +69,8 @@ public final class Features {
}
private static boolean doGet(Object val, boolean def) {
- if (val instanceof Boolean) {
- return (Boolean) val;
+ if (val instanceof Boolean value) {
+ return value;
} else if (val != null) {
return Boolean.parseBoolean(val.toString());
} else {
diff --git a/api/maven-api-model/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo
index 319341d31d..7594f7618b 100644
--- a/api/maven-api-model/src/main/mdo/maven.mdo
+++ b/api/maven-api-model/src/main/mdo/maven.mdo
@@ -2465,8 +2465,7 @@
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object other) {
- if (other instanceof Plugin) {
- Plugin otherPlugin = (Plugin) other;
+ if (other instanceof Plugin otherPlugin) {
return getKey().equals(otherPlugin.getKey());
}
return false;
diff --git a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo
index 6a9bd87860..a2c8abcb1e 100644
--- a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo
+++ b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo
@@ -186,10 +186,9 @@
public boolean equals(Object other) {
if (this == other) {
return true;
- } else if (!(other instanceof ToolchainModel)) {
+ } else if (!(other instanceof ToolchainModel that)) {
return false;
} else {
- ToolchainModel that = (ToolchainModel) other;
return java.util.Objects.equals(this.getType(), that.getType())
&& java.util.Objects.equals(this.getProvides(), that.getProvides());
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index 8ea6710a56..a563b2972e 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -33,19 +33,20 @@ import org.apache.maven.artifact.versioning.VersionRange;
public final class ArtifactUtils {
public static boolean isSnapshot(String version) {
- if (version != null) {
- if (version.regionMatches(
- true,
- version.length() - Artifact.SNAPSHOT_VERSION.length(),
- Artifact.SNAPSHOT_VERSION,
- 0,
- Artifact.SNAPSHOT_VERSION.length())) {
- return true;
- } else {
- return Artifact.VERSION_FILE_PATTERN.matcher(version).matches();
- }
+ if (version == null) {
+ return false;
+ }
+
+ if (version.regionMatches(
+ true,
+ version.length() - Artifact.SNAPSHOT_VERSION.length(),
+ Artifact.SNAPSHOT_VERSION,
+ 0,
+ Artifact.SNAPSHOT_VERSION.length())) {
+ return true;
+ } else {
+ return Artifact.VERSION_FILE_PATTERN.matcher(version).matches();
}
- return false;
}
public static String toSnapshotVersion(String version) {
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
index 2ad0541914..1dd2f50b0d 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
@@ -53,9 +53,8 @@ public class DefaultArtifactHandlerManager extends AbstractEventSpy implements A
@Override
public void onEvent(Object event) {
- if (event instanceof ExecutionEvent) {
- ExecutionEvent executionEvent = (ExecutionEvent) event;
- if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) {
+ if (event instanceof ExecutionEvent executionEvent) {
+ if (requireNonNull(executionEvent.getType()) == ExecutionEvent.Type.SessionEnded) {
allHandlers.clear();
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java
index 46e480fae5..6b85a2c626 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java
@@ -48,8 +48,7 @@ public class LegacyArtifactHandlerManager extends AbstractEventSpy {
@Override
public void onEvent(Object event) {
- if (event instanceof ExecutionEvent) {
- ExecutionEvent executionEvent = (ExecutionEvent) event;
+ if (event instanceof ExecutionEvent executionEvent) {
if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) {
allHandlers.clear();
}
@@ -58,7 +57,7 @@ public class LegacyArtifactHandlerManager extends AbstractEventSpy {
public ArtifactHandler getArtifactHandler(String type) {
requireNonNull(type, "null type");
- ArtifactHandler handler = allHandlers.get(type);
+ var handler = allHandlers.get(type);
if (handler == null) {
handler = artifactHandlers.get(type);
if (handler == null) {
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
index 13928c4b59..8f5bed511d 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
@@ -73,12 +73,10 @@ public class AndArtifactFilter implements ArtifactFilter {
return true;
}
- if (!(obj instanceof AndArtifactFilter)) {
+ if (!(obj instanceof AndArtifactFilter other)) {
return false;
}
- AndArtifactFilter other = (AndArtifactFilter) obj;
-
return filters.equals(other.filters);
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
index 5f7235b1b4..e7cf7eefa9 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
@@ -92,12 +92,10 @@ public class CumulativeScopeArtifactFilter extends AbstractScopeArtifactFilter {
return true;
}
- if (!(obj instanceof CumulativeScopeArtifactFilter)) {
+ if (!(obj instanceof CumulativeScopeArtifactFilter that)) {
return false;
}
- CumulativeScopeArtifactFilter that = (CumulativeScopeArtifactFilter) obj;
-
return scopes.equals(that.scopes);
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index 7e57e940b9..55cd616724 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -62,12 +62,10 @@ public class ExclusionSetFilter implements ArtifactFilter {
return true;
}
- if (!(obj instanceof ExclusionSetFilter)) {
+ if (!(obj instanceof ExclusionSetFilter other)) {
return false;
}
- ExclusionSetFilter other = (ExclusionSetFilter) obj;
-
return excludes.equals(other.excludes);
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
index 8ee8ce48d2..a243b79358 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
@@ -41,7 +41,7 @@ public class IncludesArtifactFilter implements ArtifactFilter {
String id = artifact.getGroupId() + ":" + artifact.getArtifactId();
boolean matched = false;
- for (Iterator<String> i = patterns.iterator(); i.hasNext() & !matched; ) {
+ for (Iterator<String> i = patterns.iterator(); i.hasNext() && !matched; ) {
// TODO what about wildcards? Just specifying groups? versions?
if (id.equals(i.next())) {
matched = true;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
index 28ca6e7efe..c5ac90728e 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
@@ -53,12 +53,10 @@ public class ScopeArtifactFilter extends AbstractScopeArtifactFilter {
return true;
}
- if (!(obj instanceof ScopeArtifactFilter)) {
+ if (!(obj instanceof ScopeArtifactFilter other)) {
return false;
}
- ScopeArtifactFilter other = (ScopeArtifactFilter) obj;
-
return Objects.equals(scope, other.scope);
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 1810c50a90..ab4e48f14f 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -410,9 +410,8 @@ public class MavenRepositorySystem {
}
ArtifactRepository repository;
- if (repositoryLayout instanceof ArtifactRepositoryLayout2) {
- repository = ((ArtifactRepositoryLayout2) repositoryLayout)
- .newMavenArtifactRepository(id, url, snapshots, releases);
+ if (repositoryLayout instanceof ArtifactRepositoryLayout2 repositoryLayout2) {
+ repository = repositoryLayout2.newMavenArtifactRepository(id, url, snapshots, releases);
} else {
repository = new MavenArtifactRepository(id, url, repositoryLayout, snapshots, releases);
}
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 14bec0c1c0..91e0ec0fb3 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -330,8 +330,8 @@ public class DefaultClassRealmManager implements ClassRealmManager {
}
private static Object getId(ClassLoader classLoader) {
- if (classLoader instanceof ClassRealm) {
- return ((ClassRealm) classLoader).getId();
+ if (classLoader instanceof ClassRealm classRealm) {
+ return classRealm.getId();
}
return classLoader;
}
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index 42e9848cd6..52f4a55bc1 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -73,10 +73,10 @@ public class DefaultBeanConfigurator implements BeanConfigurator {
}
PlexusConfiguration plexusConfig;
- if (configuration instanceof PlexusConfiguration) {
- plexusConfig = (PlexusConfiguration) configuration;
- } else if (configuration instanceof Xpp3Dom) {
- plexusConfig = new XmlPlexusConfiguration((Xpp3Dom) configuration);
+ if (configuration instanceof PlexusConfiguration config) {
+ plexusConfig = config;
+ } else if (configuration instanceof Xpp3Dom config) {
+ plexusConfig = new XmlPlexusConfiguration(config);
} else {
throw new BeanConfigurationException("unsupported bean configuration source ("
+ configuration.getClass().getName() + ")");
@@ -196,8 +196,8 @@ public class DefaultBeanConfigurator implements BeanConfigurator {
final Object result =
super.fromConfiguration(lookup, configuration, type, enclosingType, loader, evaluator, listener);
- return result instanceof Path
- ? evaluator.alignToBaseDirectory(((Path) result).toFile()).toPath()
+ return result instanceof Path newpath
+ ? evaluator.alignToBaseDirectory((newpath).toFile()).toPath()
: result;
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java
index 3207e7b120..a54af73223 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java
@@ -40,8 +40,8 @@ class EnhancedConfigurationConverter extends ObjectWithFieldsConverter {
try {
Object result = null;
if (null != value && !value.isEmpty()) {
- if (evaluator instanceof TypeAwareExpressionEvaluator) {
- result = ((TypeAwareExpressionEvaluator) evaluator).evaluate(value, type);
+ if (evaluator instanceof TypeAwareExpressionEvaluator eval) {
+ result = eval.evaluate(value, type);
} else {
result = evaluator.evaluate(value);
}
@@ -49,8 +49,8 @@ class EnhancedConfigurationConverter extends ObjectWithFieldsConverter {
if (null == result && configuration.getChildCount() == 0) {
value = configuration.getAttribute("default-value");
if (null != value && !value.isEmpty()) {
- if (evaluator instanceof TypeAwareExpressionEvaluator) {
- result = ((TypeAwareExpressionEvaluator) evaluator).evaluate(value, type);
+ if (evaluator instanceof TypeAwareExpressionEvaluator eval) {
+ result = eval.evaluate(value, type);
} else {
result = evaluator.evaluate(value);
}
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java
index d46adf2a7d..202df472a9 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java
@@ -22,22 +22,7 @@ import java.util.List;
/**
* This class holds the information required to enable resuming a Maven build with {@code --resume}.
+ *
+ * @param remainingProjects The list of projects that remain to be built.
*/
-public class BuildResumptionData {
- /**
- * The list of projects that remain to be built.
- */
- private final List<String> remainingProjects;
-
- public BuildResumptionData(final List<String> remainingProjects) {
- this.remainingProjects = remainingProjects;
- }
-
- /**
- * Returns the projects that still need to be built when resuming.
- * @return A list containing the group and artifact id of the projects.
- */
- public List<String> getRemainingProjects() {
- return this.remainingProjects;
- }
-}
+public record BuildResumptionData(List<String> remainingProjects) {}
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
index 0bc99bdb78..47a87e1cd1 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
@@ -23,7 +23,6 @@ import javax.inject.Singleton;
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 class DefaultBuildResumptionAnalyzer implements BuildResumptionAnalyzer {
.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/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
index 8a4ded84fb..3cab13d12f 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
@@ -66,7 +66,7 @@ public class DefaultBuildResumptionDataRepository implements BuildResumptionData
private Properties convertToProperties(final BuildResumptionData buildResumptionData) {
Properties properties = new Properties();
- String value = String.join(PROPERTY_DELIMITER, buildResumptionData.getRemainingProjects());
+ String value = String.join(PROPERTY_DELIMITER, buildResumptionData.remainingProjects());
properties.setProperty(REMAINING_PROJECTS, value);
return properties;
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 ac6c1eddbc..f9f68d379a 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
@@ -96,7 +96,7 @@ public class MavenSession implements Cloneable {
MavenProject first = projects.get(0);
this.currentProject = ThreadLocal.withInitial(() -> first);
this.topLevelProject = projects.stream()
- .filter(project -> project.isExecutionRoot())
+ .filter(MavenProject::isExecutionRoot)
.findFirst()
.orElse(first);
} else {
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 f5f91a4e43..6cc400e7df 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
@@ -33,22 +33,11 @@ import static java.util.stream.Collectors.toSet;
* build if those projects do not exist.
*/
public class ProjectActivation {
- private static class ProjectActivationSettings {
- /**
- * The selector of a project. This can be the project directory, [groupId]:[artifactId] or :[artifactId].
- */
- final String selector;
-
- /**
- * This describes how/when to active or deactivate the project.
- */
- final ActivationSettings activationSettings;
-
- ProjectActivationSettings(String selector, ActivationSettings activationSettings) {
- this.selector = selector;
- this.activationSettings = activationSettings;
- }
- }
+ /**
+ * @param selector The selector of a project. This can be the project directory, [groupId]:[artifactId] or :[artifactId].
+ * @param activationSettings This describes how/when to active or deactivate the project.
+ */
+ private record ProjectActivationSettings(String selector, ActivationSettings activationSettings) {}
/**
* List of activated and deactivated projects.
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
index b650912f25..75f755c369 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
@@ -141,8 +141,8 @@ public class MojoExecutionScope implements Scope, MojoExecutionListener {
// deduplicate instances to avoid redundant beforeXXX/afterXXX callbacks
IdentityHashMap<WeakMojoExecutionListener, Object> listeners = new IdentityHashMap<>();
for (Object provided : getScopeState().provided.values()) {
- if (provided instanceof WeakMojoExecutionListener) {
- listeners.put((WeakMojoExecutionListener) provided, null);
+ if (provided instanceof WeakMojoExecutionListener weakMojoExecutionListener) {
+ listeners.put(weakMojoExecutionListener, null);
}
}
return listeners.keySet();
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
index aec37e7041..4d78b80bbf 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
@@ -19,7 +19,6 @@
package org.apache.maven.extension.internal;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -45,7 +44,7 @@ public class CoreExports {
}
public CoreExports(ClassRealm realm, Set<String> exportedArtifacts, Set<String> exportedPackages) {
- this.artifacts = Collections.unmodifiableSet(new HashSet<>(exportedArtifacts));
+ this.artifacts = Set.copyOf(exportedArtifacts);
this.packages = exportedPackages.stream()
.collect(collectingAndThen(toMap(identity(), v -> realm), Collections::unmodifiableMap));
}
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index d49670b438..323787e7d2 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -28,7 +28,6 @@ import java.util.List;
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 @@ public class DefaultProjectDependencyGraph implements ProjectDependencyGraph {
return projectIds.stream()
.map(projects::get)
.sorted(Comparator.comparingInt(order::get))
- .collect(Collectors.toList());
+ .toList();
}
@Override
diff --git a/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java b/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
index f2ee85f738..0fc136766d 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
@@ -47,7 +47,7 @@ public final class ProjectSelector {
for (String selector : projectSelectors) {
Optional<MavenProject> optSelectedProject =
findOptionalProjectBySelector(projects, baseDirectory, selector);
- if (!optSelectedProject.isPresent()) {
+ if (optSelectedProject.isEmpty()) {
String message = "Could not find the selected project in the reactor: " + selector;
throw new MavenExecutionException(message, request.getPom());
}
@@ -101,7 +101,9 @@ public final class ProjectSelector {
}
File getBaseDirectoryFromRequest(MavenExecutionRequest request) {
- return request.getBaseDirectory() != null ? new File(request.getBaseDirectory()) : null;
+ return request.getTopDirectory() != null
+ ? new File(request.getTopDirectory().toString())
+ : null;
}
boolean isMatchingProject(MavenProject project, String selector, File reactorDirectory) {
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 d587541eec..adb3f950bb 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
@@ -471,7 +471,7 @@ class DefaultRepositorySystemSessionFactory implements RepositorySystemSessionFa
if (filterExpression != null) {
List<String> expressions = Arrays.stream(filterExpression.split(";"))
.filter(s -> s != null && !s.trim().isEmpty())
- .collect(Collectors.toList());
+ .toList();
for (String expression : expressions) {
if ("h".equals(expression)) {
filters.add(new HighestVersionFilter());
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
index fe9c074b33..acb1cc0c70 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
@@ -64,8 +64,8 @@ class LoggingRepositoryListener extends AbstractRepositoryListener {
Exception exception = event.getException();
Object metadata;
- if (event.getMetadata().getFile() != null) {
- metadata = event.getMetadata().getFile();
+ if (event.getMetadata().getPath() != null) {
+ metadata = event.getMetadata().getPath();
} else {
metadata = event.getMetadata();
}
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
index 14f7378703..e5b5b43512 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
@@ -209,8 +209,8 @@ class ReverseTreeRepositoryListener extends AbstractRepositoryListener {
static CollectStepData lookupCollectStepData(RequestTrace trace) {
CollectStepData collectStepTrace = null;
while (trace != null) {
- if (trace.getData() instanceof CollectStepData) {
- collectStepTrace = (CollectStepData) trace.getData();
+ if (trace.getData() instanceof CollectStepData collectStepData) {
+ collectStepTrace = collectStepData;
break;
}
trace = trace.getParent();
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java b/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java
index 2f10720eb9..ac2127c2f2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java
@@ -37,8 +37,8 @@ class TypeRegistryAdapter implements ArtifactTypeRegistry {
@Override
public ArtifactType get(String typeId) {
Type type = typeRegistry.require(typeId);
- if (type instanceof ArtifactType) {
- return (ArtifactType) type;
+ if (type instanceof ArtifactType artifactType) {
+ return artifactType;
}
if (type != null) {
return new DefaultType(
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 f3e8987f17..9b3cfeb86b 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
@@ -48,8 +48,8 @@ public abstract class AbstractNode implements Node {
@Override
public Node filter(Predicate<Node> filter) {
List<Node> children =
- getChildren().stream().filter(filter).map(n -> n.filter(filter)).collect(Collectors.toList());
- return new WrapperNode(this, Collections.unmodifiableList(children));
+ getChildren().stream().filter(filter).map(n -> n.filter(filter)).toList();
+ return new WrapperNode(this, children);
}
@Override
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 b85b5b816f..ac7a9c96d3 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
@@ -98,8 +98,8 @@ public abstract class AbstractSession implements InternalSession {
@Override
public org.eclipse.aether.repository.RemoteRepository toRepository(RemoteRepository repository) {
- if (repository instanceof DefaultRemoteRepository) {
- return ((DefaultRemoteRepository) repository).getRepository();
+ if (repository instanceof DefaultRemoteRepository defaultRemoteRepository) {
+ return defaultRemoteRepository.getRepository();
} else {
// TODO
throw new UnsupportedOperationException("Not implemented yet");
@@ -108,8 +108,8 @@ public abstract class AbstractSession implements InternalSession {
@Override
public org.eclipse.aether.repository.LocalRepository toRepository(LocalRepository repository) {
- if (repository instanceof DefaultLocalRepository) {
- return ((DefaultLocalRepository) repository).getRepository();
+ if (repository instanceof DefaultLocalRepository defaultLocalRepository) {
+ return defaultLocalRepository.getRepository();
} else {
// TODO
throw new UnsupportedOperationException("Not implemented yet");
@@ -144,8 +144,8 @@ public abstract class AbstractSession implements InternalSession {
.getPath(artifact)
.map(Path::toFile)
.orElse(null);
- if (artifact instanceof DefaultArtifact) {
- org.eclipse.aether.artifact.Artifact a = ((DefaultArtifact) artifact).getArtifact();
+ if (artifact instanceof DefaultArtifact defaultArtifact) {
+ org.eclipse.aether.artifact.Artifact a = defaultArtifact.getArtifact();
if (Objects.equals(file, a.getFile())) {
return a;
}
@@ -162,8 +162,8 @@ public abstract class AbstractSession implements InternalSession {
@Override
public org.eclipse.aether.artifact.Artifact toArtifact(ArtifactCoordinate coord) {
- if (coord instanceof DefaultArtifactCoordinate) {
- return ((DefaultArtifactCoordinate) coord).getCoordinate();
+ if (coord instanceof DefaultArtifactCoordinate defaultArtifactCoordinate) {
+ return defaultArtifactCoordinate.getCoordinate();
}
return new org.eclipse.aether.artifact.DefaultArtifact(
coord.getGroupId(),
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
index 563797f05c..ae8b166b97 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
@@ -106,7 +106,7 @@ public class DefaultArtifact implements Artifact {
@Override
public boolean equals(Object o) {
- return o instanceof Artifact && Objects.equals(key(), ((Artifact) o).key());
+ return o instanceof Artifact artifact && Objects.equals(key(), artifact.key());
}
@Override
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index 1ac100076d..a53b820b8f 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -66,8 +66,8 @@ public class DefaultArtifactManager implements ArtifactManager {
}
}
Path path = paths.get(id);
- if (path == null && artifact instanceof DefaultArtifact) {
- File file = ((DefaultArtifact) artifact).getArtifact().getFile();
+ if (path == null && artifact instanceof DefaultArtifact defaultArtifact) {
+ File file = defaultArtifact.getArtifact().getFile();
if (file != null) {
path = file.toPath();
}
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
index 6ed0ecfb8b..2cbd91b80f 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
@@ -50,7 +50,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().getRemainingProjects(), is(asList("test:B")));
+ assertThat(result.get().remainingProjects(), is(asList("test:B")));
}
@Test
@@ -74,7 +74,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().getRemainingProjects(), is(asList("test:B")));
+ assertThat(result.get().remainingProjects(), is(asList("test:B")));
}
@Test
@@ -88,7 +88,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().getRemainingProjects(), is(asList("test:B", "test:C")));
+ assertThat(result.get().remainingProjects(), is(asList("test:B", "test:C")));
}
@Test
@@ -102,7 +102,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().getRemainingProjects(), is(asList("test:B", "test:D")));
+ assertThat(result.get().remainingProjects(), is(asList("test:B", "test:D")));
}
private MavenProject createMavenProject(String artifactId) {
diff --git a/maven-di/src/main/java/org/apache/maven/di/Key.java b/maven-di/src/main/java/org/apache/maven/di/Key.java
index d27882ae76..c2f07d7642 100644
--- a/maven-di/src/main/java/org/apache/maven/di/Key.java
+++ b/maven-di/src/main/java/org/apache/maven/di/Key.java
@@ -113,8 +113,8 @@ public abstract class Key<T> {
* @throws IllegalStateException when underlying type is not a parameterized one.
*/
public <U> Key<U> getTypeParameter(int index) {
- if (type instanceof ParameterizedType) {
- return new KeyImpl<>(((ParameterizedType) type).getActualTypeArguments()[index], null);
+ if (type instanceof ParameterizedType parameterizedType) {
+ return new KeyImpl<>(parameterizedType.getActualTypeArguments()[index], null);
}
throw new IllegalStateException("Expected type from key " + getDisplayString() + " to be parameterized");
}
diff --git a/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java b/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java
index 4611154065..8731fe89c8 100644
--- a/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java
+++ b/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java
@@ -34,7 +34,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static org.junit.jupiter.api.Assertions.*;
@SuppressWarnings("unused")
-public class InjectorImplTest {
+class InjectorImplTest {
@Test
void markerQualifierTest() {
@@ -143,10 +143,9 @@ public class InjectorImplTest {
}
@Test
- public void bindInterfacesTest() {
+ void bindInterfacesTest() {
Injector injector = Injector.create().bindImplicit(BindInterfaces.class);
- BindInterfaces.TestInterface<String> inst =
- injector.getInstance(new Key<BindInterfaces.TestInterface<String>>() {});
+ BindInterfaces.TestInterface<String> inst = injector.getInstance(new Key<>() {});
assertNotNull(inst);
}
@@ -177,7 +176,7 @@ public class InjectorImplTest {
@Test
void injectListTest() {
Injector injector = Injector.create().bindImplicit(InjectList.class);
- List<InjectList.MyService> services = injector.getInstance(new Key<List<InjectList.MyService>>() {});
+ List<InjectList.MyService> services = injector.getInstance(new Key<>() {});
assertNotNull(services);
assertEquals(2, services.size());
@@ -202,8 +201,7 @@ public class InjectorImplTest {
@Test
void injectMapTest() {
Injector injector = Injector.create().bindImplicit(InjectMap.class);
- Map<String, InjectMap.MyService> services =
- injector.getInstance(new Key<Map<String, InjectMap.MyService>>() {});
+ Map<String, InjectMap.MyService> services = injector.getInstance(new Key<>() {});
assertNotNull(services);
assertEquals(2, services.size());
diff --git a/src/mdo/java/WrapperProperties.java b/src/mdo/java/WrapperProperties.java
index 851459c4a6..8070f626f8 100644
--- a/src/mdo/java/WrapperProperties.java
+++ b/src/mdo/java/WrapperProperties.java
@@ -141,8 +141,8 @@ class WrapperProperties extends Properties {
@Override
public synchronized boolean equals(Object o) {
- if (o instanceof WrapperProperties) {
- o = ((WrapperProperties) o).getter.get();
+ if (o instanceof WrapperProperties prop) {
+ o = prop.getter.get();
}
return getter.get().equals(o);
}
(maven) 02/03: Fixed.
Posted by kh...@apache.org.
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 480c5c11753f66910a2c9e87a8d73d57fafac540
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Mar 7 17:18:32 2024 +0100
Fixed.
---
.../maven/execution/DefaultBuildResumptionAnalyzerTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
index 2cbd91b80f..651cf45f55 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.maven.execution;
+import java.util.List;
import java.util.Optional;
import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -50,7 +51,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().remainingProjects(), is(asList("test:B")));
+ assertThat(result.get().remainingProjects(), is(List.of("test:B")));
}
@Test
@@ -74,7 +75,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().remainingProjects(), is(asList("test:B")));
+ assertThat(result.get().remainingProjects(), is(List.of("test:B")));
}
@Test
@@ -88,7 +89,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().remainingProjects(), is(asList("test:B", "test:C")));
+ assertThat(result.get().remainingProjects(), is(List.of("test:B", "test:C")));
}
@Test
@@ -102,7 +103,7 @@ class DefaultBuildResumptionAnalyzerTest {
Optional<BuildResumptionData> result = analyzer.determineBuildResumptionData(executionResult);
assertThat(result.isPresent(), is(true));
- assertThat(result.get().remainingProjects(), is(asList("test:B", "test:D")));
+ assertThat(result.get().remainingProjects(), is(List.of("test:B", "test:D")));
}
private MavenProject createMavenProject(String artifactId) {