root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-34341
This commit is contained in:
Andy Wilkinson 2023-02-22 19:49:14 +00:00
parent 7d697310a0 31b1c3e8ad
commit 7aba96d132
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java
View File

@ -280,7 +280,8 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
private Class<?> loadComponentType(String componentType) { private Class<?> loadComponentType(String componentType) {
try { try {
return ClassUtils.forName(componentType, getClass().getClassLoader()); return ClassUtils.forName(this.modelInterpretationContext.subst(componentType),
getClass().getClassLoader());
} }
catch (Throwable ex) { catch (Throwable ex) {
throw new RuntimeException("Failed to load component type '" + componentType + "'", ex); throw new RuntimeException("Failed to load component type '" + componentType + "'", ex);

19
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java
View File

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -190,6 +191,18 @@ class LogbackConfigurationAotContributionTests {
.accepts(generationContext.getRuntimeHints()); .accepts(generationContext.getRuntimeHints());
} }
@Test
void placeholdersInComponentClassAttributeAreReplaced() {
ComponentModel component = new ComponentModel();
component.setClassName("${VARIABLE_CLASS_NAME}");
TestGenerationContext generationContext = applyContribution(component,
(context) -> context.putProperty("VARIABLE_CLASS_NAME", Outer.class.getName()));
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Outer.class))
.accepts(generationContext.getRuntimeHints());
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class))
.accepts(generationContext.getRuntimeHints());
}
private Predicate<RuntimeHints> invokePublicConstructorsOf(String name) { private Predicate<RuntimeHints> invokePublicConstructorsOf(String name) {
return RuntimeHintsPredicates.reflection() return RuntimeHintsPredicates.reflection()
.onType(TypeReference.of(name)) .onType(TypeReference.of(name))
@ -220,7 +233,13 @@ class LogbackConfigurationAotContributionTests {
} }
private TestGenerationContext applyContribution(Model model) { private TestGenerationContext applyContribution(Model model) {
return this.applyContribution(model, (context) -> {
});
}
private TestGenerationContext applyContribution(Model model, Consumer<LoggerContext> contextCustomizer) {
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
contextCustomizer.accept(context);
SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(null); SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(null);
configurator.setContext(context); configurator.setContext(context);
withSystemProperty("spring.aot.processing", "true", () -> configurator.processModel(model)); withSystemProperty("spring.aot.processing", "true", () -> configurator.processModel(model));