Apply StreamRulesRecipes

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);

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);
     }
 

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();

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()))

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) {

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