Restore support for Jackson 2 in slice tests

This commit restores the support of Jackson 2 in @WebMvcTest,
@WebFluxTest, @restclienttest, and @graphqltest.

Closes gh-47869

Author: snicoll

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/spring-boot-applications.adoc

@@ -296,6 +296,7 @@ To test that object JSON serialization and deserialization is working as expecte
 javadoc:org.springframework.boot.json.test.autoconfigure.JsonTest[format=annotation] auto-configures the available supported JSON mapper, which can be one of the following libraries:
 
 * Jackson javadoc:tools.jackson.databind.JsonMapper[], any javadoc:org.springframework.boot.jackson.JacksonComponent[format=annotation] beans and any Jackson javadoc:tools.jackson.databind.JacksonModule[]
+* Jackson 2 (deprecated) javadoc:com.fasterxml.jackson.databind.ObjectMapper[], any javadoc:org.springframework.boot.jackson2.JsonComponent[format=annotation] beans and any Jackson javadoc:com.fasterxml.jackson.databind.Module[]
 * `Gson`
 * `Jsonb`
 
@@ -325,7 +326,7 @@ include-code::MyJsonAssertJTests[tag=*]
 == Auto-configured Spring MVC Tests
 
 To test whether Spring MVC controllers are working as expected, use the javadoc:org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest[format=annotation] annotation from the `spring-boot-webmvc-test` module.
-javadoc:org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest[format=annotation] auto-configures the Spring MVC infrastructure and limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation], javadoc:org.springframework.web.bind.annotation.ControllerAdvice[format=annotation], javadoc:org.springframework.boot.jackson.JacksonComponent[format=annotation], javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[], javadoc:jakarta.servlet.Filter[], javadoc:org.springframework.web.servlet.HandlerInterceptor[], javadoc:org.springframework.web.servlet.config.annotation.WebMvcConfigurer[], javadoc:org.springframework.boot.webmvc.autoconfigure.WebMvcRegistrations[], and javadoc:org.springframework.web.method.support.HandlerMethodArgumentResolver[].
+javadoc:org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest[format=annotation] auto-configures the Spring MVC infrastructure and limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation],  javadoc:org.springframework.web.bind.annotation.ControllerAdvice[format=annotation], javadoc:org.springframework.boot.jackson.JacksonComponent[format=annotation], javadoc:org.springframework.boot.jackson2.JsonComponent[format=annotation] (deprecated), javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[], javadoc:jakarta.servlet.Filter[], javadoc:org.springframework.web.servlet.HandlerInterceptor[], javadoc:org.springframework.web.servlet.config.annotation.WebMvcConfigurer[], javadoc:org.springframework.boot.webmvc.autoconfigure.WebMvcRegistrations[], and javadoc:org.springframework.web.method.support.HandlerMethodArgumentResolver[].
 Regular javadoc:org.springframework.stereotype.Component[format=annotation] and javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans are not scanned when the javadoc:org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest[format=annotation] annotation is used.
 javadoc:org.springframework.boot.context.properties.EnableConfigurationProperties[format=annotation] can be used to include javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans.
 
@@ -369,7 +370,7 @@ TIP: Sometimes writing Spring MVC tests is not enough; Spring Boot can help you
 == Auto-configured Spring WebFlux Tests
 
 To test that {url-spring-framework-docs}/web-reactive.html[Spring WebFlux] controllers are working as expected, you can use the javadoc:org.springframework.boot.webflux.test.autoconfigure.WebFluxTest[format=annotation] annotation from the `spring-boot-webflux-test` module.
-javadoc:org.springframework.boot.webflux.test.autoconfigure.WebFluxTest[format=annotation] auto-configures the Spring WebFlux infrastructure and limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation], javadoc:org.springframework.web.bind.annotation.ControllerAdvice[format=annotation], javadoc:org.springframework.boot.jackson.JacksonComponent[format=annotation], javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[] and javadoc:org.springframework.web.reactive.config.WebFluxConfigurer[].
+javadoc:org.springframework.boot.webflux.test.autoconfigure.WebFluxTest[format=annotation] auto-configures the Spring WebFlux infrastructure and limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation], javadoc:org.springframework.web.bind.annotation.ControllerAdvice[format=annotation], javadoc:org.springframework.boot.jackson.JacksonComponent[format=annotation], javadoc:org.springframework.boot.jackson2.JsonComponent[format=annotation] (deprecated), javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[] and javadoc:org.springframework.web.reactive.config.WebFluxConfigurer[].
 Regular javadoc:org.springframework.stereotype.Component[format=annotation] and javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans are not scanned when the javadoc:org.springframework.boot.webflux.test.autoconfigure.WebFluxTest[format=annotation] annotation is used.
 javadoc:org.springframework.boot.context.properties.EnableConfigurationProperties[format=annotation] can be used to include javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans.
 
