Browse Source

Revise method signature in TestRuntimeHintsRegistrar

pull/29083/head
Sam Brannen 3 years ago
parent
commit
c2dd6667f1
  1. 4
      spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java
  2. 6
      spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java
  3. 4
      spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java

4
spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java

@ -120,8 +120,8 @@ public class TestContextAotGenerator { @@ -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);

6
spring-test/src/main/java/org/springframework/test/context/aot/TestRuntimeHintsRegistrar.java

@ -45,13 +45,13 @@ public interface TestRuntimeHintsRegistrar { @@ -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<Class<?>> testClasses, ClassLoader classLoader);
void registerHints(MergedContextConfiguration mergedConfig, List<Class<?>> testClasses,
RuntimeHints runtimeHints, ClassLoader classLoader);
}

4
spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java

@ -47,8 +47,8 @@ class StandardTestRuntimeHints implements TestRuntimeHintsRegistrar { @@ -47,8 +47,8 @@ class StandardTestRuntimeHints implements TestRuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints runtimeHints, MergedContextConfiguration mergedConfig,
List<Class<?>> testClasses, ClassLoader classLoader) {
public void registerHints(MergedContextConfiguration mergedConfig, List<Class<?>> testClasses,
RuntimeHints runtimeHints, ClassLoader classLoader) {
registerHintsForMergedContextConfiguration(runtimeHints, mergedConfig);
testClasses.forEach(testClass -> registerHintsForActiveProfilesResolvers(runtimeHints, testClass));

Loading…
Cancel
Save