fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Stéphane Nicoll 2025-03-04 12:21:51 +01:00
commit 39bc496a8e
3 changed files with 29 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@ -19,19 +19,13 @@ package org.springframework.boot.test.context;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.springframework.aot.generate.GenerationContext;
import org.springframework.aot.hint.ExecutableMode; import org.springframework.aot.hint.ExecutableMode;
import org.springframework.aot.hint.ReflectionHints; import org.springframework.aot.hint.RuntimeHints;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.boot.ApplicationContextFactory; import org.springframework.boot.ApplicationContextFactory;
import org.springframework.boot.Banner; import org.springframework.boot.Banner;
import org.springframework.boot.ConfigurableBootstrapContext; import org.springframework.boot.ConfigurableBootstrapContext;
@ -113,28 +107,33 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
@Override @Override
public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception { public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
return loadContext(mergedConfig, Mode.STANDARD, null); return loadContext(mergedConfig, Mode.STANDARD, null, null);
} }
@Override @Override
public ApplicationContext loadContextForAotProcessing(MergedContextConfiguration mergedConfig) throws Exception { public ApplicationContext loadContextForAotProcessing(MergedContextConfiguration mergedConfig,
return loadContext(mergedConfig, Mode.AOT_PROCESSING, null); RuntimeHints runtimeHints) throws Exception {
return loadContext(mergedConfig, Mode.AOT_PROCESSING, null, runtimeHints);
} }
@Override @Override
public ApplicationContext loadContextForAotRuntime(MergedContextConfiguration mergedConfig, public ApplicationContext loadContextForAotRuntime(MergedContextConfiguration mergedConfig,
ApplicationContextInitializer<ConfigurableApplicationContext> initializer) throws Exception { ApplicationContextInitializer<ConfigurableApplicationContext> initializer) throws Exception {
return loadContext(mergedConfig, Mode.AOT_RUNTIME, initializer); return loadContext(mergedConfig, Mode.AOT_RUNTIME, initializer, null);
} }
private ApplicationContext loadContext(MergedContextConfiguration mergedConfig, Mode mode, private ApplicationContext loadContext(MergedContextConfiguration mergedConfig, Mode mode,
ApplicationContextInitializer<ConfigurableApplicationContext> initializer) throws Exception { ApplicationContextInitializer<ConfigurableApplicationContext> initializer, RuntimeHints runtimeHints)
throws Exception {
assertHasClassesOrLocations(mergedConfig); assertHasClassesOrLocations(mergedConfig);
SpringBootTestAnnotation annotation = SpringBootTestAnnotation.get(mergedConfig); SpringBootTestAnnotation annotation = SpringBootTestAnnotation.get(mergedConfig);
String[] args = annotation.getArgs(); String[] args = annotation.getArgs();
UseMainMethod useMainMethod = annotation.getUseMainMethod(); UseMainMethod useMainMethod = annotation.getUseMainMethod();
Method mainMethod = getMainMethod(mergedConfig, useMainMethod); Method mainMethod = getMainMethod(mergedConfig, useMainMethod);
if (mainMethod != null) { if (mainMethod != null) {
if (runtimeHints != null) {
runtimeHints.reflection().registerMethod(mainMethod, ExecutableMode.INVOKE);
}
ContextLoaderHook hook = new ContextLoaderHook(mode, initializer, ContextLoaderHook hook = new ContextLoaderHook(mode, initializer,
(application) -> configure(mergedConfig, application)); (application) -> configure(mergedConfig, application));
return hook.runMain(() -> ReflectionUtils.invokeMethod(mainMethod, null, new Object[] { args })); return hook.runMain(() -> ReflectionUtils.invokeMethod(mainMethod, null, new Object[] { args }));
@ -585,39 +584,4 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
} }
static class MainMethodBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor {
@Override
public BeanFactoryInitializationAotContribution processAheadOfTime(
ConfigurableListableBeanFactory beanFactory) {
List<Method> mainMethods = new ArrayList<>();
for (String beanName : beanFactory.getBeanDefinitionNames()) {
Class<?> beanType = beanFactory.getType(beanName);
Method mainMethod = findMainMethod(beanType);
if (mainMethod != null) {
mainMethods.add(mainMethod);
}
}
return !mainMethods.isEmpty() ? new AotContribution(mainMethods) : null;
}
static class AotContribution implements BeanFactoryInitializationAotContribution {
private final Collection<Method> mainMethods;
AotContribution(Collection<Method> mainMethods) {
this.mainMethods = mainMethods;
}
@Override
public void applyTo(GenerationContext generationContext,
BeanFactoryInitializationCode beanFactoryInitializationCode) {
ReflectionHints reflectionHints = generationContext.getRuntimeHints().reflection();
this.mainMethods.forEach((method) -> reflectionHints.registerMethod(method, ExecutableMode.INVOKE));
}
}
}
} }

