Trivial refactorings and fixes

Author: gnodet

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

@@ -152,14 +152,14 @@ public void error(Throwable error) {
     @Override
     public void error(Supplier<String> content) {
         if (isErrorEnabled()) {
-            logger.error(content.get());
+            logger.error(toString(content.get()));
         }
     }
 
     @Override
     public void error(Supplier<String> content, Throwable error) {
         if (isErrorEnabled()) {
-            logger.error(content.get(), error);
+            logger.error(toString(content.get()), error);
         }
     }
 

impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java

@@ -76,9 +76,7 @@ public Stream<BuildStep> allSteps() {
     }
 
     public Stream<BuildStep> steps(MavenProject project) {
-        return Optional.ofNullable(plan.get(project))
-                .map(m -> m.values().stream())
-                .orElse(Stream.empty());
+        return Optional.ofNullable(plan.get(project)).stream().flatMap(m -> m.values().stream());
     }
 
     public Optional<BuildStep> step(MavenProject project, String name) {
@@ -103,7 +101,7 @@ private Map<String, BuildStep> merge(Map<String, BuildStep> org, Map<String, Bui
                 add.values().stream().filter(b -> b.predecessors.isEmpty()).toList();
         firsts.stream()
                 .filter(addNode -> !org.containsKey(addNode.name))
-                .forEach(addNode -> lasts.forEach(orgNode -> addNode.executeAfter(orgNode)));
+                .forEach(addNode -> lasts.forEach(addNode::executeAfter));
         add.forEach((name, node) -> org.merge(name, node, this::merge));
         return org;
     }

impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java

@@ -251,7 +251,7 @@ public BuildPlan buildInitialPlan(List<TaskSegment> taskSegments) {
             // Create plan, setup and teardown
             for (MavenProject project : plan.getAllProjects().keySet()) {
                 BuildStep pplan = new BuildStep(PLAN, project, null);
-                pplan.status.set(PLANNING); // the plan step always need planning
+                pplan.status.set(PLANNING); // the plan step always needs planning
                 BuildStep setup = new BuildStep(SETUP, project, null);
                 BuildStep teardown = new BuildStep(TEARDOWN, project, null);
                 teardown.executeAfter(setup);
@@ -694,7 +694,7 @@ protected void handleBuildError(
             } else if (MavenExecutionRequest.REACTOR_FAIL_FAST.equals(session.getReactorFailureBehavior())) {
                 buildContext.getReactorBuildStatus().halt();
             } else {
-                logger.error("invalid reactor failure behavior " + session.getReactorFailureBehavior());
+                logger.error("invalid reactor failure behavior {}", session.getReactorFailureBehavior());
                 buildContext.getReactorBuildStatus().halt();
             }
         }
@@ -848,11 +848,11 @@ public BuildPlan calculateLifecycleMappings(
                 plan.addProject(project, steps);
             }
 
-            // Create inter project dependencies
+            // Create inter-project dependencies
             plan.allSteps().filter(step -> step.phase != null).forEach(step -> {
                 Lifecycle.Phase phase = step.phase;
                 MavenProject project = step.project;
-                phase.links().stream().forEach(link -> {
+                phase.links().forEach(link -> {
                     BuildStep before = plan.requiredStep(project, BEFORE + phase.name());
                     BuildStep after = plan.requiredStep(project, AFTER + phase.name());
                     Lifecycle.Pointer pointer = link.pointer();