[tomcat] 01/02: Java 19 introduces some new classes

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c06d8369188a8421e5d6dbb940a6fd11daf625e2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 17 10:55:08 2022 +0100

    Java 19 introduces some new classes
---
 java/jakarta/el/ImportHandler.java                     | 6 +++++-
 test/jakarta/el/TestImportHandlerStandardPackages.java | 2 +-
 webapps/docs/changelog.xml                             | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/el/ImportHandler.java 
b/java/jakarta/el/ImportHandler.java
index b824d5dd79..050067ac88 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -140,7 +140,7 @@ public class ImportHandler {
         standardPackages.put("jakarta.servlet.jsp", servletJspClassNames);
 
         Set<String> javaLangClassNames = new HashSet<>();
-        // Taken from Java 14 EA27 Javadoc
+        // Based on Java 19 EA22
         // Interfaces
         javaLangClassNames.add("Appendable");
         javaLangClassNames.add("AutoCloseable");
@@ -154,6 +154,9 @@ public class ImportHandler {
         javaLangClassNames.add("Runnable");
         javaLangClassNames.add("StackWalker.StackFrame");
         javaLangClassNames.add("System.Logger");
+        javaLangClassNames.add("Thread.Builder");
+        javaLangClassNames.add("Thread.Builder.OfPlatform");
+        javaLangClassNames.add("Thread.Builder.OfVirtual");
         javaLangClassNames.add("Thread.UncaughtExceptionHandler");
         //Classes
         javaLangClassNames.add("Boolean");
@@ -237,6 +240,7 @@ public class ImportHandler {
         javaLangClassNames.add("StringIndexOutOfBoundsException");
         javaLangClassNames.add("TypeNotPresentException");
         javaLangClassNames.add("UnsupportedOperationException");
+        javaLangClassNames.add("WrongThreadException");
         //Errors
         javaLangClassNames.add("AbstractMethodError");
         javaLangClassNames.add("AssertionError");
diff --git a/test/jakarta/el/TestImportHandlerStandardPackages.java 
b/test/jakarta/el/TestImportHandlerStandardPackages.java
index 28ba400d06..0d0c40c096 100644
--- a/test/jakarta/el/TestImportHandlerStandardPackages.java
+++ b/test/jakarta/el/TestImportHandlerStandardPackages.java
@@ -54,7 +54,7 @@ public class TestImportHandlerStandardPackages {
             // The intention is that this test will catch new classes when the
             // tests are run on a newer JRE.
             // The latest version of the JRE where this test is known to pass 
is
-            // - OpenJDK 17 EA 28
+            // - OpenJDK 19 EA 22
             ModuleFinder.ofSystem().find("java.base").get().open().list()
                     .filter(c -> (c.startsWith("java/lang/")))
                     .filter(c -> c.lastIndexOf('/') == 9)             // 
Exclude sub-packages
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9fb16d17ae..4d0bbac83d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,10 @@
         Update the XML schema used by the web fragment defined for the Jasper 
EL
         JAR to use the Servlet 6.0 web fragment schema. (markt)
       </fix>
+      <fix>
+        Update <code>ImportHandler</code> optimisation for new classes
+        introduced in Java 19. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web Socket">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org