Polish Jackson 3 support

- Improve Javadoc.

- Suppress warnings for "removal".

- Update copyright headers.

- Migrate several tests from:
  - MappingJackson2MessageConverter to JacksonJsonMessageConverter
  - Jackson2JsonEncoder to JacksonJsonEncoder
  - Jackson2JsonDecoder to JacksonJsonDecoder
  - Jackson2SmileEncoder to JacksonSmileEncoder
  - Jackson2ObjectMapperBuilder to JsonMapper and XmlMapper
  - MappingJackson2JsonView to JacksonJsonView
  - MappingJackson2HttpMessageConverter to JacksonJsonHttpMessageConverter
  - MappingJackson2XmlHttpMessageConverter to JacksonXmlHttpMessageConverter

Author: sbrannen

spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,8 @@ class MessagingMessageListenerAdapterTests {
 
 	@BeforeEach
 	void setup() {
-		initializeFactory(factory);
+		factory.setBeanFactory(new StaticListableBeanFactory());
+		factory.afterPropertiesSet();
 	}
 
 	@Test
@@ -405,11 +406,6 @@ protected Object extractMessage(jakarta.jms.Message message) {
 		return adapter;
 	}
 
-	private void initializeFactory(DefaultMessageHandlerMethodFactory factory) {
-		factory.setBeanFactory(new StaticListableBeanFactory());
-		factory.afterPropertiesSet();
-	}
-
 
 	@SuppressWarnings("unused")
 	private static class SampleBean {

spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
  * @author Dave Syer
  * @author Stephane Nicoll
  */
+@SuppressWarnings("removal")
 class MappingJackson2MessageConverterTests {
 
 	private MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();

spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.messaging.core;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,29 +37,20 @@
  */
 class DestinationResolvingMessagingTemplateTests {
 
-	private TestDestinationResolvingMessagingTemplate template;
+	private final TestDestinationResolvingMessagingTemplate template = new TestDestinationResolvingMessagingTemplate();
 
-	private ExecutorSubscribableChannel myChannel;
+	private final ExecutorSubscribableChannel myChannel = new ExecutorSubscribableChannel();
 
-	private Map<String, Object> headers;
+	private final Map<String, Object> headers = Map.of("key", "value");
 
-	private TestMessagePostProcessor postProcessor;
+	private final TestMessagePostProcessor postProcessor = new TestMessagePostProcessor();
 
 
 	@BeforeEach
 	void setup() {
-
 		TestMessageChannelDestinationResolver resolver = new TestMessageChannelDestinationResolver();
-
-		this.myChannel = new ExecutorSubscribableChannel();
 		resolver.registerMessageChannel("myChannel", this.myChannel);
-
-		this.template = new TestDestinationResolvingMessagingTemplate();
 		this.template.setDestinationResolver(resolver);
-
-		this.headers = Collections.singletonMap("key", "value");
-
-		this.postProcessor = new TestMessagePostProcessor();
 	}
 
 
@@ -76,8 +66,8 @@ void send() {
 	@Test
 	void sendNoDestinationResolver() {
 		TestDestinationResolvingMessagingTemplate template = new TestDestinationResolvingMessagingTemplate();
-		assertThatIllegalStateException().isThrownBy(() ->
-				template.send("myChannel", new GenericMessage<>("payload")));
+		assertThatIllegalStateException()
+				.isThrownBy(() -> template.send("myChannel", new GenericMessage<>("payload")));
 	}
 
 	@Test
@@ -240,19 +230,21 @@ protected Message<?> doSendAndReceive(MessageChannel channel, Message<?> request
 		}
 	}
 
-}
 
-class TestMessageChannelDestinationResolver implements DestinationResolver<MessageChannel> {
+	private static class TestMessageChannelDestinationResolver implements DestinationResolver<MessageChannel> {
 
-	private final Map<String, MessageChannel> channels = new HashMap<>();
+		private final Map<String, MessageChannel> channels = new HashMap<>();
 
 
-	public void registerMessageChannel(String name, MessageChannel channel) {
-		this.channels.put(name, channel);
-	}
+		public void registerMessageChannel(String name, MessageChannel channel) {
+			this.channels.put(name, channel);
+		}
+
+		@Override
+		public MessageChannel resolveDestination(String name) throws DestinationResolutionException {
+			return this.channels.get(name);
+		}
 
-	@Override
-	public MessageChannel resolveDestination(String name) throws DestinationResolutionException {
-		return this.channels.get(name);
 	}
+
 }

spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.converter.CompositeMessageConverter;
-import org.springframework.messaging.converter.MappingJackson2MessageConverter;
+import org.springframework.messaging.converter.JacksonJsonMessageConverter;
 import org.springframework.messaging.converter.MessageConversionException;
 import org.springframework.messaging.converter.MessageConverter;
 import org.springframework.messaging.converter.StringMessageConverter;
@@ -47,21 +46,15 @@
  */
 class MessageSendingTemplateTests {
 
-	private TestMessageSendingTemplate template;
+	private final TestMessageSendingTemplate template = new TestMessageSendingTemplate();
 
-	private TestMessagePostProcessor postProcessor;
+	private final TestMessagePostProcessor postProcessor = new TestMessagePostProcessor();
 
-	private Map<String, Object> headers;
+	private final Map<String, Object> headers = new HashMap<>() {{
+		put("key", "value");
+	}};
 
 
-	@BeforeEach
-	void setup() {
-		this.template = new TestMessageSendingTemplate();
-		this.postProcessor = new TestMessagePostProcessor();
-		this.headers = new HashMap<>();
-		this.headers.put("key", "value");
-	}
-
 	@Test
 	void send() {
 		Message<?> message = new GenericMessage<Object>("payload");
@@ -84,8 +77,7 @@ void sendToDestination() {
 	@Test
 	void sendMissingDestination() {
 		Message<?> message = new GenericMessage<Object>("payload");
-		assertThatIllegalStateException().isThrownBy(() ->
-				this.template.send(message));
+		assertThatIllegalStateException().isThrownBy(() -> this.template.send(message));
 	}
 
 	@Test
@@ -177,14 +169,12 @@ void convertAndSendPayloadWithPostProcessorToDestination() {
 
 	@Test
 	void convertAndSendNoMatchingConverter() {
-
-		MessageConverter converter = new CompositeMessageConverter(
-				List.of(new MappingJackson2MessageConverter()));
+		MessageConverter converter = new CompositeMessageConverter(List.of(new JacksonJsonMessageConverter()));
 		this.template.setMessageConverter(converter);
 
 		this.headers.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_XML);
-		assertThatExceptionOfType(MessageConversionException.class).isThrownBy(() ->
-				this.template.convertAndSend("home", "payload", new MessageHeaders(this.headers)));
+		assertThatExceptionOfType(MessageConversionException.class)
+				.isThrownBy(() -> this.template.convertAndSend("home", "payload", new MessageHeaders(this.headers)));
 	}
 
 
@@ -202,19 +192,3 @@ protected void doSend(String destination, Message<?> message) {
 	}
 
 }
-
-class TestMessagePostProcessor implements MessagePostProcessor {
-
-	private Message<?> message;
-
-
-	Message<?> getMessage() {
-		return this.message;
-	}
-
-	@Override
-	public Message<?> postProcessMessage(Message<?> message) {
-		this.message = message;
-		return message;
-	}
-}

spring-messaging/src/test/java/org/springframework/messaging/core/TestMessagePostProcessor.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.messaging.core;
+
+import org.springframework.messaging.Message;
+
+public class TestMessagePostProcessor implements MessagePostProcessor {
+
+	private Message<?> message;
+
+
+	Message<?> getMessage() {
+		return this.message;
+	}
+
+	@Override
+	public Message<?> postProcessMessage(Message<?> message) {
+		this.message = message;
+		return message;
+	}
+
+}

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -218,6 +218,7 @@ void resolveWithConversionEmptyPayloadButNoConverter() {
 	}
 
 	@Test // SPR-16486
+	@SuppressWarnings("removal")
 	public void resolveWithJacksonConverter() throws Exception {
 		Message<String> inMessage = MessageBuilder.withPayload("{\"foo\":\"bar\"}").build();
 		MethodParameter parameter = new MethodParameter(this.method, 5);

spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -31,8 +31,9 @@
 import org.springframework.util.MimeType;
 
 /**
- * Decode bytes into CBOR and convert to Object's with Jackson 3.x.
- * Stream decoding is not supported yet.
+ * Decode bytes into CBOR and convert to Objects with Jackson 3.x.
+ *
+ * <p>Stream decoding is currently not supported.
  *
  * @author Sebastien Deleuze
  * @since 7.0
@@ -70,7 +71,8 @@ public JacksonCborDecoder(CBORMapper mapper, MimeType... mimeTypes) {
 	@Override
 	public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType, @Nullable MimeType mimeType,
 			@Nullable Map<String, Object> hints) {
-		throw new UnsupportedOperationException("Does not support stream decoding yet");
+
+		throw new UnsupportedOperationException("Stream decoding is currently not supported");
 	}
 
 }

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

@@ -33,7 +33,8 @@
 
 /**
  * Encode from an {@code Object} to bytes of CBOR objects using Jackson 3.x.
- * Stream encoding is not supported yet.
+ *
+ * <p>Stream encoding is currently not supported.
  *
  * @author Sebastien Deleuze
  * @since 7.0
@@ -73,7 +74,8 @@ public JacksonCborEncoder(CBORMapper mapper, MimeType... mimeTypes) {
 	@Override
 	public Flux<DataBuffer> encode(Publisher<?> inputStream, DataBufferFactory bufferFactory, ResolvableType elementType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
-		throw new UnsupportedOperationException("Does not support stream encoding yet");
+
+		throw new UnsupportedOperationException("Stream encoding is currently not supported");
 	}
 
 }

spring-web/src/main/java/org/springframework/http/codec/smile/JacksonSmileDecoder.java

@@ -23,7 +23,7 @@
 import org.springframework.util.MimeType;
 
 /**
- * Decode a byte stream into Smile and convert to Object's with Jackson 3.x,
+ * Decode a byte stream into Smile and convert to Objects with Jackson 3.x,
  * leveraging non-blocking parsing.
  *
  * <p>The default constructor loads {@link tools.jackson.databind.JacksonModule}s
@@ -39,6 +39,7 @@ public class JacksonSmileDecoder extends AbstractJacksonDecoder {
 					new MimeType("application", "x-jackson-smile"),
 					new MimeType("application", "*+x-jackson-smile")};
 
+
 	/**
 	 * Construct a new instance with a {@link SmileMapper} customized with the
 	 * {@link tools.jackson.databind.JacksonModule}s found by

spring-web/src/main/java/org/springframework/http/codec/smile/JacksonSmileEncoder.java

@@ -30,8 +30,9 @@
 
 /**
  * Encode from an {@code Object} stream to a byte stream of Smile objects using Jackson 3.x.
- * For non-streaming use cases, {@link Flux} elements are collected into a {@link List}
- * before serialization for performance reason.
+ *
+ * <p>For non-streaming use cases, {@link Flux} elements are collected into a {@link List}
+ * before serialization for performance reasons.
  *
  * <p>The default constructor loads {@link tools.jackson.databind.JacksonModule}s
  * found by {@link MapperBuilder#findModules(ClassLoader)}.
@@ -98,4 +99,5 @@ public JacksonSmileEncoder(SmileMapper mapper, MimeType... mimeTypes) {
 		}
 		return null;
 	}
+
 }