2
spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring/aot.factories
View File

@ -1,2 +0,0 @@
org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
org.springframework.boot.test.context.SpringBootContextLoader.MainMethodBeanFactoryInitializationAotProcessor

43
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
View File

@ -27,14 +27,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
import org.springframework.aot.test.generate.TestGenerationContext;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.boot.ApplicationContextFactory; import org.springframework.boot.ApplicationContextFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.context.SpringBootContextLoader.MainMethodBeanFactoryInitializationAotProcessor;
import org.springframework.boot.test.context.SpringBootTest.UseMainMethod; import org.springframework.boot.test.context.SpringBootTest.UseMainMethod;
import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext;
@ -47,6 +43,7 @@ import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ApplicationContextFailureProcessor; import org.springframework.test.context.ApplicationContextFailureProcessor;
import org.springframework.test.context.BootstrapUtils;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.ContextHierarchy;
import org.springframework.test.context.MergedContextConfiguration; import org.springframework.test.context.MergedContextConfiguration;
@ -59,6 +56,8 @@ import org.springframework.web.context.WebApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.mock;
/** /**
* Tests for {@link SpringBootContextLoader} * Tests for {@link SpringBootContextLoader}
@ -251,30 +250,24 @@ class SpringBootContextLoaderTests {
} }
@Test @Test
void whenMainMethodPresentRegisterReflectionHints() { void whenMainMethodNotAvailableReturnsNoAotContribution() throws Exception {
TestContext testContext = new ExposedTestContextManager(UseMainMethodWhenAvailableAndNoMainMethod.class) SpringBootContextLoader contextLoader = new SpringBootContextLoader();
.getExposedTestContext(); MergedContextConfiguration contextConfiguration = BootstrapUtils
ConfigurableListableBeanFactory beanFactory = (ConfigurableListableBeanFactory) testContext .resolveTestContextBootstrapper(UseMainMethodWhenAvailableAndNoMainMethod.class)
.getApplicationContext() .buildMergedContextConfiguration();
.getAutowireCapableBeanFactory(); RuntimeHints runtimeHints = mock(RuntimeHints.class);
BeanFactoryInitializationAotContribution aotContribution = new MainMethodBeanFactoryInitializationAotProcessor() contextLoader.loadContextForAotProcessing(contextConfiguration, runtimeHints);
.processAheadOfTime(beanFactory); then(runtimeHints).shouldHaveNoInteractions();
assertThat(aotContribution).isNull();
} }
@Test @Test
void whenMainMethodNotAvailableReturnsNoAotContribution() { void whenMainMethodPresentRegisterReflectionHints() throws Exception {
TestContext testContext = new ExposedTestContextManager(UseMainMethodWhenAvailableAndMainMethod.class) SpringBootContextLoader contextLoader = new SpringBootContextLoader();
.getExposedTestContext(); MergedContextConfiguration contextConfiguration = BootstrapUtils
ConfigurableListableBeanFactory beanFactory = (ConfigurableListableBeanFactory) testContext .resolveTestContextBootstrapper(UseMainMethodWhenAvailableAndMainMethod.class)
.getApplicationContext() .buildMergedContextConfiguration();
.getAutowireCapableBeanFactory(); RuntimeHints runtimeHints = new RuntimeHints();
BeanFactoryInitializationAotContribution aotContribution = new MainMethodBeanFactoryInitializationAotProcessor() contextLoader.loadContextForAotProcessing(contextConfiguration, runtimeHints);
.processAheadOfTime(beanFactory);
assertThat(aotContribution).isNotNull();
TestGenerationContext generationContext = new TestGenerationContext();
aotContribution.applyTo(generationContext, null);
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
assertThat(RuntimeHintsPredicates.reflection().onMethod(ConfigWithMain.class, "main").invoke()) assertThat(RuntimeHintsPredicates.reflection().onMethod(ConfigWithMain.class, "main").invoke())
.accepts(runtimeHints); .accepts(runtimeHints);
} }