Use JsonMapper instead of ObjectMapper when relevant

This commit updates Jackson 3 support to use JsonMapper instead
of ObjectMapper in converter, codec and view constructors.

Closes gh-35282

spring-jms/src/main/java/org/springframework/jms/support/converter/JacksonJsonMessageConverter.java

@@ -32,7 +32,6 @@ import jakarta.jms.Session;
 import jakarta.jms.TextMessage;
 import org.jspecify.annotations.Nullable;
 import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectWriter;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
@@ -63,7 +62,7 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 	public static final String DEFAULT_ENCODING = "UTF-8";
 
 
-	private final ObjectMapper objectMapper;
+	private final JsonMapper jsonMapper;
 
 	private MessageType targetType = MessageType.BYTES;
 
@@ -86,17 +85,17 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 	 * {@link MapperBuilder#findModules(ClassLoader)}.
 	 */
 	public JacksonJsonMessageConverter() {
-		this.objectMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
+		this.jsonMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(ObjectMapper objectMapper) {
+	public JacksonJsonMessageConverter(JsonMapper jsonMapper) {
-		Assert.notNull(objectMapper, "ObjectMapper must not be null");
+		Assert.notNull(jsonMapper, "JsonMapper must not be null");
-		this.objectMapper = objectMapper;
+		this.jsonMapper = jsonMapper;
 	}
 
 	/**
@@ -173,9 +172,9 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 		Message message;
 		try {
 			message = switch (this.targetType) {
-				case TEXT -> mapToTextMessage(object, session, this.objectMapper.writer());
+				case TEXT -> mapToTextMessage(object, session, this.jsonMapper.writer());
-				case BYTES -> mapToBytesMessage(object, session, this.objectMapper.writer());
+				case BYTES -> mapToBytesMessage(object, session, this.jsonMapper.writer());
-				default -> mapToMessage(object, session, this.objectMapper.writer(), this.targetType);
+				default -> mapToMessage(object, session, this.jsonMapper.writer(), this.targetType);
 			};
 		}
 		catch (IOException ex) {
@@ -206,10 +205,10 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 			throws JMSException, MessageConversionException {
 
 		if (jsonView != null) {
-			return toMessage(object, session, this.objectMapper.writerWithView(jsonView));
+			return toMessage(object, session, this.jsonMapper.writerWithView(jsonView));
 		}
 		else {
-			return toMessage(object, session, this.objectMapper.writer());
+			return toMessage(object, session, this.jsonMapper.writer());
 		}
 	}
 
@@ -363,7 +362,7 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 			throws JMSException, IOException {
 
 		String body = message.getText();
-		return this.objectMapper.readValue(body, targetJavaType);
+		return this.jsonMapper.readValue(body, targetJavaType);
 	}
 
 	/**
@@ -386,7 +385,7 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 		if (encoding != null) {
 			try {
 				String body = new String(bytes, encoding);
-				return this.objectMapper.readValue(body, targetJavaType);
+				return this.jsonMapper.readValue(body, targetJavaType);
 			}
 			catch (UnsupportedEncodingException ex) {
 				throw new MessageConversionException("Cannot convert bytes to String", ex);
@@ -394,7 +393,7 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 		}
 		else {
 			// Jackson internally performs encoding detection, falling back to UTF-8.
-			return this.objectMapper.readValue(bytes, targetJavaType);
+			return this.jsonMapper.readValue(bytes, targetJavaType);
 		}
 	}
 
@@ -437,11 +436,11 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 		}
 		Class<?> mappedClass = this.idClassMappings.get(typeId);
 		if (mappedClass != null) {
-			return this.objectMapper.constructType(mappedClass);
+			return this.jsonMapper.constructType(mappedClass);
 		}
 		try {
 			Class<?> typeClass = ClassUtils.forName(typeId, this.beanClassLoader);
-			return this.objectMapper.constructType(typeClass);
+			return this.jsonMapper.constructType(typeClass);
 		}
 		catch (Throwable ex) {
 			throw new MessageConversionException("Failed to resolve type id [" + typeId + "]", ex);

spring-messaging/src/main/java/org/springframework/messaging/converter/JacksonJsonMessageConverter.java

@@ -27,7 +27,6 @@ import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonEncoding;
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -52,7 +51,7 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 	private static final MimeType[] DEFAULT_MIME_TYPES = new MimeType[] {
 			new MimeType("application", "json"), new MimeType("application", "*+json")};
 
-	private final ObjectMapper objectMapper;
+	private final JsonMapper jsonMapper;
 
 
 	/**
@@ -73,35 +72,35 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 	 */
 	public JacksonJsonMessageConverter(MimeType... supportedMimeTypes) {
 		super(supportedMimeTypes);
-		this.objectMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
+		this.jsonMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(ObjectMapper objectMapper) {
+	public JacksonJsonMessageConverter(JsonMapper jsonMapper) {
-		this(objectMapper, DEFAULT_MIME_TYPES);
+		this(jsonMapper, DEFAULT_MIME_TYPES);
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper} and the
+	 * Construct a new instance with the provided {@link JsonMapper} and the
 	 * provided {@link MimeType}s.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(ObjectMapper objectMapper, MimeType... supportedMimeTypes) {
+	public JacksonJsonMessageConverter(JsonMapper jsonMapper, MimeType... supportedMimeTypes) {
 		super(supportedMimeTypes);
-		Assert.notNull(objectMapper, "ObjectMapper must not be null");
+		Assert.notNull(jsonMapper, "JsonMapper must not be null");
-		this.objectMapper = objectMapper;
+		this.jsonMapper = jsonMapper;
 	}
 
 	/**
-	 * Return the underlying {@code ObjectMapper} for this converter.
+	 * Return the underlying {@code JsonMapper} for this converter.
 	 */
-	protected ObjectMapper getObjectMapper() {
+	protected JsonMapper getJsonMapper() {
-		return this.objectMapper;
+		return this.jsonMapper;
 	}
 
 	@Override
@@ -122,7 +121,7 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 
 	@Override
 	protected @Nullable Object convertFromInternal(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) {
-		JavaType javaType = this.objectMapper.constructType(getResolvedType(targetClass, conversionHint));
+		JavaType javaType = this.jsonMapper.constructType(getResolvedType(targetClass, conversionHint));
 		Object payload = message.getPayload();
 		Class<?> view = getSerializationView(conversionHint);
 		try {
@@ -131,19 +130,19 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 			}
 			else if (payload instanceof byte[] bytes) {
 				if (view != null) {
-					return this.objectMapper.readerWithView(view).forType(javaType).readValue(bytes);
+					return this.jsonMapper.readerWithView(view).forType(javaType).readValue(bytes);
 				}
 				else {
-					return this.objectMapper.readValue(bytes, javaType);
+					return this.jsonMapper.readValue(bytes, javaType);
 				}
 			}
 			else {
 				// Assuming a text-based source payload
 				if (view != null) {
-					return this.objectMapper.readerWithView(view).forType(javaType).readValue(payload.toString());
+					return this.jsonMapper.readerWithView(view).forType(javaType).readValue(payload.toString());
 				}
 				else {
-					return this.objectMapper.readValue(payload.toString(), javaType);
+					return this.jsonMapper.readValue(payload.toString(), javaType);
 				}
 			}
 		}
@@ -161,12 +160,12 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 			if (byte[].class == getSerializedPayloadClass()) {
 				ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
 				JsonEncoding encoding = getJsonEncoding(getMimeType(headers));
-				try (JsonGenerator generator = this.objectMapper.createGenerator(out, encoding)) {
+				try (JsonGenerator generator = this.jsonMapper.createGenerator(out, encoding)) {
 					if (view != null) {
-						this.objectMapper.writerWithView(view).writeValue(generator, payload);
+						this.jsonMapper.writerWithView(view).writeValue(generator, payload);
 					}
 					else {
-						this.objectMapper.writeValue(generator, payload);
+						this.jsonMapper.writeValue(generator, payload);
 					}
 					payload = out.toByteArray();
 				}
@@ -175,10 +174,10 @@ public class JacksonJsonMessageConverter extends AbstractMessageConverter {
 				// Assuming a text-based target payload
 				Writer writer = new StringWriter(1024);
 				if (view != null) {
-					this.objectMapper.writerWithView(view).writeValue(writer, payload);
+					this.jsonMapper.writerWithView(view).writeValue(writer, payload);
 				}
 				else {
-					this.objectMapper.writeValue(writer, payload);
+					this.jsonMapper.writeValue(writer, payload);
 				}
 				payload = writer.toString();
 			}

spring-test/src/test/java/org/springframework/test/json/AbstractJsonContentAssertTests.java

@@ -45,7 +45,7 @@ import org.junit.jupiter.params.provider.ValueSource;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 import org.skyscreamer.jsonassert.JSONCompareResult;
 import org.skyscreamer.jsonassert.comparator.JSONComparator;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
@@ -86,7 +86,7 @@ class AbstractJsonContentAssertTests {
 	private static final String DIFFERENT = loadJson("different.json");
 
 	private static final HttpMessageContentConverter jsonContentConverter = HttpMessageContentConverter.of(
-			new JacksonJsonHttpMessageConverter(new ObjectMapper()));
+			new JacksonJsonHttpMessageConverter(new JsonMapper()));
 
 	private static final JsonComparator comparator = JsonAssert.comparator(JsonCompareMode.LENIENT);
 

spring-test/src/test/java/org/springframework/test/json/JsonPathValueAssertTests.java

@@ -27,7 +27,7 @@ import org.assertj.core.data.Offset;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.test.http.HttpMessageContentConverter;
@@ -206,7 +206,7 @@ class JsonPathValueAssertTests {
 	class ConvertToTests {
 
 		private static final HttpMessageContentConverter jsonContentConverter = HttpMessageContentConverter.of(
-				new JacksonJsonHttpMessageConverter(new ObjectMapper()));
+				new JacksonJsonHttpMessageConverter(new JsonMapper()));
 
 		@Test
 		void convertToWithoutHttpMessageConverter() {

spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java

@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.core.ParameterizedTypeReference;
 
@@ -385,14 +385,14 @@ class JsonPathExpectationsHelperTests {
 	 */
 	private static class JacksonMappingProvider implements MappingProvider {
 
-		private final ObjectMapper objectMapper;
+		private final JsonMapper jsonMapper;
 
 		public JacksonMappingProvider() {
-			this(new ObjectMapper());
+			this(new JsonMapper());
 		}
 
-		public JacksonMappingProvider(ObjectMapper objectMapper) {
+		public JacksonMappingProvider(JsonMapper jsonMapper) {
-			this.objectMapper = objectMapper;
+			this.jsonMapper = jsonMapper;
 		}
 
 
@@ -402,7 +402,7 @@ class JsonPathExpectationsHelperTests {
 				return null;
 			}
 			try {
-				return objectMapper.convertValue(source, targetType);
+				return jsonMapper.convertValue(source, targetType);
 			}
 			catch (Exception ex) {
 				throw new MappingException(ex);
@@ -416,10 +416,10 @@ class JsonPathExpectationsHelperTests {
 			if (source == null){
 				return null;
 			}
-			JavaType type = objectMapper.getTypeFactory().constructType(targetType.getType());
+			JavaType type = jsonMapper.getTypeFactory().constructType(targetType.getType());
 
 			try {
-				return (T) objectMapper.convertValue(source, type);
+				return (T) jsonMapper.convertValue(source, type);
 			}
 			catch (Exception ex) {
 				throw new MappingException(ex);

spring-test/src/test/java/org/springframework/test/web/reactive/server/EncoderDecoderMappingProviderTests.java

@@ -22,7 +22,7 @@ import java.util.Map;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.TypeRef;
 import org.junit.jupiter.api.Test;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.http.codec.json.JacksonJsonDecoder;
 import org.springframework.http.codec.json.JacksonJsonEncoder;
@@ -36,10 +36,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 class EncoderDecoderMappingProviderTests {
 
-	private static final ObjectMapper objectMapper = new ObjectMapper();
+	private static final JsonMapper jsonMapper = new JsonMapper();
 
 	private final EncoderDecoderMappingProvider mappingProvider = new EncoderDecoderMappingProvider(
-			new JacksonJsonEncoder(objectMapper), new JacksonJsonDecoder(objectMapper));
+			new JacksonJsonEncoder(jsonMapper), new JacksonJsonDecoder(jsonMapper));
 
 
 	@Test

spring-test/src/test/java/org/springframework/test/web/reactive/server/JsonEncoderDecoderTests.java

@@ -19,7 +19,7 @@ package org.springframework.test.web.reactive.server;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
@@ -39,13 +39,13 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 class JsonEncoderDecoderTests {
 
-	private static final ObjectMapper objectMapper = new ObjectMapper();
+	private static final JsonMapper jsonMapper = new JsonMapper();
 
 	private static final HttpMessageWriter<?> jacksonMessageWriter = new EncoderHttpMessageWriter<>(
-			new JacksonJsonEncoder(objectMapper));
+			new JacksonJsonEncoder(jsonMapper));
 
 	private static final HttpMessageReader<?> jacksonMessageReader = new DecoderHttpMessageReader<>(
-			new JacksonJsonDecoder(objectMapper));
+			new JacksonJsonDecoder(jsonMapper));
 
 	@Test
 	void fromWithEmptyWriters() {

spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java

@@ -25,7 +25,6 @@ import java.util.Map;
 import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -73,20 +72,20 @@ public class JacksonJsonDecoder extends AbstractJacksonDecoder {
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonDecoder(ObjectMapper mapper) {
+	public JacksonJsonDecoder(JsonMapper mapper) {
 		this(mapper, DEFAULT_JSON_MIME_TYPES);
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper} and {@link MimeType}s.
+	 * Construct a new instance with the provided {@link JsonMapper} and {@link MimeType}s.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonDecoder(ObjectMapper mapper, MimeType... mimeTypes) {
+	public JacksonJsonDecoder(JsonMapper mapper, MimeType... mimeTypes) {
 		super(mapper, mimeTypes);
 	}
 

spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java

@@ -25,7 +25,6 @@ import reactor.core.publisher.Flux;
 import tools.jackson.core.PrettyPrinter;
 import tools.jackson.core.util.DefaultIndenter;
 import tools.jackson.core.util.DefaultPrettyPrinter;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectWriter;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.cfg.MapperBuilder;
@@ -80,21 +79,21 @@ public class JacksonJsonEncoder extends AbstractJacksonEncoder {
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonEncoder(ObjectMapper mapper) {
+	public JacksonJsonEncoder(JsonMapper mapper) {
 		this(mapper, DEFAULT_JSON_MIME_TYPES);
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper} and
+	 * Construct a new instance with the provided {@link JsonMapper} and
 	 * {@link MimeType}s.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonEncoder(ObjectMapper mapper, MimeType... mimeTypes) {
+	public JacksonJsonEncoder(JsonMapper mapper, MimeType... mimeTypes) {
 		super(mapper, mimeTypes);
 		setStreamingMediaTypes(List.of(MediaType.APPLICATION_NDJSON));
 		this.ssePrettyPrinter = initSsePrettyPrinter();

spring-web/src/main/java/org/springframework/http/converter/json/JacksonJsonHttpMessageConverter.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.jspecify.annotations.Nullable;
 import tools.jackson.core.JsonGenerator;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -32,7 +31,7 @@ import org.springframework.http.converter.AbstractJacksonHttpMessageConverter;
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter}
  * that can read and write JSON using <a href="https://github.com/FasterXML/jackson">Jackson 3.x's</a>
- * {@link ObjectMapper}.
+ * {@link JsonMapper}.
  *
  * <p>This converter can be used to bind to typed beans, or untyped
  * {@code HashMap} instances.
@@ -79,11 +78,11 @@ public class JacksonJsonHttpMessageConverter extends AbstractJacksonHttpMessageC
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonHttpMessageConverter(ObjectMapper objectMapper) {
+	public JacksonJsonHttpMessageConverter(JsonMapper objectMapper) {
 		super(objectMapper, DEFAULT_JSON_MIME_TYPES);
 	}
 

spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java

@@ -31,7 +31,6 @@ import reactor.test.StepVerifier;
 import tools.jackson.core.JsonParser;
 import tools.jackson.databind.DeserializationContext;
 import tools.jackson.databind.JsonNode;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.annotation.JsonDeserialize;
 import tools.jackson.databind.deser.std.StdDeserializer;
 import tools.jackson.databind.json.JsonMapper;
@@ -102,8 +101,8 @@ class JacksonJsonDecoderTests extends AbstractDecoderTests<JacksonJsonDecoder> {
 		assertThat(decoder.canDecode(ResolvableType.forClass(Map.class), MediaType.APPLICATION_JSON)).isTrue();
 
 		decoder.registerObjectMappersForType(Pojo.class, map -> {
-			map.put(halJsonMediaType, new ObjectMapper());
+			map.put(halJsonMediaType, new JsonMapper());
-			map.put(MediaType.APPLICATION_JSON, new ObjectMapper());
+			map.put(MediaType.APPLICATION_JSON, new JsonMapper());
 		});
 
 		assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), halJsonMediaType)).isTrue();
@@ -115,7 +114,7 @@ class JacksonJsonDecoderTests extends AbstractDecoderTests<JacksonJsonDecoder> {
 	@Test  // SPR-15866
 	void canDecodeWithProvidedMimeType() {
 		MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
-		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new ObjectMapper(), textJavascript);
+		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new JsonMapper(), textJavascript);
 
 		assertThat(decoder.getDecodableMimeTypes()).isEqualTo(Collections.singletonList(textJavascript));
 	}
@@ -124,7 +123,7 @@ class JacksonJsonDecoderTests extends AbstractDecoderTests<JacksonJsonDecoder> {
 	@SuppressWarnings("unchecked")
 	void decodableMimeTypesIsImmutable() {
 		MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
-		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new ObjectMapper(), textJavascript);
+		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new JsonMapper(), textJavascript);
 
 		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
 						decoder.getDecodableMimeTypes().add(new MimeType("text", "ecmascript")));
@@ -135,8 +134,8 @@ class JacksonJsonDecoderTests extends AbstractDecoderTests<JacksonJsonDecoder> {
 		MimeType mimeType1 = MediaType.parseMediaType("application/hal+json");
 		MimeType mimeType2 = new MimeType("text", "javascript", StandardCharsets.UTF_8);
 
-		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new ObjectMapper(), mimeType2);
+		JacksonJsonDecoder decoder = new JacksonJsonDecoder(new JsonMapper(), mimeType2);
-		decoder.registerObjectMappersForType(Pojo.class, map -> map.put(mimeType1, new ObjectMapper()));
+		decoder.registerObjectMappersForType(Pojo.class, map -> map.put(mimeType1, new JsonMapper()));
 
 		assertThat(decoder.getDecodableMimeTypes(ResolvableType.forClass(Pojo.class)))
 				.containsExactly(mimeType1);

spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java

@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -109,7 +108,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests<JacksonJsonEncoder> {
 	@Test  // SPR-15866
 	public void canEncodeWithCustomMimeType() {
 		MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
-		JacksonJsonEncoder encoder = new JacksonJsonEncoder(new ObjectMapper(), textJavascript);
+		JacksonJsonEncoder encoder = new JacksonJsonEncoder(new JsonMapper(), textJavascript);
 
 		assertThat(encoder.getEncodableMimeTypes()).isEqualTo(Collections.singletonList(textJavascript));
 	}
@@ -117,7 +116,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests<JacksonJsonEncoder> {
 	@Test
 	void encodableMimeTypesIsImmutable() {
 		MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8);
-		JacksonJsonEncoder encoder = new JacksonJsonEncoder(new ObjectMapper(), textJavascript);
+		JacksonJsonEncoder encoder = new JacksonJsonEncoder(new JsonMapper(), textJavascript);
 
 		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
 				encoder.getEncodableMimeTypes().add(new MimeType("text", "ecmascript")));
@@ -231,7 +230,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests<JacksonJsonEncoder> {
 
 	@Test  // gh-22771
 	public void encodeWithFlushAfterWriteOff() {
-		ObjectMapper mapper = JsonMapper.builder().configure(SerializationFeature.FLUSH_AFTER_WRITE_VALUE, false).build();
+		JsonMapper mapper = JsonMapper.builder().configure(SerializationFeature.FLUSH_AFTER_WRITE_VALUE, false).build();
 		JacksonJsonEncoder encoder = new JacksonJsonEncoder(mapper);
 
 		Flux<DataBuffer> result = encoder.encode(Flux.just(new Pojo("foo", "bar")), this.bufferFactory,

spring-web/src/test/java/org/springframework/http/converter/json/JacksonJsonHttpMessageConverterTests.java

@@ -365,7 +365,7 @@ class JacksonJsonHttpMessageConverterTests {
 		PrettyPrintBean bean = new PrettyPrintBean();
 		bean.setName("Jason");
 
-		ObjectMapper mapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
+		JsonMapper mapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
 		this.converter = new JacksonJsonHttpMessageConverter(mapper);
 		this.converter.write(bean, ResolvableType.forType(PrettyPrintBean.class),
 				MediaType.APPLICATION_JSON, outputMessage, null);
@@ -384,7 +384,7 @@ class JacksonJsonHttpMessageConverterTests {
 		PrettyPrintBean bean = new PrettyPrintBean();
 		bean.setName("Jason");
 
-		ObjectMapper mapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
+		JsonMapper mapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
 		this.converter = new JacksonJsonHttpMessageConverter(mapper);
 		this.converter.write(bean, ResolvableType.forType(PrettyPrintBean.class),
 				MediaType.APPLICATION_JSON, outputMessage, null);

spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/JacksonJsonView.java

@@ -24,7 +24,6 @@ import java.util.Set;
 import jakarta.servlet.http.HttpServletRequest;
 import org.jspecify.annotations.Nullable;
 import tools.jackson.core.JsonGenerator;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -35,7 +34,7 @@ import org.springframework.web.servlet.view.AbstractJacksonView;
 
 /**
  * Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using <a href="https://github.com/FasterXML/jackson">Jackson 3's</a> {@link ObjectMapper}.
+ * using <a href="https://github.com/FasterXML/jackson">Jackson 3's</a> {@link JsonMapper}.
  *
  * <p>By default, the entire contents of the model map (with the exception of framework-specific classes)
  * will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
@@ -79,11 +78,11 @@ public class JacksonJsonView extends AbstractJacksonView {
 	}
 
 	/**
-	 * Construct a new instance using the provided {@link ObjectMapper}
+	 * Construct a new instance using the provided {@link JsonMapper}
 	 * and setting the content type to {@value #DEFAULT_CONTENT_TYPE}.
 	 */
-	public JacksonJsonView(ObjectMapper objectMapper) {
+	public JacksonJsonView(JsonMapper jsonMapper) {
-		super(objectMapper, DEFAULT_CONTENT_TYPE);
+		super(jsonMapper, DEFAULT_CONTENT_TYPE);
 	}
 
 

spring-webmvc/src/test/java/org/springframework/web/servlet/function/SseServerResponseTests.java

@@ -24,7 +24,6 @@ import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -109,8 +108,8 @@ class SseServerResponseTests {
 			}
 		});
 
-		ObjectMapper objectMapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
+		JsonMapper jsonMapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).build();
-		JacksonJsonHttpMessageConverter converter = new JacksonJsonHttpMessageConverter(objectMapper);
+		JacksonJsonHttpMessageConverter converter = new JacksonJsonHttpMessageConverter(jsonMapper);
 		ServerResponse.Context context = () -> List.of(converter);
 
 		ModelAndView mav = response.writeTo(this.mockRequest, this.mockResponse, context);

spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/JacksonJsonViewTests.java

@@ -33,7 +33,6 @@ import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.BeanDescription;
 import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.ValueSerializer;
@@ -181,7 +180,7 @@ class JacksonJsonViewTests {
 	@Test
 	void renderWithCustomSerializerLocatedByFactory() throws Exception {
 		SerializerFactory factory = new DelegatingSerializerFactory(null);
-		ObjectMapper mapper = JsonMapper.builder().serializerFactory(factory).build();
+		JsonMapper mapper = JsonMapper.builder().serializerFactory(factory).build();
 		view = new JacksonJsonView(mapper);
 
 		Object bean = new TestBeanSimple();

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/JacksonJsonSockJsMessageCodec.java

@@ -20,7 +20,6 @@ import java.io.InputStream;
 
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import org.jspecify.annotations.Nullable;
-import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.json.JsonMapper;
 
@@ -37,7 +36,7 @@ import org.springframework.util.Assert;
  */
 public class JacksonJsonSockJsMessageCodec extends AbstractSockJsMessageCodec {
 
-	private final ObjectMapper objectMapper;
+	private final JsonMapper jsonMapper;
 
 
 	/**
@@ -46,28 +45,28 @@ public class JacksonJsonSockJsMessageCodec extends AbstractSockJsMessageCodec {
 	 * {@link MapperBuilder#findModules(ClassLoader)}.
 	 */
 	public JacksonJsonSockJsMessageCodec() {
-		this.objectMapper = JsonMapper.builder().findAndAddModules(JacksonJsonSockJsMessageCodec.class.getClassLoader()).build();
+		this.jsonMapper = JsonMapper.builder().findAndAddModules(JacksonJsonSockJsMessageCodec.class.getClassLoader()).build();
 	}
 
 	/**
-	 * Construct a new instance with the provided {@link ObjectMapper}.
+	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
 	 * @see MapperBuilder#findAndAddModules(ClassLoader)
 	 */
-	public JacksonJsonSockJsMessageCodec(ObjectMapper objectMapper) {
+	public JacksonJsonSockJsMessageCodec(JsonMapper jsonMapper) {
-		Assert.notNull(objectMapper, "ObjectMapper must not be null");
+		Assert.notNull(jsonMapper, "JsonMapper must not be null");
-		this.objectMapper = objectMapper;
+		this.jsonMapper = jsonMapper;
 	}
 
 
 	@Override
 	public String @Nullable [] decode(String content) {
-		return this.objectMapper.readValue(content, String[].class);
+		return this.jsonMapper.readValue(content, String[].class);
 	}
 
 	@Override
 	public String @Nullable [] decodeInputStream(InputStream content) {
-		return this.objectMapper.readValue(content, String[].class);
+		return this.jsonMapper.readValue(content, String[].class);
 	}
 
 	@Override