Adjust terminal tests to new behavior in JDK 22. (#103614) (#106051)

JDK 22 may return a console even if the terminal is redirected. These cases are detected using the new Console#isTerminal() to maintain the current behavior (closes #98033). Co-authored-by: Moritz Mack <mmack@apache.org>
elastic · Mar 7, 2024 · 226ee28 · 226ee28
1 parent 63eeed8
commit 226ee28
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/libs/cli/build.gradle b/libs/cli/build.gradle
@@ -11,9 +11,12 @@ apply plugin: 'elasticsearch.publish'
 dependencies {
   api 'net.sf.jopt-simple:jopt-simple:5.0.2'
   api project(':libs:elasticsearch-core')
+
+  testImplementation(project(":test:framework")) {
+    exclude group: 'org.elasticsearch', module: 'elasticsearch-cli'
+  }
 }
 
-tasks.named("test").configure { enabled = false }
 // Since CLI does not depend on :server, it cannot run the jarHell task
 tasks.named("jarHell").configure { enabled = false }
 

diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java b/libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.cli;
 
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.jdk.JavaVersion;
 
 import java.io.BufferedReader;
 import java.io.Console;
@@ -17,6 +18,8 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Locale;
@@ -217,8 +220,8 @@ public boolean isHeadless() {
     }
 
     private static class ConsoleTerminal extends Terminal {
-
-        private static final Console CONSOLE = System.console();
+        private static final int JDK_VERSION_WITH_IS_TERMINAL = 22;
+        private static final Console CONSOLE = detectTerminal();
 
         ConsoleTerminal() {
             super(System.lineSeparator());
@@ -228,6 +231,23 @@ static boolean isSupported() {
             return CONSOLE != null;
         }
 
+        static Console detectTerminal() {
+            // JDK >= 22 returns a console even if the terminal is redirected unless using -Djdk.console=java.base
+            // https://bugs.openjdk.org/browse/JDK-8308591
+            Console console = System.console();
+            if (console != null && JavaVersion.current().getVersion().get(0) >= JDK_VERSION_WITH_IS_TERMINAL) {
+                try {
+                    // verify the console is a terminal using isTerminal() on JDK >= 22
+                    // TODO: Remove reflection once Java 22 sources are supported, e.g. using a MRJAR
+                    Method isTerminal = Console.class.getMethod("isTerminal");
+                    return Boolean.TRUE.equals(isTerminal.invoke(console)) ? console : null;
+                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                    throw new AssertionError(e);
+                }
+            }
+            return console;
+        }
+
         @Override
         public PrintWriter getWriter() {
             return CONSOLE.writer();