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

Merge branch '3.4.x' 

Closes gh-44026
This commit is contained in:
Andy Wilkinson 2025-01-30 12:12:08 +00:00
parent 7ab89d1b16 df32e21078
commit 1bee5f3942
2 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -231,12 +231,12 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
return modelClasses; return modelClasses;
} }
private Set<String> reflectionTypes(Model model) { private Set<Class<?>> reflectionTypes(Model model) {
return reflectionTypes(model, () -> null); return reflectionTypes(model, () -> null);
} }
private Set<String> reflectionTypes(Model model, Supplier<Object> parent) { private Set<Class<?>> reflectionTypes(Model model, Supplier<Object> parent) {
Set<String> reflectionTypes = new HashSet<>(); Set<Class<?>> reflectionTypes = new HashSet<>();
Class<?> componentType = determineType(model, parent); Class<?> componentType = determineType(model, parent);
if (componentType != null) { if (componentType != null) {
processComponent(componentType, reflectionTypes); processComponent(componentType, reflectionTypes);
@ -306,15 +306,15 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
} }
} }
private void processComponent(Class<?> componentType, Set<String> reflectionTypes) { private void processComponent(Class<?> componentType, Set<Class<?>> reflectionTypes) {
BeanDescription beanDescription = this.modelInterpretationContext.getBeanDescriptionCache() BeanDescription beanDescription = this.modelInterpretationContext.getBeanDescriptionCache()
.getBeanDescription(componentType); .getBeanDescription(componentType);
reflectionTypes.addAll(parameterTypesNames(beanDescription.getPropertyNameToAdder().values())); reflectionTypes.addAll(parameterTypesNames(beanDescription.getPropertyNameToAdder().values()));
reflectionTypes.addAll(parameterTypesNames(beanDescription.getPropertyNameToSetter().values())); reflectionTypes.addAll(parameterTypesNames(beanDescription.getPropertyNameToSetter().values()));
reflectionTypes.add(componentType.getCanonicalName()); reflectionTypes.add(componentType);
} }
private Collection<String> parameterTypesNames(Collection<Method> methods) { private Collection<Class<?>> parameterTypesNames(Collection<Method> methods) {
return methods.stream() return methods.stream()
.filter((method) -> !method.getDeclaringClass().equals(ContextAware.class) .filter((method) -> !method.getDeclaringClass().equals(ContextAware.class)
&& !method.getDeclaringClass().equals(ContextAwareBase.class)) && !method.getDeclaringClass().equals(ContextAwareBase.class))
@ -322,7 +322,6 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
.flatMap(Stream::of) .flatMap(Stream::of)
.filter((type) -> !type.isPrimitive() && !type.equals(String.class)) .filter((type) -> !type.isPrimitive() && !type.equals(String.class))
.map((type) -> type.isArray() ? type.getComponentType() : type) .map((type) -> type.isArray() ? type.getComponentType() : type)
.map(Class::getName)
.toList(); .toList();
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -54,6 +54,7 @@ import org.springframework.aot.hint.JavaSerializationHint;
import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.SerializationHints; import org.springframework.aot.hint.SerializationHints;
import org.springframework.aot.hint.TypeHint;
import org.springframework.aot.hint.TypeReference; import org.springframework.aot.hint.TypeReference;
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.aot.test.generate.TestGenerationContext;
@ -149,15 +150,18 @@ class LogbackConfigurationAotContributionTests {
Model model = new Model(); Model model = new Model();
model.getSubModels().add(component); model.getSubModels().add(component);
TestGenerationContext generationContext = applyContribution(model); TestGenerationContext generationContext = applyContribution(model);
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(SizeAndTimeBasedRollingPolicy.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(SizeAndTimeBasedRollingPolicy.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(FileAppender.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(FileAppender.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(FileSize.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(FileSize.class)).accepts(runtimeHints);
.accepts(generationContext.getRuntimeHints());
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf( assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(
TimeBasedFileNamingAndTriggeringPolicy.class)) TimeBasedFileNamingAndTriggeringPolicy.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(runtimeHints).satisfies(hasValidTypeName(SizeAndTimeBasedRollingPolicy.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(FileSize.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(FileAppender.class));
} }
@Test @Test
@ -167,12 +171,14 @@ class LogbackConfigurationAotContributionTests {
Model model = new Model(); Model model = new Model();
model.getSubModels().add(implicit); model.getSubModels().add(implicit);
TestGenerationContext generationContext = applyContribution(model); TestGenerationContext generationContext = applyContribution(model);
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(PatternLayoutEncoder.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(PatternLayoutEncoder.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Layout.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Layout.class)).accepts(runtimeHints);
.accepts(generationContext.getRuntimeHints()); assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Charset.class)).accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Charset.class)) assertThat(runtimeHints).satisfies(hasValidTypeName(PatternLayoutEncoder.class));
.accepts(generationContext.getRuntimeHints()); assertThat(runtimeHints).satisfies(hasValidTypeName(Layout.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(Charset.class));
} }
@Test @Test
@ -186,6 +192,8 @@ class LogbackConfigurationAotContributionTests {
TestGenerationContext generationContext = applyContribution(model); TestGenerationContext generationContext = applyContribution(model);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(SizeAndTimeBasedRollingPolicy.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(SizeAndTimeBasedRollingPolicy.class))
.accepts(generationContext.getRuntimeHints()); .accepts(generationContext.getRuntimeHints());
assertThat(generationContext.getRuntimeHints())
.satisfies(hasValidTypeName(SizeAndTimeBasedRollingPolicy.class));
} }
@Test @Test
@ -196,10 +204,12 @@ class LogbackConfigurationAotContributionTests {
component.setClassName(Outer.class.getName()); component.setClassName(Outer.class.getName());
component.getSubModels().add(implementation); component.getSubModels().add(implementation);
TestGenerationContext generationContext = applyContribution(component); TestGenerationContext generationContext = applyContribution(component);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Outer.class)) RuntimeHints runtimeHints = generationContext.getRuntimeHints();
.accepts(generationContext.getRuntimeHints()); assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Outer.class)).accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(runtimeHints).satisfies(hasValidTypeName(Outer.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(Implementation.class));
} }
@Test @Test
@ -210,10 +220,16 @@ class LogbackConfigurationAotContributionTests {
component.setClassName(OuterWithDefaultClass.class.getName()); component.setClassName(OuterWithDefaultClass.class.getName());
component.getSubModels().add(contract); component.getSubModels().add(contract);
TestGenerationContext generationContext = applyContribution(component); TestGenerationContext generationContext = applyContribution(component);
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(OuterWithDefaultClass.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(OuterWithDefaultClass.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(BaseImplementation.Details.class))
.accepts(runtimeHints);
assertThat(runtimeHints).satisfies(hasValidTypeName(OuterWithDefaultClass.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(Implementation.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(BaseImplementation.Details.class));
} }
@Test @Test
@ -221,8 +237,11 @@ class LogbackConfigurationAotContributionTests {
ComponentModel component = new ComponentModel(); ComponentModel component = new ComponentModel();
component.setClassName(ArrayParameters.class.getName()); component.setClassName(ArrayParameters.class.getName());
TestGenerationContext generationContext = applyContribution(component); TestGenerationContext generationContext = applyContribution(component);
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(InetSocketAddress.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(InetSocketAddress.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(runtimeHints).satisfies(hasValidTypeName(InetSocketAddress.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(ArrayParameters.class));
} }
@Test @Test
@ -231,10 +250,12 @@ class LogbackConfigurationAotContributionTests {
component.setClassName("${VARIABLE_CLASS_NAME}"); component.setClassName("${VARIABLE_CLASS_NAME}");
TestGenerationContext generationContext = applyContribution(component, TestGenerationContext generationContext = applyContribution(component,
(context) -> context.putProperty("VARIABLE_CLASS_NAME", Outer.class.getName())); (context) -> context.putProperty("VARIABLE_CLASS_NAME", Outer.class.getName()));
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Outer.class)) RuntimeHints runtimeHints = generationContext.getRuntimeHints();
.accepts(generationContext.getRuntimeHints()); assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Outer.class)).accepts(runtimeHints);
assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class)) assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(Implementation.class))
.accepts(generationContext.getRuntimeHints()); .accepts(runtimeHints);
assertThat(runtimeHints).satisfies(hasValidTypeName(Outer.class));
assertThat(runtimeHints).satisfies(hasValidTypeName(Implementation.class));
} }
private Predicate<RuntimeHints> invokePublicConstructorsOf(String name) { private Predicate<RuntimeHints> invokePublicConstructorsOf(String name) {
@ -250,6 +271,12 @@ class LogbackConfigurationAotContributionTests {
MemberCategory.INVOKE_PUBLIC_METHODS); MemberCategory.INVOKE_PUBLIC_METHODS);
} }
private Consumer<RuntimeHints> hasValidTypeName(Class<?> type) {
return (runtimeHints) -> assertThat(runtimeHints.reflection().getTypeHint(type)).extracting(TypeHint::getType)
.extracting(TypeReference::getName)
.isEqualTo(type.getName());
}
private Properties load(InputStreamSource source) { private Properties load(InputStreamSource source) {
try (InputStream inputStream = source.getInputStream()) { try (InputStream inputStream = source.getInputStream()) {
Properties properties = new Properties(); Properties properties = new Properties();
@ -323,7 +350,18 @@ class LogbackConfigurationAotContributionTests {
} }
public static class Implementation implements Contract { public static class BaseImplementation implements Contract {
public void setDetails(Details details) {
}
public static final class Details {
}
}
public static class Implementation extends BaseImplementation {
} }