Fix display

client/src/main/java/org/jboss/fuse/mvnd/client/TerminalOutput.java

@@ -176,8 +176,12 @@ void displayLoop() {
                     }
                     case LOG: {
                         if (entry.projectId != null) {
-                            Project prj = projects.computeIfAbsent(entry.projectId, p -> new Project());
-                            prj.log.add(entry.message);
+                            Project prj = projects.get(entry.projectId);
+                            if (prj != null) {
+                                prj.log.add(entry.message);
+                            } else {
+                                log.accept(entry.message);
+                            }
                         } else {
                             log.accept(entry.message);
                         }
@@ -213,7 +217,7 @@ void displayLoop() {
                             linesPerProject = Math.max(0, linesPerProject - 1);
                             break;
                         case CTRL_L:
-                            display.reset();
+                            display.update(List.of(), 0);
                             break;
                         case CTRL_M:
                             displayDone = !displayDone;
@@ -267,24 +271,26 @@ private void update() {
             return;
         }
         final List<AttributedString> lines = new ArrayList<>(rows);
-        final int dispLines = rows - 1;
+        int dispLines = rows - 1; // for the "Building..." line
+        dispLines--; // there's a bug which sometimes make the cursor goes one line below, so keep one more line empty at the end
         if (projects.size() <= dispLines) {
             lines.add(new AttributedString("Building..."));
             int remLogLines = dispLines - projects.size();
             for (Project prj : projects.values()) {
-                lines.add(AttributedString.fromAnsi(prj.status));
+                lines.add(AttributedString.fromAnsi(prj.status != null ? prj.status : "<unknown>"));
                 // get the last lines of the project log, taking multi-line logs into account
-                List<AttributedString> logs = lastN(prj.log, linesPerProject).stream()
+                int nb = Math.min(remLogLines, linesPerProject);
+                List<AttributedString> logs = lastN(prj.log, nb).stream()
                         .flatMap(s -> AttributedString.fromAnsi(s).columnSplitLength(Integer.MAX_VALUE).stream())
                         .map(s -> concat("   ", s))
-                        .collect(lastN(Math.min(remLogLines, linesPerProject)));
+                        .collect(lastN(nb));
                 lines.addAll(logs);
                 remLogLines -= logs.size();
             }
         } else {
             lines.add(new AttributedString("Building... (" + (projects.size() - dispLines) + " more)"));
             lines.addAll(projects.values().stream()
-                    .map(prj -> AttributedString.fromAnsi(prj.status))
+                    .map(prj -> AttributedString.fromAnsi(prj.status != null ? prj.status : "<unknown>"))
                     .collect(lastN(dispLines)));
         }
         List<AttributedString> trimmed = lines.stream()
@@ -299,9 +305,11 @@ private static <T> List<T> lastN(List<T> list, int n) {
 
     private static <T> Collector<T, ?, List<T>> lastN(int n) {
         return Collector.<T, Deque<T>, List<T>> of(ArrayDeque::new, (acc, t) -> {
-            if (acc.size() == n)
-                acc.pollFirst();
-            acc.add(t);
+            if (n > 0) {
+                if (acc.size() == n)
+                    acc.pollFirst();
+                acc.add(t);
+            }
         }, (acc1, acc2) -> {
             while (acc2.size() < n && !acc1.isEmpty()) {
                 acc2.addFirst(acc1.pollLast());

common/src/main/java/org/jboss/fuse/mvnd/common/Message.java

@@ -139,7 +139,8 @@ public String getDisplay() {
         @Override
         public String toString() {
             return "BuildEvent{" +
-                    "type=" + type +
+                    "projectId='" + projectId + '\'' +
+                    ", type=" + type +
                     ", display='" + display + '\'' +
                     '}';
         }
@@ -165,7 +166,8 @@ public String getProjectId() {
         @Override
         public String toString() {
             return "BuildMessage{" +
-                    "message='" + message + '\'' +
+                    "projectId='" + projectId + '\'' +
+                    ", message='" + message + '\'' +
                     '}';
         }
     }

daemon/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java

@@ -0,0 +1,182 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.maven.cli.logging;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import org.codehaus.plexus.logging.Logger;
+import org.jboss.fuse.mvnd.logging.smart.ProjectBuildLogAppender;
+import org.slf4j.MDC;
+
+/**
+ * Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and
+ * probably not really used.
+ *
+ * @author Jason van Zyl
+ * @since  3.1.0
+ */
+public class Slf4jLogger
+        implements Logger {
+
+    private static final ThreadLocal<String> PROJECT_ID = new ThreadLocal<>();
+
+    private org.slf4j.Logger logger;
+    private String projectId;
+
+    public Slf4jLogger(org.slf4j.Logger logger) {
+        this.logger = logger;
+        this.projectId = PROJECT_ID.get();
+    }
+
+    public static void setCurrentProject(String projectId) {
+        PROJECT_ID.set(projectId);
+    }
+
+    public void debug(String message) {
+        setMdc();
+        logger.debug(message);
+    }
+
+    public void debug(String message, Throwable throwable) {
+        setMdc();
+        logger.debug(message, throwable);
+    }
+
+    public boolean isDebugEnabled() {
+        return logger.isDebugEnabled();
+    }
+
+    public void info(String message) {
+        setMdc();
+        logger.info(message);
+    }
+
+    public void info(String message, Throwable throwable) {
+        setMdc();
+        logger.info(message, throwable);
+    }
+
+    public boolean isInfoEnabled() {
+        return logger.isInfoEnabled();
+    }
+
+    public void warn(String message) {
+        setMdc();
+        logger.warn(message);
+    }
+
+    public void warn(String message, Throwable throwable) {
+        setMdc();
+        logger.warn(message, throwable);
+    }
+
+    public boolean isWarnEnabled() {
+        return logger.isWarnEnabled();
+    }
+
+    public void error(String message) {
+        setMdc();
+        logger.error(message);
+    }
+
+    public void error(String message, Throwable throwable) {
+        setMdc();
+        logger.error(message, throwable);
+    }
+
+    public boolean isErrorEnabled() {
+        return logger.isErrorEnabled();
+    }
+
+    public void fatalError(String message) {
+        setMdc();
+        logger.error(message);
+    }
+
+    public void fatalError(String message, Throwable throwable) {
+        setMdc();
+        logger.error(message, throwable);
+    }
+
+    public boolean isFatalErrorEnabled() {
+        return logger.isErrorEnabled();
+    }
+
+    /**
+     * <b>Warning</b>: ignored (always return <code>0 == Logger.LEVEL_DEBUG</code>).
+     */
+    public int getThreshold() {
+        return 0;
+    }
+
+    /**
+     * <b>Warning</b>: ignored.
+     */
+    public void setThreshold(int threshold) {
+    }
+
+    /**
+     * <b>Warning</b>: ignored (always return <code>null</code>).
+     */
+    public Logger getChildLogger(String name) {
+        return null;
+    }
+
+    public String getName() {
+        return logger.getName();
+    }
+
+    private void setMdc() {
+        if (projectId != null) {
+            MDC.put(ProjectBuildLogAppender.KEY_PROJECT_ID, projectId);
+        }
+    }
+
+}