@@ -440,7 +441,7 @@ There are javadoc:org.springframework.graphql.test.tester.GraphQlTester[] varian
 
 Spring Boot helps you to test your {url-spring-graphql-docs}/controllers.html[Spring GraphQL Controllers] with the javadoc:org.springframework.boot.graphql.test.autoconfigure.GraphQlTest[format=annotation] annotation from the `spring-boot-graphql-test` module.
 javadoc:org.springframework.boot.graphql.test.autoconfigure.GraphQlTest[format=annotation] auto-configures the Spring GraphQL infrastructure, without any transport nor server being involved.
-This limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation], javadoc:org.springframework.graphql.execution.RuntimeWiringConfigurer[], javadoc:org.springframework.boot.jackson.JacksonComponent[], javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[], javadoc:org.springframework.graphql.execution.DataFetcherExceptionResolver[], javadoc:graphql.execution.instrumentation.Instrumentation[] and javadoc:org.springframework.boot.graphql.autoconfigure.GraphQlSourceBuilderCustomizer[].
+This limits scanned beans to javadoc:org.springframework.stereotype.Controller[format=annotation], javadoc:org.springframework.graphql.execution.RuntimeWiringConfigurer[], javadoc:org.springframework.boot.jackson.JacksonComponent[], javadoc:org.springframework.boot.jackson2.JsonComponent[format=annotation] (deprecated), javadoc:org.springframework.core.convert.converter.Converter[], javadoc:org.springframework.core.convert.converter.GenericConverter[], javadoc:org.springframework.graphql.execution.DataFetcherExceptionResolver[], javadoc:graphql.execution.instrumentation.Instrumentation[] and javadoc:org.springframework.boot.graphql.autoconfigure.GraphQlSourceBuilderCustomizer[].
 Regular javadoc:org.springframework.stereotype.Component[format=annotation] and javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans are not scanned when the javadoc:org.springframework.boot.graphql.test.autoconfigure.GraphQlTest[format=annotation] annotation is used.
 javadoc:org.springframework.boot.context.properties.EnableConfigurationProperties[format=annotation] can be used to include javadoc:org.springframework.boot.context.properties.ConfigurationProperties[format=annotation] beans.
 

module/spring-boot-graphql-test/build.gradle

@@ -31,6 +31,7 @@ dependencies {
 	implementation(project(":module:spring-boot-jackson"))
 
 	optional(project(":core:spring-boot-autoconfigure"))
+	optional(project(":module:spring-boot-jackson2"))
 	optional(project(":module:spring-boot-validation"))
 	optional(project(":module:spring-boot-webclient"))
 	optional(project(":module:spring-boot-webmvc-test"))

module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTest.java

@@ -48,6 +48,7 @@
  * <li>{@code @Controller}
  * <li>{@code RuntimeWiringConfigurer}
  * <li>{@code @JacksonComponent}
+ * <li>{@code @JsonComponent} (deprecated)
  * <li>{@code Converter}
  * <li>{@code GenericConverter}
  * <li>{@code DataFetcherExceptionResolver}
@@ -122,9 +123,9 @@
 	 * {@link SpringBootApplication @SpringBootApplication}. By default, only
 	 * {@code @Controller} (when no explicit {@link #controllers() controllers} are
 	 * defined), {@code RuntimeWiringConfigurer}, {@code @JacksonComponent},
-	 * {@code Converter}, {@code GenericConverter}, {@code DataFetcherExceptionResolver},
-	 * {@code Instrumentation} and {@code GraphQlSourceBuilderCustomizer} beans are
-	 * included.
+	 * {@code @JsonComponent} (deprecated), {@code Converter}, {@code GenericConverter},
+	 * {@code DataFetcherExceptionResolver}, {@code Instrumentation} and
+	 * {@code GraphQlSourceBuilderCustomizer} beans are included.
 	 * @see #includeFilters()
 	 * @see #excludeFilters()
 	 * @return if default filters should be used

module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilter.java

@@ -44,7 +44,8 @@ class GraphQlTypeExcludeFilter extends StandardAnnotationCustomizableTypeExclude
 
 	private static final Class<?>[] NO_CONTROLLERS = {};
 
-	private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule" };
+	private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule",
+			"com.fasterxml.jackson.databind.Module", "org.springframework.boot.jackson2.JsonComponent" };
 
 	private static final Set<Class<?>> KNOWN_INCLUDES;
 

module/spring-boot-graphql-test/src/test/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilterTests.java

@@ -197,7 +197,6 @@ public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain
 
 	}
 
