From b89b6bd7a8032f95d005785b6d5f38006997848e Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 1 Aug 2022 12:44:42 +0300 Subject: [PATCH] Revert "Support TestNG with @CompileWithTargetClassAccess" This reverts commit 9dd7f5412aa72efdeb1ba15b2cd86c6391540b61. --- .../compile/CompileWithTargetClassAccessClassLoader.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java index 849c57f5d5..141ba2f4e1 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java @@ -20,21 +20,16 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Enumeration; -import java.util.Set; /** * {@link ClassLoader} implementation to support * {@link CompileWithTargetClassAccess @CompileWithTargetClassAccess}. * * @author Phillip Webb - * @author Sam Brannen * @since 6.0 */ final class CompileWithTargetClassAccessClassLoader extends ClassLoader { - private static final Set passthroughPackages = - Set.of("org.junit", "org.testng", "org.hamcrest"); - private final ClassLoader testClassLoader; @@ -46,7 +41,7 @@ final class CompileWithTargetClassAccessClassLoader extends ClassLoader { @Override public Class loadClass(String name) throws ClassNotFoundException { - if (passthroughPackages.stream().anyMatch(pkg -> name.startsWith(pkg))) { + if (name.startsWith("org.junit") || name.startsWith("org.hamcrest")) { return Class.forName(name, false, this.testClassLoader); } return super.loadClass(name);