From c2dd6667f136a61f6a0921cca49df46992c8d300 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 5 Sep 2022 12:01:03 +0200 Subject: [PATCH] Revise method signature in TestRuntimeHintsRegistrar --- .../test/context/aot/TestContextAotGenerator.java | 4 ++-- .../test/context/aot/TestRuntimeHintsRegistrar.java | 6 +++--- .../test/context/aot/hint/StandardTestRuntimeHints.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java index fefd5d9b520..18d16109479 100644 --- a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java +++ b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java @@ -120,8 +120,8 @@ public class TestContextAotGenerator { logger.debug(LogMessage.format("Generating AOT artifacts for test classes %s", testClasses.stream().map(Class::getName).toList())); try { - this.testRuntimeHintsRegistrars.forEach(registrar -> registrar.registerHints(this.runtimeHints, - mergedConfig, Collections.unmodifiableList(testClasses), getClass().getClassLoader())); + this.testRuntimeHintsRegistrars.forEach(registrar -> registrar.registerHints(mergedConfig, + Collections.unmodifiableList(testClasses), this.runtimeHints, getClass().getClassLoader())); // Use first test class discovered for a given unique MergedContextConfiguration. Class testClass = testClasses.get(0); diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java b/spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java index 49b87b85f12..0595a7e9158 100644 --- a/spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java +++ b/spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java @@ -45,13 +45,13 @@ public interface TestRuntimeHintsRegistrar { /** * Contribute hints to the given {@link RuntimeHints} instance. - * @param runtimeHints the {@code RuntimeHints} to use * @param mergedConfig the merged context configuration to process * @param testClasses the test classes that share the supplied merged context * configuration + * @param runtimeHints the {@code RuntimeHints} to use * @param classLoader the classloader to use */ - void registerHints(RuntimeHints runtimeHints, MergedContextConfiguration mergedConfig, - List> testClasses, ClassLoader classLoader); + void registerHints(MergedContextConfiguration mergedConfig, List> testClasses, + RuntimeHints runtimeHints, ClassLoader classLoader); } diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java b/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java index 4d5f01e55c7..b545bba6f7c 100644 --- a/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java +++ b/spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java @@ -47,8 +47,8 @@ class StandardTestRuntimeHints implements TestRuntimeHintsRegistrar { @Override - public void registerHints(RuntimeHints runtimeHints, MergedContextConfiguration mergedConfig, - List> testClasses, ClassLoader classLoader) { + public void registerHints(MergedContextConfiguration mergedConfig, List> testClasses, + RuntimeHints runtimeHints, ClassLoader classLoader) { registerHintsForMergedContextConfiguration(runtimeHints, mergedConfig); testClasses.forEach(testClass -> registerHintsForActiveProfilesResolvers(runtimeHints, testClass));