-	@SuppressWarnings("serial")
 	static class ExampleModule extends SimpleModule {
 
 	}

module/spring-boot-restclient-test/build.gradle

@@ -29,6 +29,7 @@ dependencies {
 
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-jackson"))
+	optional(project(":module:spring-boot-jackson2"))
 	optional(project(":module:spring-boot-restclient"))
 	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.junit.jupiter:junit-jupiter-api")

module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTest.java

@@ -46,11 +46,13 @@
  * tests. Similarly, component scanning is limited to beans annotated with:
  * <ul>
  * <li>{@code @JacksonComponent}</li>
+ * <li>{@code @JsonComponent}(deprecated)</li>
  * </ul>
  * <p>
  * as well as beans that implement:
  * <ul>
  * <li>{@code JacksonModule}, if Jackson is available</li>
+ * <li>{@code Module}, if Jackson 2 is available (deprecated)</li>
  * </ul>
  * <p>
  * By default, tests annotated with {@code RestClientTest} will also auto-configure a

module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTypeExcludeFilter.java

@@ -22,7 +22,6 @@
 import java.util.Set;
 
 import org.springframework.boot.context.TypeExcludeFilter;
-import org.springframework.boot.jackson.JacksonComponent;
 import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter;
 import org.springframework.util.ClassUtils;
 
@@ -35,21 +34,21 @@ class RestClientTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcl
 
 	private static final Class<?>[] NO_COMPONENTS = {};
 
-	private static final String DATABIND_MODULE_CLASS_NAME = "tools.jackson.databind.JacksonModule";
+	private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule",
+			"org.springframework.boot.jackson.JacksonComponent", "com.fasterxml.jackson.databind.Module",
+			"org.springframework.boot.jackson2.JsonComponent" };
 
 	private static final Set<Class<?>> KNOWN_INCLUDES;
 
 	static {
 		Set<Class<?>> includes = new LinkedHashSet<>();
-		if (ClassUtils.isPresent(DATABIND_MODULE_CLASS_NAME, RestClientTypeExcludeFilter.class.getClassLoader())) {
+		for (String optionalInclude : OPTIONAL_INCLUDES) {
 			try {
-				includes.add(Class.forName(DATABIND_MODULE_CLASS_NAME, true,
-						RestClientTypeExcludeFilter.class.getClassLoader()));
+				includes.add(ClassUtils.forName(optionalInclude, null));
 			}
-			catch (ClassNotFoundException ex) {
-				throw new IllegalStateException("Failed to load " + DATABIND_MODULE_CLASS_NAME, ex);
+			catch (Exception ex) {
+				// Ignore
 			}
-			includes.add(JacksonComponent.class);
 		}
 		KNOWN_INCLUDES = Collections.unmodifiableSet(includes);
 	}

module/spring-boot-webflux-test/build.gradle

@@ -31,6 +31,7 @@ dependencies {
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":module:spring-boot-http-codec"))
 	optional(project(":module:spring-boot-jackson"))
+	optional(project(":module:spring-boot-jackson2"))
 	optional(project(":module:spring-boot-validation"))
 	optional("org.junit.jupiter:junit-jupiter-api")
 

module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java

@@ -50,6 +50,7 @@
  * <li>{@code @Controller}</li>
  * <li>{@code @ControllerAdvice}</li>
  * <li>{@code @JacksonComponent}</li>
+ * <li>{@code @JsonComponent} (Jackson 2, deprecated)</li>
  * </ul>
  * <p>
  * as well as beans that implement:
@@ -58,6 +59,7 @@
  * <li>{@code GenericConverter}</li>
  * <li>{@code IDialect}, if Thymeleaf is available</li>
  * <li>{@code JacksonModule}, if Jackson is available</li>
+ * <li>{@code Module}, if Jackson 2 is available (deprecated)</li>
  * <li>{@code WebExceptionHandler}</li>
  * <li>{@code WebFluxConfigurer}</li>
  * <li>{@code WebFilter}</li>