Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22"

Browse Source 
See gh-40172
This commit is contained in:
Moritz Halbritter 2024-05-02 11:07:26 +02:00
parent 1f9b62b122
commit 713f4f2292
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
View File

@ -157,13 +157,13 @@ public abstract class AnsiOutput {
return false;
}
if (consoleAvailable == null) {
Console c = System.console();
if (c == null) {
Console console = System.console();
if (console == null) {
return false;
}
Method isTerminalMethod = ClassUtils.getMethodIfAvailable(Console.class, "isTerminal");
if (isTerminalMethod != null) {
Boolean isTerminal = (Boolean) isTerminalMethod.invoke(c);
Boolean isTerminal = (Boolean) isTerminalMethod.invoke(console);
if (Boolean.FALSE.equals(isTerminal)) {
return false;
}

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-console-tests/src/intTest/java/org/springframework/boot/console/ConsoleIntegrationTests.java
View File

@ -54,7 +54,7 @@ class ConsoleIntegrationTests {
void runJarOn17() {
try (GenericContainer<?> container = createContainer(JDK_17_RUNTIME)) {
container.start();
assertThat(this.output.toString(StandardCharsets.ISO_8859_1)).contains("System.console() is null")
assertThat(this.output.toString(StandardCharsets.UTF_8)).contains("System.console() is null")
.doesNotContain(ENCODE_START);
}
}
@ -63,7 +63,7 @@ class ConsoleIntegrationTests {
void runJarOn22() {
try (GenericContainer<?> container = createContainer(JDK_22_RUNTIME)) {
container.start();
assertThat(this.output.toString(StandardCharsets.ISO_8859_1)).doesNotContain("System.console() is null")
assertThat(this.output.toString(StandardCharsets.UTF_8)).doesNotContain("System.console() is null")
.doesNotContain(ENCODE_START);
}
}