apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-01-13 07:04:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[1.x] mixup in case of DISPLAY messages type (#1037)

Browse Source 
ProjectEvent message mixup fixed.

Fixes #1036
This commit is contained in:
Tamas Cservenak
2024-06-20 08:01:20 +01:00
committed by GitHub
parent 6150ae34c8
commit 0e27c24acf
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java
View File

@@ -165,7 +165,7 @@ public class DefaultClient implements Client {
} catch (DaemonException.InterruptedException e) {
final AttributedStyle s = new AttributedStyle().bold().foreground(AttributedStyle.RED);
String str = new AttributedString(System.lineSeparator() + "Canceled by user", s).toAnsi();
output.accept(Message.display(str));
output.accept(Message.err(str));
exitCode = 130;
}
}

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

@@ -499,6 +499,8 @@ public abstract class Message {
private String mnemonic() {
switch (type) {
case DISPLAY:
return "Display";
case PROJECT_LOG_MESSAGE:
return "ProjectLogMessage";
default:
@@ -730,8 +732,6 @@ public abstract class Message {
return "KeyboardInput";
case BUILD_LOG_MESSAGE:
return "BuildLogMessage";
case DISPLAY:
return "Display";
case PRINT_OUT:
return "PrintOut";
case PRINT_ERR:
@@ -1112,10 +1112,6 @@ public abstract class Message {
return new StringMessage(BUILD_STATUS, payload);
}
public static StringMessage display(String message) {
return new StringMessage(DISPLAY, message);
}
public static RequestInput requestInput(String projectId) {
return new RequestInput(projectId);
}

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

@@ -312,9 +312,9 @@ public class TerminalOutput implements ClientOutput {
break;
}
case Message.DISPLAY: {
Message.StringMessage d = (Message.StringMessage) entry;
clearDisplay();
terminal.writer().printf("%s%n", d.getMessage());
Message.ProjectEvent d = (Message.ProjectEvent) entry;
terminal.writer().printf("[%s] %s%n", d.getProjectId(), d.getMessage());
break;
}
case Message.PRINT_OUT: {

2
integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/TestClientOutput.java
View File

@@ -59,7 +59,7 @@ public class TestClientOutput implements ClientOutput {
@Override
public void describeTerminal() {
accept(Message.display("Test terminal"));
accept(Message.display("test", "Test terminal"));
}
@Override