Add builder-based constructors to Jackson 3 infrastructure

This commit also polishes documentation, constructor parameter and
field names.

Closes gh-35597

Author: sdeleuze

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

@@ -48,9 +48,6 @@
  * {@link #setTargetType targetType} is set to {@link MessageType#TEXT}.
  * Converts from a {@link TextMessage} or {@link BytesMessage} to an object.
  *
- * <p>The default constructor loads {@link tools.jackson.databind.JacksonModule}s
- * found by {@link MapperBuilder#findModules(ClassLoader)}.
- *
  * @author Sebastien Deleuze
  * @since 7.0
  */
@@ -62,7 +59,7 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 	public static final String DEFAULT_ENCODING = "UTF-8";
 
 
-	private final JsonMapper jsonMapper;
+	private final JsonMapper mapper;
 
 	private MessageType targetType = MessageType.BYTES;
 
@@ -85,17 +82,27 @@ public class JacksonJsonMessageConverter implements SmartMessageConverter, BeanC
 	 * {@link MapperBuilder#findModules(ClassLoader)}.
 	 */
 	public JacksonJsonMessageConverter() {
-		this.jsonMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
+		this(JsonMapper.builder());
+	}
+
+	/**
+	 * Construct a new instance with the provided {@link JsonMapper.Builder}
+	 * customized with the {@link tools.jackson.databind.JacksonModule}s found
+	 * by {@link MapperBuilder#findModules(ClassLoader)}.
+	 * @see JsonMapper#builder()
+	 */
+	public JacksonJsonMessageConverter(JsonMapper.Builder builder) {
+		Assert.notNull(builder, "JsonMapper.Builder must not be null");
+		this.mapper = builder.findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
 	}
 
 	/**
 	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
-	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(JsonMapper jsonMapper) {
-		Assert.notNull(jsonMapper, "JsonMapper must not be null");
-		this.jsonMapper = jsonMapper;
+	public JacksonJsonMessageConverter(JsonMapper mapper) {
+		Assert.notNull(mapper, "JsonMapper must not be null");
+		this.mapper = mapper;
 	}
 
 	/**
@@ -172,9 +179,9 @@ public Message toMessage(Object object, Session session) throws JMSException, Me
 		Message message;
 		try {
 			message = switch (this.targetType) {
-				case TEXT -> mapToTextMessage(object, session, this.jsonMapper.writer());
-				case BYTES -> mapToBytesMessage(object, session, this.jsonMapper.writer());
-				default -> mapToMessage(object, session, this.jsonMapper.writer(), this.targetType);
+				case TEXT -> mapToTextMessage(object, session, this.mapper.writer());
+				case BYTES -> mapToBytesMessage(object, session, this.mapper.writer());
+				default -> mapToMessage(object, session, this.mapper.writer(), this.targetType);
 			};
 		}
 		catch (IOException ex) {
@@ -205,10 +212,10 @@ public Message toMessage(Object object, Session session, @Nullable Class<?> json
 			throws JMSException, MessageConversionException {
 
 		if (jsonView != null) {
-			return toMessage(object, session, this.jsonMapper.writerWithView(jsonView));
+			return toMessage(object, session, this.mapper.writerWithView(jsonView));
 		}
 		else {
-			return toMessage(object, session, this.jsonMapper.writer());
+			return toMessage(object, session, this.mapper.writer());
 		}
 	}
 
@@ -362,7 +369,7 @@ protected Object convertFromTextMessage(TextMessage message, JavaType targetJava
 			throws JMSException, IOException {
 
 		String body = message.getText();
-		return this.jsonMapper.readValue(body, targetJavaType);
+		return this.mapper.readValue(body, targetJavaType);
 	}
 
 	/**
@@ -385,15 +392,15 @@ protected Object convertFromBytesMessage(BytesMessage message, JavaType targetJa
 		if (encoding != null) {
 			try {
 				String body = new String(bytes, encoding);
-				return this.jsonMapper.readValue(body, targetJavaType);
+				return this.mapper.readValue(body, targetJavaType);
 			}
 			catch (UnsupportedEncodingException ex) {
 				throw new MessageConversionException("Cannot convert bytes to String", ex);
 			}
 		}
 		else {
 			// Jackson internally performs encoding detection, falling back to UTF-8.
-			return this.jsonMapper.readValue(bytes, targetJavaType);
+			return this.mapper.readValue(bytes, targetJavaType);
 		}
 	}
 
@@ -436,11 +443,11 @@ protected JavaType getJavaTypeForMessage(Message message) throws JMSException {
 		}
 		Class<?> mappedClass = this.idClassMappings.get(typeId);
 		if (mappedClass != null) {
-			return this.jsonMapper.constructType(mappedClass);
+			return this.mapper.constructType(mappedClass);
 		}
 		try {
 			Class<?> typeClass = ClassUtils.forName(typeId, this.beanClassLoader);
-			return this.jsonMapper.constructType(typeClass);
+			return this.mapper.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

@@ -40,9 +40,6 @@
 /**
  * A Jackson 3.x based {@link MessageConverter} implementation.
  *
- * <p>The default constructor loads {@link tools.jackson.databind.JacksonModule}s
- * found by {@link MapperBuilder#findModules(ClassLoader)}.
- *
  * @author Sebastien Deleuze
  * @since 7.0
  */
@@ -51,7 +48,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 JsonMapper jsonMapper;
+	private final JsonMapper mapper;
 
 
 	/**
@@ -71,36 +68,58 @@ public JacksonJsonMessageConverter() {
 	 * @param supportedMimeTypes the supported MIME types
 	 */
 	public JacksonJsonMessageConverter(MimeType... supportedMimeTypes) {
-		super(supportedMimeTypes);
-		this.jsonMapper = JsonMapper.builder().findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
+		this(JsonMapper.builder(), supportedMimeTypes);
 	}
 
 	/**
 	 * Construct a new instance with the provided {@link JsonMapper}.
 	 * @see JsonMapper#builder()
-	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(JsonMapper jsonMapper) {
-		this(jsonMapper, DEFAULT_MIME_TYPES);
+	public JacksonJsonMessageConverter(JsonMapper mapper) {
+		this(mapper, DEFAULT_MIME_TYPES);
+	}
+
+
+	/**
+	 * Construct a new instance with the provided {@link JsonMapper.Builder} customized
+	 * with the {@link tools.jackson.databind.JacksonModule}s found
+	 * by {@link MapperBuilder#findModules(ClassLoader)}.
+	 * @see JsonMapper#builder()
+	 */
+	public JacksonJsonMessageConverter(JsonMapper.Builder builder) {
+		this(builder, DEFAULT_MIME_TYPES);
 	}
 
 	/**
 	 * Construct a new instance with the provided {@link JsonMapper} and the
 	 * provided {@link MimeType}s.
 	 * @see JsonMapper#builder()
-	 * @see MapperBuilder#findModules(ClassLoader)
 	 */
-	public JacksonJsonMessageConverter(JsonMapper jsonMapper, MimeType... supportedMimeTypes) {
+	public JacksonJsonMessageConverter(JsonMapper mapper, MimeType... supportedMimeTypes) {
+		super(supportedMimeTypes);
+		Assert.notNull(mapper, "JsonMapper must not be null");
+		this.mapper = mapper;
+	}
+
+	/**
+	 * Construct a new instance with the provided {@link JsonMapper} customized
+	 * with the {@link tools.jackson.databind.JacksonModule}s found by
+	 * {@link MapperBuilder#findModules(ClassLoader)}, and the provided
+	 * {@link MimeType}s.
+	 * @see JsonMapper#builder()
+	 */
+	public JacksonJsonMessageConverter(JsonMapper.Builder builder, MimeType... supportedMimeTypes) {
 		super(supportedMimeTypes);
-		Assert.notNull(jsonMapper, "JsonMapper must not be null");
-		this.jsonMapper = jsonMapper;
+		Assert.notNull(builder, "JsonMapper.Builder must not be null");
+		this.mapper = builder.findAndAddModules(JacksonJsonMessageConverter.class.getClassLoader()).build();
 	}
 
+
 	/**
 	 * Return the underlying {@code JsonMapper} for this converter.
 	 */
 	protected JsonMapper getJsonMapper() {
-		return this.jsonMapper;
+		return this.mapper;
 	}
 
 	@Override
@@ -121,7 +140,7 @@ protected boolean supports(Class<?> clazz) {
 
 	@Override
 	protected @Nullable Object convertFromInternal(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) {
-		JavaType javaType = this.jsonMapper.constructType(getResolvedType(targetClass, conversionHint));
+		JavaType javaType = this.mapper.constructType(getResolvedType(targetClass, conversionHint));
 		Object payload = message.getPayload();
 		Class<?> view = getSerializationView(conversionHint);
 		try {
@@ -130,19 +149,19 @@ protected boolean supports(Class<?> clazz) {
 			}
 			else if (payload instanceof byte[] bytes) {
 				if (view != null) {
-					return this.jsonMapper.readerWithView(view).forType(javaType).readValue(bytes);
+					return this.mapper.readerWithView(view).forType(javaType).readValue(bytes);
 				}
 				else {
-					return this.jsonMapper.readValue(bytes, javaType);
+					return this.mapper.readValue(bytes, javaType);
 				}
 			}
 			else {
 				// Assuming a text-based source payload
 				if (view != null) {
-					return this.jsonMapper.readerWithView(view).forType(javaType).readValue(payload.toString());
+					return this.mapper.readerWithView(view).forType(javaType).readValue(payload.toString());
 				}
 				else {
-					return this.jsonMapper.readValue(payload.toString(), javaType);
+					return this.mapper.readValue(payload.toString(), javaType);
 				}
 			}
 		}
@@ -160,12 +179,12 @@ else if (payload instanceof byte[] bytes) {
 			if (byte[].class == getSerializedPayloadClass()) {
 				ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
 				JsonEncoding encoding = getJsonEncoding(getMimeType(headers));
-				try (JsonGenerator generator = this.jsonMapper.createGenerator(out, encoding)) {
+				try (JsonGenerator generator = this.mapper.createGenerator(out, encoding)) {
 					if (view != null) {
-						this.jsonMapper.writerWithView(view).writeValue(generator, payload);
+						this.mapper.writerWithView(view).writeValue(generator, payload);
 					}
 					else {
-						this.jsonMapper.writeValue(generator, payload);
+						this.mapper.writeValue(generator, payload);
 					}
 					payload = out.toByteArray();
 				}
@@ -174,10 +193,10 @@ else if (payload instanceof byte[] bytes) {
 				// Assuming a text-based target payload
 				Writer writer = new StringWriter(1024);
 				if (view != null) {
-					this.jsonMapper.writerWithView(view).writeValue(writer, payload);
+					this.mapper.writerWithView(view).writeValue(writer, payload);
 				}
 				else {
-					this.jsonMapper.writeValue(writer, payload);
+					this.mapper.writeValue(writer, payload);
 				}
 				payload = writer.toString();
 			}

spring-web/src/main/java/org/springframework/http/codec/cbor/JacksonCborDecoder.java

@@ -51,17 +51,38 @@ public JacksonCborDecoder() {
 		super(CBORMapper.builder(), MediaType.APPLICATION_CBOR);
 	}
 
+	/**
+	 * Construct a new instance with the provided {@link CBORMapper.Builder}
+	 * customized with the {@link tools.jackson.databind.JacksonModule}s
+	 * found by {@link MapperBuilder#findModules(ClassLoader)}.
+	 * @see CBORMapper#builder()
+	 */
+	public JacksonCborDecoder(CBORMapper.Builder builder) {
+		super(builder, MediaType.APPLICATION_CBOR);
+	}
+
 	/**
 	 * Construct a new instance with the provided {@link CBORMapper}.
+	 * @see CBORMapper#builder()
 	 */
 	public JacksonCborDecoder(CBORMapper mapper) {
 		super(mapper, MediaType.APPLICATION_CBOR);
 	}
 
+	/**
+	 * Construct a new instance with the provided {@link CBORMapper.Builder}
+	 * customized with the {@link tools.jackson.databind.JacksonModule}s
+	 * found by {@link MapperBuilder#findModules(ClassLoader)}, and
+	 * {@link MimeType}s.
+	 * @see CBORMapper#builder()
+	 */
+	public JacksonCborDecoder(CBORMapper.Builder builder, MimeType... mimeTypes) {
+		super(builder, mimeTypes);
+	}
+
 	/**
 	 * Construct a new instance with the provided {@link CBORMapper} and {@link MimeType}s.
 	 * @see CBORMapper#builder()
-	 * @see MapperBuilder#findAndAddModules(ClassLoader)
 	 */
 	public JacksonCborDecoder(CBORMapper mapper, MimeType... mimeTypes) {
 		super(mapper, mimeTypes);

spring-web/src/main/java/org/springframework/http/codec/cbor/JacksonCborEncoder.java

@@ -52,19 +52,38 @@ public JacksonCborEncoder() {
 		super(CBORMapper.builder(), MediaType.APPLICATION_CBOR);
 	}
 
+	/**
+	 * Construct a new instance with the provided {@link CBORMapper.Builder}
+	 * customized with the {@link tools.jackson.databind.JacksonModule}s
+	 * found by {@link MapperBuilder#findModules(ClassLoader)}.
+	 * @see CBORMapper#builder()
+	 */
+	public JacksonCborEncoder(CBORMapper.Builder builder) {
+		super(builder, MediaType.APPLICATION_CBOR);
+	}
+
 	/**
 	 * Construct a new instance with the provided {@link CBORMapper}.
 	 * @see CBORMapper#builder()
-	 * @see MapperBuilder#findAndAddModules(ClassLoader)
 	 */
 	public JacksonCborEncoder(CBORMapper mapper) {
 		super(mapper, MediaType.APPLICATION_CBOR);
 	}
 
+	/**
+	 * Construct a new instance with the provided {@link CBORMapper.Builder}
+	 * customized with the {@link tools.jackson.databind.JacksonModule}s
+	 * found by {@link MapperBuilder#findModules(ClassLoader)}, and
+	 * {@link MimeType}s.
+	 * @see CBORMapper#builder()
+	 */
+	public JacksonCborEncoder(CBORMapper.Builder builder, MimeType... mimeTypes) {
+		super(builder, mimeTypes);
+	}
+
 	/**
 	 * Construct a new instance with the provided {@link CBORMapper} and {@link MimeType}s.
 	 * @see CBORMapper#builder()
-	 * @see MapperBuilder#findAndAddModules(ClassLoader)
 	 */
 	public JacksonCborEncoder(CBORMapper mapper, MimeType... mimeTypes) {
 		super(mapper, mimeTypes);