apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-09 15:09:23 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Provide a way to remove decoration on the standard out/err streams, fixes #356

Browse Source
This commit is contained in:
Guillaume Nodet
2021-09-02 14:37:19 +02:00
committed by GitHub
parent b6ca242d1e
commit ee49cb3414
6 changed files with 151 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/org/mvndaemon/mvnd/common/Message.java
View File

@@ -56,6 +56,8 @@ public abstract class Message {
public static final int TRANSFER_SUCCEEDED = 22;
public static final int TRANSFER_FAILED = 23;
public static final int EXECUTION_FAILURE = 24;
public static final int PRINT_OUT = 25;
public static final int PRINT_ERR = 26;
final int type;
@@ -106,6 +108,9 @@ public abstract class Message {
return TransferEvent.read(type, input);
case EXECUTION_FAILURE:
return ExecutionFailureEvent.read(input);
case PRINT_OUT:
case PRINT_ERR:
return StringMessage.read(type, input);
}
throw new IllegalStateException("Unexpected message type: " + type);
}
@@ -126,6 +131,8 @@ public abstract class Message {
case PROMPT:
case PROMPT_RESPONSE:
case DISPLAY:
case PRINT_OUT:
case PRINT_ERR:
return 2;
case PROJECT_STARTED:
return 3;
@@ -703,6 +710,10 @@ public abstract class Message {
return "BuildLogMessage";
case DISPLAY:
return "Display";
case PRINT_OUT:
return "PrintOut";
case PRINT_ERR:
return "PrintErr";
default:
throw new IllegalStateException("Unexpected type " + type);
}
@@ -1015,6 +1026,14 @@ public abstract class Message {
return new StringMessage(DISPLAY, message);
}
public static StringMessage out(String message) {
return new StringMessage(PRINT_OUT, message);
}
public static StringMessage err(String message) {
return new StringMessage(PRINT_ERR, message);
}
public static StringMessage log(String message) {
return new StringMessage(BUILD_LOG_MESSAGE, message);
}

12
common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
View File

@@ -306,6 +306,18 @@ public class TerminalOutput implements ClientOutput {
terminal.writer().printf("%s%n", d.getMessage());
break;
}
case Message.PRINT_OUT: {
Message.StringMessage d = (Message.StringMessage) entry;
clearDisplay();
System.out.printf("%s%n", d.getMessage());
break;
}
case Message.PRINT_ERR: {
Message.StringMessage d = (Message.StringMessage) entry;
clearDisplay();
System.err.printf("%s%n", d.getMessage());
break;
}
case Message.PROMPT: {
Message.Prompt prompt = (Message.Prompt) entry;
if (dumb) {