From 512a4c7544736488f1e5f711980cf7b82409734a Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 25 Oct 2022 11:40:44 +0200 Subject: [PATCH] Revert "Register runtime hints for OutputCapture" This reverts commit 35abc3a6dcbacf9e5ae3f1b06ba3f60c8ca79b8c. --- .../boot/test/system/OutputCapture.java | 16 ---------------- .../main/resources/META-INF/spring/aot.factories | 3 --- 2 files changed, 19 deletions(-) delete mode 100644 spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring/aot.factories diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java index d4ab620224..a561fac758 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java @@ -21,19 +21,14 @@ import java.io.OutputStream; import java.io.PrintStream; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Collections; import java.util.Deque; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Predicate; -import org.springframework.aot.hint.ExecutableMode; -import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.TypeReference; import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiOutput.Enabled; -import org.springframework.test.context.aot.TestRuntimeHintsRegistrar; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -344,15 +339,4 @@ class OutputCapture implements CapturedOutput { } - static class OutputCaptureRuntimeHints implements TestRuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints runtimeHints, Class testClass, ClassLoader classLoader) { - runtimeHints.reflection().registerType(TypeReference.of(OutputCapture.class), - (hint) -> hint.onReachableType(OutputCaptureExtension.class) - .withConstructor(Collections.emptyList(), ExecutableMode.INVOKE)); - } - - } - } diff --git a/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring/aot.factories deleted file mode 100644 index 0a0df54c11..0000000000 --- a/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring/aot.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Runtime hints for tests -org.springframework.test.context.aot.TestRuntimeHintsRegistrar=\ -org.springframework.boot.test.system.OutputCapture.OutputCaptureRuntimeHints