revert: move test fixes and JDK matrix to improve-action-speed

ClasspathLoaderTest (JDK 25 split), UnsafeUtilTest (Unsafe.getObjectVolatile
rewrite), and the JDK version matrix in the RIC PR workflow are moved to the
dmelfi/improve-action-speed branch. This branch keeps only CI/workflow
improvements and the JUnit 5.14.3 upgrade.

Author: Davide Melfi

.github/workflows/runtime-interface-client_pr.yml

@@ -21,16 +21,13 @@ jobs:
 
   smoke-test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java-version: [8, 11, 17, 21, 25]
     steps:
     - uses: actions/checkout@v5
 
-    - name: Set up JDK ${{ matrix.java-version }}
+    - name: Set up JDK 1.8
       uses: actions/setup-java@v4
       with:
-        java-version: ${{ matrix.java-version }}
+        java-version: 8
         distribution: corretto
         cache: maven
 
@@ -46,7 +43,7 @@ jobs:
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make pr
       env:
-        IS_JAVA_8: ${{ matrix.java-version == 8 }}
+        IS_JAVA_8: true
 
   build:
     runs-on: ubuntu-latest

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoaderTest.java

@@ -6,16 +6,16 @@
 package com.amazonaws.services.lambda.runtime.api.client;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.io.TempDir;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Enumeration;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -27,38 +27,21 @@ void testLoadAllClassesWithNoClasspath() throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.clearProperty("java.class.path");
-            ClasspathLoader.main(new String[] {});
+            ClasspathLoader.main(new String[]{});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
             }
         }
     }
 
-    // On JDK 8-24, new File("").exists() returns false → FileNotFoundException.
     @Test
