Skip to content

Commit 0fb1d2b

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-44576
2 parents bfd4e7b + 85ffbbc commit 0fb1d2b

6 files changed

+93
-56
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@
3636
import org.springframework.beans.factory.BeanFactoryAware;
3737
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
3838
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
39-
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
40-
import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
41-
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
4239
import org.springframework.boot.context.annotation.ImportCandidates;
40+
import org.springframework.boot.testsupport.classpath.resources.WithResource;
4341
import org.springframework.context.annotation.Configuration;
4442
import org.springframework.context.annotation.DeferredImportSelector.Group;
4543
import org.springframework.context.annotation.DeferredImportSelector.Group.Entry;
@@ -57,6 +55,15 @@
5755
* @author Stephane Nicoll
5856
* @author Madhura Bhave
5957
*/
58+
@WithResource(name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports", content = """
59+
com.example.one.FirstAutoConfiguration
60+
com.example.two.SecondAutoConfiguration
61+
com.example.three.ThirdAutoConfiguration
62+
com.example.four.FourthAutoConfiguration
63+
com.example.five.FifthAutoConfiguration
64+
com.example.six.SixthAutoConfiguration
65+
org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$SeventhAutoConfiguration
66+
""")
6067
class AutoConfigurationImportSelectorTests {
6168

6269
private final TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(null);
@@ -84,78 +91,78 @@ void classExclusionsAreApplied() {
8491
String[] imports = selectImports(EnableAutoConfigurationWithClassExclusions.class);
8592
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
8693
assertThat(this.importSelector.getLastEvent().getExclusions())
87-
.contains(FreeMarkerAutoConfiguration.class.getName());
94+
.contains(SeventhAutoConfiguration.class.getName());
8895
}
8996

9097
@Test
9198
void classExclusionsAreAppliedWhenUsingSpringBootApplication() {
9299
String[] imports = selectImports(SpringBootApplicationWithClassExclusions.class);
93100
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
94101
assertThat(this.importSelector.getLastEvent().getExclusions())
95-
.contains(FreeMarkerAutoConfiguration.class.getName());
102+
.contains(SeventhAutoConfiguration.class.getName());
96103
}
97104

98105
@Test
99106
void classNamesExclusionsAreApplied() {
100107
String[] imports = selectImports(EnableAutoConfigurationWithClassNameExclusions.class);
101108
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
102109
assertThat(this.importSelector.getLastEvent().getExclusions())
103-
.contains(MustacheAutoConfiguration.class.getName());
110+
.contains("com.example.one.FirstAutoConfiguration");
104111
}
105112

106113
@Test
107114
void classNamesExclusionsAreAppliedWhenUsingSpringBootApplication() {
108115
String[] imports = selectImports(SpringBootApplicationWithClassNameExclusions.class);
109116
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
110117
assertThat(this.importSelector.getLastEvent().getExclusions())
111-
.contains(MustacheAutoConfiguration.class.getName());
118+
.contains("com.example.three.ThirdAutoConfiguration");
112119
}
113120

114121
@Test
115122
void propertyExclusionsAreApplied() {
116-
this.environment.setProperty("spring.autoconfigure.exclude", FreeMarkerAutoConfiguration.class.getName());
123+
this.environment.setProperty("spring.autoconfigure.exclude", "com.example.three.ThirdAutoConfiguration");
117124
String[] imports = selectImports(BasicEnableAutoConfiguration.class);
118125
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
119126
assertThat(this.importSelector.getLastEvent().getExclusions())
120-
.contains(FreeMarkerAutoConfiguration.class.getName());
127+
.contains("com.example.three.ThirdAutoConfiguration");
121128
}
122129

123130
@Test
124131
void severalPropertyExclusionsAreApplied() {
125132
this.environment.setProperty("spring.autoconfigure.exclude",
126-
FreeMarkerAutoConfiguration.class.getName() + "," + MustacheAutoConfiguration.class.getName());
133+
"com.example.two.SecondAutoConfiguration,com.example.four.FourthAutoConfiguration");
127134
testSeveralPropertyExclusionsAreApplied();
128135
}
129136

130137
@Test
131138
void severalPropertyExclusionsAreAppliedWithExtraSpaces() {
132139
this.environment.setProperty("spring.autoconfigure.exclude",
133-
FreeMarkerAutoConfiguration.class.getName() + " , " + MustacheAutoConfiguration.class.getName() + " ");
140+
"com.example.two.SecondAutoConfiguration , com.example.four.FourthAutoConfiguration ");
134141
testSeveralPropertyExclusionsAreApplied();
135142
}
136143

137144
@Test
138145
void severalPropertyYamlExclusionsAreApplied() {
139-
this.environment.setProperty("spring.autoconfigure.exclude[0]", FreeMarkerAutoConfiguration.class.getName());
140-
this.environment.setProperty("spring.autoconfigure.exclude[1]", MustacheAutoConfiguration.class.getName());
146+
this.environment.setProperty("spring.autoconfigure.exclude[0]", "com.example.two.SecondAutoConfiguration");
147+
this.environment.setProperty("spring.autoconfigure.exclude[1]", "com.example.four.FourthAutoConfiguration");
141148
testSeveralPropertyExclusionsAreApplied();
142149
}
143150

144151
private void testSeveralPropertyExclusionsAreApplied() {
145152
String[] imports = selectImports(BasicEnableAutoConfiguration.class);
146153
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 2);
147154
assertThat(this.importSelector.getLastEvent().getExclusions())
148-
.contains(FreeMarkerAutoConfiguration.class.getName(), MustacheAutoConfiguration.class.getName());
155+
.contains("com.example.two.SecondAutoConfiguration", "com.example.four.FourthAutoConfiguration");
149156
}
150157

151158
@Test
152159
void combinedExclusionsAreApplied() {
153-
this.environment.setProperty("spring.autoconfigure.exclude", ThymeleafAutoConfiguration.class.getName());
160+
this.environment.setProperty("spring.autoconfigure.exclude", "com.example.one.FirstAutoConfiguration");
154161
String[] imports = selectImports(EnableAutoConfigurationWithClassAndClassNameExclusions.class);
155162
assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 3);
156163
assertThat(this.importSelector.getLastEvent().getExclusions()).contains(
157-
FreeMarkerAutoConfiguration.class.getName(), MustacheAutoConfiguration.class.getName(),
158-
ThymeleafAutoConfiguration.class.getName());
164+
"com.example.one.FirstAutoConfiguration", "com.example.five.FifthAutoConfiguration",
165+
SeventhAutoConfiguration.class.getName());
159166
}
160167

161168
@Test
@@ -247,13 +254,15 @@ private String[] selectImports(Class<?> source) {
247254
}
248255

249256
private List<String> getAutoConfigurationClassNames() {
250-
return ImportCandidates.load(AutoConfiguration.class, getClass().getClassLoader()).getCandidates();
257+
return ImportCandidates.load(AutoConfiguration.class, Thread.currentThread().getContextClassLoader())
258+
.getCandidates();
251259
}
252260

253261
private void setupImportSelector(TestAutoConfigurationImportSelector importSelector) {
254262
importSelector.setBeanFactory(this.beanFactory);
255263
importSelector.setEnvironment(this.environment);
256264
importSelector.setResourceLoader(new DefaultResourceLoader());
265+
importSelector.setBeanClassLoader(Thread.currentThread().getContextClassLoader());
257266
}
258267

259268
private final class TestAutoConfigurationImportSelector extends AutoConfigurationImportSelector {
@@ -322,23 +331,23 @@ private final class BasicEnableAutoConfiguration {
322331

323332
}
324333

325-
@EnableAutoConfiguration(exclude = FreeMarkerAutoConfiguration.class)
334+
@EnableAutoConfiguration(exclude = SeventhAutoConfiguration.class)
326335
private final class EnableAutoConfigurationWithClassExclusions {
327336

328337
}
329338

330-
@SpringBootApplication(exclude = FreeMarkerAutoConfiguration.class)
339+
@SpringBootApplication(exclude = SeventhAutoConfiguration.class)
331340
private final class SpringBootApplicationWithClassExclusions {
332341

333342
}
334343

335-
@EnableAutoConfiguration(excludeName = "org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration")
344+
@EnableAutoConfiguration(excludeName = "com.example.one.FirstAutoConfiguration")
336345
private final class EnableAutoConfigurationWithClassNameExclusions {
337346

338347
}
339348

340-
@EnableAutoConfiguration(exclude = MustacheAutoConfiguration.class,
341-
excludeName = "org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration")
349+
@EnableAutoConfiguration(exclude = SeventhAutoConfiguration.class,
350+
excludeName = "com.example.five.FifthAutoConfiguration")
342351
private final class EnableAutoConfigurationWithClassAndClassNameExclusions {
343352

344353
}
@@ -359,7 +368,7 @@ private final class EnableAutoConfigurationWithAbsentClassNameExclude {
359368

360369
}
361370

362-
@SpringBootApplication(excludeName = "org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration")
371+
@SpringBootApplication(excludeName = "com.example.three.ThirdAutoConfiguration")
363372
private final class SpringBootApplicationWithClassNameExclusions {
364373

365374
}
@@ -383,4 +392,9 @@ static class AfterDeprecatedAutoConfiguration {
383392

384393
}
385394

395+
@AutoConfiguration
396+
static class SeventhAutoConfiguration {
397+
398+
}
399+
386400
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ void importsAreSelectedFromImportsFile() throws Exception {
7979
AnnotationMetadata annotationMetadata = getAnnotationMetadata(FromImportsFile.class);
8080
String[] imports = this.importSelector.selectImports(annotationMetadata);
8181
assertThat(imports).containsExactly(
82-
"org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration",
82+
"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration",
8383
"org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration");
8484
}
8585

@@ -89,8 +89,8 @@ void importsSelectedFromImportsFileIgnoreMissingOptionalClasses() throws Excepti
8989
FromImportsFileIgnoresMissingOptionalClasses.class);
9090
String[] imports = this.importSelector.selectImports(annotationMetadata);
9191
assertThat(imports).containsExactly(
92-
"org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration",
93-
"org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration");
92+
"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration",
93+
"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$AnotherImportedAutoConfiguration");
9494
}
9595

9696
@Test
@@ -356,4 +356,14 @@ protected Collection<String> loadFactoryNames(Class<?> source) {
356356

357357
}
358358

359+
@AutoConfiguration
360+
static class ImportedAutoConfiguration {
361+
362+
}
363+
364+
@AutoConfiguration
365+
static class AnotherImportedAutoConfiguration {
366+
367+
}
368+
359369
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
package org.springframework.boot.autoconfigure.condition;
1818

19-
import java.util.ArrayList;
2019
import java.util.Iterator;
21-
import java.util.List;
2220
import java.util.Map;
2321

2422
import org.junit.jupiter.api.BeforeEach;
@@ -31,6 +29,7 @@
3129
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
3230
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcome;
3331
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcomes;
32+
import org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration;
3433
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage;
3534
import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
@@ -184,24 +183,6 @@ void testDuplicateConditionAndOutcomes() {
184183
assertThat(outcomes).hasSize(2);
185184
}
186185

187-
@Test
188-
void duplicateOutcomes() {
189-
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(DuplicateConfig.class);
190-
ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
191-
String autoconfigKey = MultipartAutoConfiguration.class.getName();
192-
ConditionAndOutcomes outcomes = report.getConditionAndOutcomesBySource().get(autoconfigKey);
193-
assertThat(outcomes).isNotNull();
194-
assertThat(outcomes).hasSize(2);
195-
List<String> messages = new ArrayList<>();
196-
for (ConditionAndOutcome outcome : outcomes) {
197-
messages.add(outcome.getOutcome().getMessage());
198-
}
199-
assertThat(messages).anyMatch((message) -> message.contains("@ConditionalOnClass found required classes "
200-
+ "'jakarta.servlet.Servlet', 'org.springframework.web.multipart."
201-
+ "support.StandardServletMultipartResolver', 'jakarta.servlet.MultipartConfigElement'"));
202-
context.close();
203-
}
204-
205186
@Test
206187
void negativeOuterPositiveInnerBean() {
207188
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -220,13 +201,13 @@ void negativeOuterPositiveInnerBean() {
220201
@Test
221202
void reportWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
222203
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
223-
context.register(WebMvcAutoConfiguration.class,
204+
context.register(UniqueShortNameAutoConfiguration.class,
224205
org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration.class,
225206
org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration.class);
226207
context.refresh();
227208
ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
228209
assertThat(report.getConditionAndOutcomesBySource()).containsKeys(
229-
"org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration",
210+
"org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration",
230211
"org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration",
231212
"org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration");
232213
context.close();
@@ -235,17 +216,17 @@ void reportWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
235216
@Test
236217
void reportMessageWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
237218
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
238-
context.register(WebMvcAutoConfiguration.class,
219+
context.register(UniqueShortNameAutoConfiguration.class,
239220
org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration.class,
240221
org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration.class);
241222
context.refresh();
242223
ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
243224
String reportMessage = new ConditionEvaluationReportMessage(report).toString();
244-
assertThat(reportMessage).contains("WebMvcAutoConfiguration",
225+
assertThat(reportMessage).contains("UniqueShortNameAutoConfiguration",
245226
"org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration",
246227
"org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration");
247228
assertThat(reportMessage)
248-
.doesNotContain("org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration");
229+
.doesNotContain("org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration");
249230
context.close();
250231
}
251232

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/config/UniqueShortNameAutoConfiguration.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright 2012-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.autoconfigure.condition.config;
18+
19+
import org.springframework.boot.autoconfigure.AutoConfiguration;
20+
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
21+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
22+
23+
/**
24+
* Uniquely named auto-configuration for {@link ConditionEvaluationReport} tests.
25+
*
26+
* @author Andy Wilkinson
27+
*/
28+
@AutoConfiguration
29+
@ConditionalOnProperty("unique")
30+
public class UniqueShortNameAutoConfiguration {
31+
32+
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration
1+
org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
22
org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFileIgnoresMissingOptionalClasses.imports‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
optional:org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration
1+
optional:org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
22
optional:org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
3-
org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration
3+
org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$AnotherImportedAutoConfiguration

0 commit comments

Comments
 (0)