Browse Source

Don't require …TestAutoConfiguration classes in imports file

See gh-48822
pull/48875/head
Andy Wilkinson 2 weeks ago
parent
commit
e8cea82772
  1. 7
      buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/CheckAutoConfigurationClasses.java
  2. 6
      module/spring-boot-gson/build.gradle
  3. 6
      module/spring-boot-jackson/build.gradle
  4. 6
      module/spring-boot-jackson2/build.gradle
  5. 6
      module/spring-boot-jsonb/build.gradle
  6. 7
      module/spring-boot-resttestclient/build.gradle

7
buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/CheckAutoConfigurationClasses.java

@ -163,13 +163,14 @@ public abstract class CheckAutoConfigurationClasses extends AutoConfigurationImp @@ -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");
}

6
module/spring-boot-gson/build.gradle

@ -40,9 +40,3 @@ dependencies { @@ -40,9 +40,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.gson.autoconfigure.GsonTesterTestAutoConfiguration"
]
}

6
module/spring-boot-jackson/build.gradle

@ -44,9 +44,3 @@ dependencies { @@ -44,9 +44,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jackson.autoconfigure.JacksonTesterTestAutoConfiguration"
]
}

6
module/spring-boot-jackson2/build.gradle

@ -50,9 +50,3 @@ dependencies { @@ -50,9 +50,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jackson2.autoconfigure.Jackson2TesterTestAutoConfiguration"
]
}

6
module/spring-boot-jsonb/build.gradle

@ -41,9 +41,3 @@ dependencies { @@ -41,9 +41,3 @@ dependencies {
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("checkAutoConfigurationClasses") {
omittedFromImports = [
"org.springframework.boot.jsonb.autoconfigure.JsonbTesterTestAutoConfiguration"
]
}

7
module/spring-boot-resttestclient/build.gradle

@ -47,10 +47,3 @@ dependencies { @@ -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"
]
}

Loading…
Cancel
Save