-    @DisabledForJreRange(min = JRE.JAVA_25)
     void testLoadAllClassesWithEmptyClasspath() {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", "");
-            assertThrows(FileNotFoundException.class, () -> ClasspathLoader.main(new String[] {}));
-        } finally {
-            if (originalClasspath != null) {
-                System.setProperty("java.class.path", originalClasspath);
-            }
-        }
-    }
-
-    // On JDK 25+, new File("") resolves to cwd (exists=true, isDirectory=true) →
-    // skipped with warning, no exception.
-    @Test
-    @EnabledForJreRange(min = JRE.JAVA_25)
-    void testLoadAllClassesWithEmptyClasspathJdk25Plus() throws IOException {
-        String originalClasspath = System.getProperty("java.class.path");
-        try {
-            System.setProperty("java.class.path", "");
-            ClasspathLoader.main(new String[] {});
+            assertThrows(FileNotFoundException.class, () -> 
+                ClasspathLoader.main(new String[]{}));
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -71,7 +54,8 @@ void testLoadAllClassesWithInvalidPath() {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", "nonexistent/path");
-            assertThrows(FileNotFoundException.class, () -> ClasspathLoader.main(new String[] {}));
+            assertThrows(FileNotFoundException.class, () -> 
+                ClasspathLoader.main(new String[]{}));
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -85,7 +69,7 @@ void testLoadAllClassesWithValidJar(@TempDir Path tempDir) throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", jarFile.getAbsolutePath());
-            ClasspathLoader.main(new String[] {});
+            ClasspathLoader.main(new String[]{});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -98,7 +82,7 @@ void testLoadAllClassesWithDirectory(@TempDir Path tempDir) throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", tempDir.toString());
-            ClasspathLoader.main(new String[] {});
+            ClasspathLoader.main(new String[]{});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -110,14 +94,14 @@ void testLoadAllClassesWithDirectory(@TempDir Path tempDir) throws IOException {
     void testLoadAllClassesWithMultipleEntries(@TempDir Path tempDir) throws IOException {
         File jarFile1 = createSimpleJar(tempDir, "test1.jar", "TestClass1");
         File jarFile2 = createSimpleJar(tempDir, "test2.jar", "TestClass2");
-
+        
         String originalClasspath = System.getProperty("java.class.path");
         try {
-            String newClasspath = jarFile1.getAbsolutePath() +
-                    File.pathSeparator +
-                    jarFile2.getAbsolutePath();
+            String newClasspath = jarFile1.getAbsolutePath() + 
+                                File.pathSeparator + 
+                                jarFile2.getAbsolutePath();
             System.setProperty("java.class.path", newClasspath);
-            ClasspathLoader.main(new String[] {});
+            ClasspathLoader.main(new String[]{});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -128,7 +112,7 @@ void testLoadAllClassesWithMultipleEntries(@TempDir Path tempDir) throws IOExcep
     @Test
     void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOException {
         File jarFile = tempDir.resolve("blocklist-test.jar").toFile();
-
+        
         try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile))) {
             JarEntry blockedEntry = new JarEntry("META-INF/versions/9/module-info.class");
             jos.putNextEntry(blockedEntry);
@@ -144,9 +128,8 @@ void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOExce
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", jarFile.getAbsolutePath());
-            ClasspathLoader.main(new String[] {});
-            // The test passes if no exception is thrown and the blocklisted class is
-            // skipped
+            ClasspathLoader.main(new String[]{});
+            // The test passes if no exception is thrown and the blocklisted class is skipped
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -156,15 +139,15 @@ void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOExce
 
     private File createSimpleJar(Path tempDir, String jarName, String className) throws IOException {
         File jarFile = tempDir.resolve(jarName).toFile();
-
+        
         try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile))) {
             // Add a simple non-class file to make it a valid jar
             JarEntry entry = new JarEntry("com/test/" + className + ".txt");
             jos.putNextEntry(entry);
             jos.write("test content".getBytes());
             jos.closeEntry();
         }
-
+        
         return jarFile;
     }
 }

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/util/UnsafeUtilTest.java

@@ -6,8 +6,6 @@
 package com.amazonaws.services.lambda.runtime.api.client.util;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 import java.lang.reflect.Field;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -21,7 +19,7 @@ void testTheUnsafeIsInitialized() {
     @Test
     void testThrowException() {
         Exception testException = new Exception("Test exception");
-
+        
         try {
             UnsafeUtil.throwException(testException);
             fail("Should have thrown an exception");
@@ -31,29 +29,22 @@ void testThrowException() {
         }
     }
 
-    // IllegalAccessLogger only exists on JDK 9-16; skipped on JDK 8 (no module
-    // system) and JDK 17+ (class removed).
-    @Test
-    @EnabledForJreRange(min = JRE.JAVA_9, max = JRE.JAVA_16)
-    void testDisableIllegalAccessWarning() throws Exception {
-        // We disable the warning log for "jdk.internal.module.IllegalAccessLogger"
-        UnsafeUtil.disableIllegalAccessWarning();
-
-        Class<?> illegalAccessLoggerClass = Class.forName("jdk.internal.module.IllegalAccessLogger");
-        Field loggerField = illegalAccessLoggerClass.getDeclaredField("logger");
-
-        // Now we are getting it back with getObjectVolatile and verify that the logger
-        // is null. We are not using default reflection because that will throw because
-        // that field is private, defeating the point of the test.
-        Object loggerValue = UnsafeUtil.TheUnsafe.getObjectVolatile(
-                illegalAccessLoggerClass,
-                UnsafeUtil.TheUnsafe.staticFieldOffset(loggerField));
-        assertNull(loggerValue);
-    }
-
     @Test
-    void testDisableIllegalAccessWarningDoesNotThrow() {
+    void testDisableIllegalAccessWarning() {
         assertDoesNotThrow(() -> UnsafeUtil.disableIllegalAccessWarning());
+        try {
+            Class<?> illegalAccessLoggerClass = Class.forName("jdk.internal.module.IllegalAccessLogger");
+            Field loggerField = illegalAccessLoggerClass.getDeclaredField("logger");
+            loggerField.setAccessible(true);
+            Object loggerValue = loggerField.get(null);
+            assertNull(loggerValue);
+        } catch (ClassNotFoundException e) {
+            assertTrue(true);
+        } catch (NoSuchFieldException e) {
+            assertTrue(true);
+        } catch (Exception e) {
+            fail("Unexpected exception: " + e.getMessage());
+        }
     }
 
     @Test