Browse Source

Include checking of AutoConfigure….imports in check lifecycle

See gh-47322
pull/47549/head
Andy Wilkinson 2 months ago
parent
commit
fd2b29d3cc
  1. 8
      buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestAutoConfigurationPlugin.java
  2. 4
      module/spring-boot-security-test/src/main/java/org/springframework/boot/security/test/autoconfigure/webflux/SecurityWebTestClientAutoConfiguration.java
  3. 1
      module/spring-boot-webmvc-test/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureRestTestClient.imports

8
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestAutoConfigurationPlugin.java

@ -22,6 +22,8 @@ import org.gradle.api.file.ConfigurableFileCollection; @@ -22,6 +22,8 @@ import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskProvider;
import org.gradle.language.base.plugins.LifecycleBasePlugin;
/**
* {@link Plugin} for projects that define test auto-configuration. When the
@ -39,7 +41,8 @@ public class TestAutoConfigurationPlugin implements Plugin<Project> { @@ -39,7 +41,8 @@ public class TestAutoConfigurationPlugin implements Plugin<Project> {
@Override
public void apply(Project target) {
target.getPlugins().withType(JavaPlugin.class, (plugin) -> {
target.getTasks().register("checkAutoConfigureImports", CheckAutoConfigureImports.class, (task) -> {
TaskProvider<CheckAutoConfigureImports> checkAutoConfigureImports = target.getTasks()
.register("checkAutoConfigureImports", CheckAutoConfigureImports.class, (task) -> {
SourceSet mainSourceSet = target.getExtensions()
.getByType(JavaPluginExtension.class)
.getSourceSets()
@ -49,6 +52,9 @@ public class TestAutoConfigurationPlugin implements Plugin<Project> { @@ -49,6 +52,9 @@ public class TestAutoConfigurationPlugin implements Plugin<Project> {
target.getConfigurations().getByName(mainSourceSet.getRuntimeClasspathConfigurationName()));
task.setClasspath(classpath);
});
target.getTasks()
.named(LifecycleBasePlugin.CHECK_TASK_NAME)
.configure((check) -> check.dependsOn(checkAutoConfigureImports));
});
}

4
module/spring-boot-security-test/src/main/java/org/springframework/boot/security/test/autoconfigure/webflux/SecurityWebTestClientAutoConfiguration.java

@ -16,9 +16,9 @@ @@ -16,9 +16,9 @@
package org.springframework.boot.security.test.autoconfigure.webflux;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
import org.springframework.test.web.reactive.server.MockServerConfigurer;
import org.springframework.test.web.reactive.server.WebTestClient;
@ -29,7 +29,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @@ -29,7 +29,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
* @author Madhura Bhave
* @since 4.0.0
*/
@Configuration(proxyBeanMethods = false)
@AutoConfiguration
@ConditionalOnClass(SecurityMockServerConfigurers.class)
public final class SecurityWebTestClientAutoConfiguration {

1
module/spring-boot-webmvc-test/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureRestTestClient.imports

@ -1 +0,0 @@ @@ -1 +0,0 @@
org.springframework.boot.testrestclient.autoconfigure.RestTestClientAutoConfiguration
Loading…
Cancel
Save