spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
See gh-48823
This commit is contained in:
Andy Wilkinson
2026-01-15 12:02:55 +00:00
parent d15ce76b7b e8cea82772
commit e11994c54f
6 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/CheckAutoConfigurationClasses.java
+4 -3
View File
@@ -163,13 +163,14 @@ public abstract class CheckAutoConfigurationClasses extends AutoConfigurationImp
problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
.add("Name of a class annotated with @AutoConfiguration should end with AutoConfiguration");
}
boolean testAutoConfiguration = autoConfigurationClass.name().endsWith("TestAutoConfiguration");
if (!getOmittedFromImports().getOrElse(Collections.emptySet()).contains(autoConfigurationClass.name())
&& !imports.contains(autoConfigurationClass.name())) {
&& !imports.contains(autoConfigurationClass.name()) && !testAutoConfiguration) {
problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
.add("Class is not registered in AutoConfiguration.imports");
}
if (getOmittedFromImports().getOrElse(requiredClassNames).contains(autoConfigurationClass.name())
&& imports.contains(autoConfigurationClass.name())) {
if ((getOmittedFromImports().getOrElse(Collections.emptySet()).contains(autoConfigurationClass.name())
|| testAutoConfiguration) && imports.contains(autoConfigurationClass.name())) {
problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
.add("Class should not be registered in AutoConfiguration.imports");
}
module/spring-boot-gson/build.gradle
-6
View File
@@ -40,9 +40,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.gson.autoconfigure.GsonTesterTestAutoConfiguration"
]
}
module/spring-boot-jackson/build.gradle
-6
View File
@@ -44,9 +44,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jackson.autoconfigure.JacksonTesterTestAutoConfiguration"
]
}
module/spring-boot-jackson2/build.gradle
-6
View File
@@ -50,9 +50,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jackson2.autoconfigure.Jackson2TesterTestAutoConfiguration"
]
}
module/spring-boot-jsonb/build.gradle
-6
View File
@@ -41,9 +41,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jsonb.autoconfigure.JsonbTesterTestAutoConfiguration"
]
}
module/spring-boot-resttestclient/build.gradle
-7
View File
@@ -47,10 +47,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.resttestclient.autoconfigure.RestTestClientTestAutoConfiguration",
"org.springframework.boot.resttestclient.autoconfigure.TestRestTemplateTestAutoConfiguration"
]
}