You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2025/09/25 12:03:55 UTC
(maven) branch master updated: Issue #17487: Apply `StreamRulesRecipes` (#11159)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 2865dac13e Issue #17487: Apply `StreamRulesRecipes` (#11159)
2865dac13e is described below
commit 2865dac13e00360c921e1f724d522b7a0097f45c
Author: Vincent Potucek <88...@users.noreply.github.com>
AuthorDate: Thu Sep 25 14:03:50 2025 +0200
Issue #17487: Apply `StreamRulesRecipes` (#11159)
- https://github.com/checkstyle/checkstyle/pull/17782
Co-authored-by: Vincent Potucek <vp...@me.com>
---
.../java/org/apache/maven/project/artifact/MavenMetadataSource.java | 2 +-
.../maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java | 2 +-
impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java | 2 +-
.../main/java/org/apache/maven/api/plugin/testing/MojoExtension.java | 2 +-
.../src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java | 2 +-
.../maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 66d11b5187..568bc263e8 100644
--- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -203,8 +203,8 @@ public ResolutionGroup retrieve(MetadataResolutionRequest request) throws Artifa
if (session.getProjects() != null) {
pomRepositories = session.getProjects().stream()
.filter(p -> artifact.equals(p.getArtifact()))
- .map(MavenProject::getRemoteArtifactRepositories)
.findFirst()
+ .map(MavenProject::getRemoteArtifactRepositories)
.orElseGet(() -> getRepositoriesFromModel(repositorySession, model));
} else {
pomRepositories = getRepositoriesFromModel(repositorySession, model);
diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java
index 426981a09a..e8e61495bf 100644
--- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java
+++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java
@@ -534,8 +534,8 @@ private Path findParentPomInMap(
&& Objects.equals(gav.artifactId(), artifactId)
&& (version == null || Objects.equals(gav.version(), version));
})
- .map(Map.Entry::getKey)
.findFirst()
+ .map(Map.Entry::getKey)
.orElse(null);
}
diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
index fac55cfdc3..b0672ff56f 100644
--- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
+++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java
@@ -279,8 +279,8 @@ protected <Q> Supplier<Q> compile(Binding<Q> binding) {
if (binding.getScope() != null) {
Scope scope = scopes.entrySet().stream()
.filter(e -> e.getKey().isInstance(binding.getScope()))
- .map(Map.Entry::getValue)
.findFirst()
+ .map(Map.Entry::getValue)
.orElseThrow(() -> new DIException("Scope not bound for annotation "
+ binding.getScope().annotationType()))
.get();
diff --git a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java b/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
index 1a9bfff9c5..9a9d229031 100644
--- a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
+++ b/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
@@ -265,8 +265,8 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
XmlNode pluginConfiguration = model.getBuild().getPlugins().stream()
.filter(p ->
Objects.equals(p.getGroupId(), coord[0]) && Objects.equals(p.getArtifactId(), coord[1]))
- .map(ConfigurationContainer::getConfiguration)
.findFirst()
+ .map(ConfigurationContainer::getConfiguration)
.orElseGet(() -> XmlNode.newInstance("config"));
List<XmlNode> children = mojoParameters.stream()
.map(mp -> XmlNode.newInstance(mp.name(), mp.value()))
diff --git a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java
index bb99243ccf..e97a221380 100644
--- a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java
+++ b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java
@@ -314,8 +314,8 @@ public XmlNode doMerge(XmlNode dominant, XmlNode recessive, Boolean childMergeOv
.filter(n2 -> n2.name().equals(n1))
.collect(Collectors.toList()))
.filter(l -> !l.isEmpty())
- .map(List::iterator)
.findFirst()
+ .map(List::iterator)
.orElse(null));
if (it == null) {
if (children == null) {
diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
index b25b328d67..cbd84a796f 100644
--- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
+++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
@@ -196,8 +196,8 @@ public void execute() throws VerificationException {
String itTail = args.stream()
.filter(s -> s.startsWith("-Dmaven.repo.local.tail="))
- .map(s -> s.substring(24).trim())
.findFirst()
+ .map(s -> s.substring(24).trim())
.orElse("");
if (!itTail.isEmpty()) {
// remove it