From 713f4f22923f9df3d4d744e60ec7cea14af26c15 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 2 May 2024 11:07:26 +0200 Subject: [PATCH] Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22" See gh-40172 --- .../main/java/org/springframework/boot/ansi/AnsiOutput.java | 6 +++--- .../boot/console/ConsoleIntegrationTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java index 70511bde3fe..b0c815168f4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java @@ -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; } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-console-tests/src/intTest/java/org/springframework/boot/console/ConsoleIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-console-tests/src/intTest/java/org/springframework/boot/console/ConsoleIntegrationTests.java index 05eff35a829..5cbdf328fc0 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-console-tests/src/intTest/java/org/springframework/boot/console/ConsoleIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-console-tests/src/intTest/java/org/springframework/boot/console/ConsoleIntegrationTests.java @@ -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); } }