fixup! Add Jackson2Tester support

Author: wilkinsona

core/spring-boot-test/src/main/java/org/springframework/boot/test/json/Jackson2Tester.java

@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
@@ -35,16 +34,16 @@
 import org.springframework.util.Assert;
 
 /**
- * AssertJ based JSON tester backed by Jackson. Usually instantiated via
- * {@link #initFields(Object, JsonMapper)}, for example: <pre class="code">
+ * AssertJ based JSON tester backed by Jackson 2. Usually instantiated via
+ * {@link #initFields(Object, ObjectMapper)}, for example: <pre class="code">
  * public class ExampleObjectJsonTests {
  *
- *     private JacksonTester&lt;ExampleObject&gt; json;
+ *     private Jackson2Tester&lt;ExampleObject&gt; json;
  *
  *     &#064;Before
  *     public void setup() {
- *         JsonMapper jsonMapper = new JsonMapper();
- *         JacksonTester.initFields(this, jsonMapper);
+ *         ObjectMapper objectMapper = new ObjectMapper();
+ *         JacksonTester.initFields(this, objectMapper);
  *     }
  *
  *     &#064;Test
@@ -156,24 +155,22 @@ private JavaType getType(ResolvableType type) {
 	 * Utility method to initialize {@link Jackson2Tester} fields. See
 	 * {@link Jackson2Tester class-level documentation} for example usage.
 	 * @param testInstance the test instance
-	 * @param jsonMapper the JSON mapper
-	 * @since 4.0.0
-	 * @see #initFields(Object, JsonMapper)
+	 * @param objectMapper the JSON mapper
+	 * @see #initFields(Object, ObjectMapper)
 	 */
-	public static void initFields(Object testInstance, JsonMapper jsonMapper) {
-		new Jackson2FieldInitializer().initFields(testInstance, jsonMapper);
+	public static void initFields(Object testInstance, ObjectMapper objectMapper) {
+		new Jackson2FieldInitializer().initFields(testInstance, objectMapper);
 	}
 
 	/**
 	 * Utility method to initialize {@link Jackson2Tester} fields. See
 	 * {@link Jackson2Tester class-level documentation} for example usage.
 	 * @param testInstance the test instance
-	 * @param jsonMapperFactory a factory to create the JSON mapper
-	 * @since 4.0.0
-	 * @see #initFields(Object, JsonMapper)
+	 * @param objectMapperFactory a factory to create the object mapper
+	 * @see #initFields(Object, ObjectMapper)
 	 */
-	public static void initFields(Object testInstance, ObjectFactory<JsonMapper> jsonMapperFactory) {
-		new Jackson2FieldInitializer().initFields(testInstance, jsonMapperFactory);
+	public static void initFields(Object testInstance, ObjectFactory<ObjectMapper> objectMapperFactory) {
+		new Jackson2FieldInitializer().initFields(testInstance, objectMapperFactory);
 	}
 
 	/**
@@ -193,15 +190,15 @@ public Jackson2Tester<T> forView(Class<?> view) {
 	/**
 	 * {@link FieldInitializer} for Jackson.
 	 */
-	private static class Jackson2FieldInitializer extends FieldInitializer<JsonMapper> {
+	private static class Jackson2FieldInitializer extends FieldInitializer<ObjectMapper> {
 
 		protected Jackson2FieldInitializer() {
 			super(Jackson2Tester.class);
 		}
 
 		@Override
 		protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadClass, ResolvableType type,
-				JsonMapper marshaller) {
+				ObjectMapper marshaller) {
 			return new Jackson2Tester<>(resourceLoadClass, type, marshaller);
 		}
 

core/spring-boot-test/src/test/java/org/springframework/boot/test/json/Jackson2TesterTests.java

@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
@@ -40,15 +40,15 @@ class Jackson2TesterTests extends AbstractJsonMarshalTesterTests {
 	@Test
 	@SuppressWarnings("NullAway") // Test null check
 	void initFieldsWhenTestIsNullShouldThrowException() {
-		assertThatIllegalArgumentException().isThrownBy(() -> Jackson2Tester.initFields(null, new JsonMapper()))
+		assertThatIllegalArgumentException().isThrownBy(() -> Jackson2Tester.initFields(null, new ObjectMapper()))
 			.withMessageContaining("'testInstance' must not be null");
 	}
 
 	@Test
 	@SuppressWarnings("NullAway") // Test null check
 	void initFieldsWhenMarshallerIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> Jackson2Tester.initFields(new InitFieldsTestClass(), (JsonMapper) null))
+			.isThrownBy(() -> Jackson2Tester.initFields(new InitFieldsTestClass(), (ObjectMapper) null))
 			.withMessageContaining("'marshaller' must not be null");
 	}
 
@@ -57,7 +57,7 @@ void initFieldsShouldSetNullFields() {
 		InitFieldsTestClass test = new InitFieldsTestClass();
 		assertThat(test.test).isNull();
 		assertThat(test.base).isNull();
-		Jackson2Tester.initFields(test, new JsonMapper());
+		Jackson2Tester.initFields(test, new ObjectMapper());
 		assertThat(test.test).isNotNull();
 		assertThat(test.base).isNotNull();
 		ResolvableType type = test.test.getType();
@@ -68,15 +68,15 @@ void initFieldsShouldSetNullFields() {
 
 	@Override
 	protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadClass, ResolvableType type) {
-		return new org.springframework.boot.test.json.Jackson2Tester<>(resourceLoadClass, type, new JsonMapper());
+		return new org.springframework.boot.test.json.Jackson2Tester<>(resourceLoadClass, type, new ObjectMapper());
 	}
 
 	abstract static class InitFieldsBaseClass {
 
 		public org.springframework.boot.test.json.@Nullable Jackson2Tester<ExampleObject> base;
 
 		public org.springframework.boot.test.json.Jackson2Tester<ExampleObject> baseSet = new org.springframework.boot.test.json.Jackson2Tester<>(
-				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class), new JsonMapper());
+				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class), new ObjectMapper());
 
 	}
 
@@ -85,7 +85,7 @@ static class InitFieldsTestClass extends InitFieldsBaseClass {
 		public org.springframework.boot.test.json.@Nullable Jackson2Tester<List<ExampleObject>> test;
 
 		public org.springframework.boot.test.json.Jackson2Tester<ExampleObject> testSet = new org.springframework.boot.test.json.Jackson2Tester<>(
-				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class), new JsonMapper());
+				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class), new ObjectMapper());
 
 	}