From cc2181ebdb683ace9589db3c6c05d9a7f8540061 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 15 Dec 2022 21:44:44 +0100 Subject: [PATCH] Revert "Always display failed and main project at the end (fixes #723) (#724)" This reverts commit fd3f20ef9642b763a90135a37f1b7e64b0c56950. After using it a bit, the output is rather worse, so let's revert until a better solution is found. --- .../mvnd/common/logging/TerminalOutput.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java index f4f84c31..a7e024ef 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java @@ -32,7 +32,6 @@ import java.util.Deque; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -288,18 +287,12 @@ public class TerminalOutput implements ClientOutput { case Message.PROJECT_STOPPED: { StringMessage be = (StringMessage) entry; final String artifactId = be.getMessage(); - // Display project log if it has not failed and if it's not the main project - if (!Objects.equals(name, artifactId)) { - Project prj = projects.get(artifactId); - if (prj != null) { - if (failures.stream().noneMatch(e -> Objects.equals(artifactId, e.getProjectId()))) { - projects.remove(artifactId); - prj.log.forEach(log); - } - } - doneProjects++; - displayDone(); + Project prj = projects.remove(artifactId); + if (prj != null) { + prj.log.forEach(log); } + doneProjects++; + displayDone(); break; } case Message.BUILD_STATUS: { @@ -307,11 +300,7 @@ public class TerminalOutput implements ClientOutput { break; } case Message.BUILD_FINISHED: { - Project main = projects.remove(name); projects.values().stream().flatMap(p -> p.log.stream()).forEach(log); - if (main != null) { - main.log.forEach(log); - } clearDisplay(); try { log.close();