GH-10058: Switch to Jackson 3 as default and deprecate Jackson 2

Fixes: #10058

* Switch to Jackson 3 classes as default
* Deprecate Jackson 2 classes
* Update tests and docs
* Remove `UUIDJsonSerializer` in `JacksonJsonObjectMapper`
* Add `@JsonCreator` to `FileMarker` and `MessageGroupMetadata`
* Separate GraalVM hints for Jackson 2 & 3
* Update docs

Signed-off-by: Jooyoung Pyoung <pyoungjy@gmail.com>

Author: anthologia

build.gradle

@@ -580,6 +580,7 @@ project('spring-integration-file') {
     description = 'Spring Integration File Support'
     dependencies {
         api "commons-io:commons-io:$commonsIoVersion"
+        optionalApi 'com.fasterxml.jackson.core:jackson-annotations'
 
         testImplementation project(':spring-integration-redis')
         testImplementation project(':spring-integration-redis').sourceSets.test.output

spring-integration-core/src/main/java/org/springframework/integration/aot/CoreRuntimeHints.java

@@ -75,12 +75,14 @@
  * {@link RuntimeHintsRegistrar} for Spring Integration core module.
  *
  * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
  * @since 6.0
  */
 class CoreRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
+	@SuppressWarnings("removal")
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		ReflectionHints reflectionHints = hints.reflection();
 		Stream.of(
@@ -103,12 +105,14 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 			reflectionHints.registerType(JsonPathUtils.class, MemberCategory.INVOKE_PUBLIC_METHODS);
 		}
 
+		registerJackson2Hints(reflectionHints);
+
 		reflectionHints.registerType(
-				TypeReference.of("org.springframework.integration.json.JsonPropertyAccessor$ComparableJsonNode"),
+				TypeReference.of("org.springframework.integration.json.JacksonPropertyAccessor$ComparableJsonNode"),
 				MemberCategory.INVOKE_PUBLIC_METHODS);
 
 		reflectionHints.registerType(
-				TypeReference.of("org.springframework.integration.json.JsonPropertyAccessor$ArrayNodeAsList"),
+				TypeReference.of("org.springframework.integration.json.JacksonPropertyAccessor$ArrayNodeAsList"),
 				MemberCategory.INVOKE_PUBLIC_METHODS);
 
 		// For #xpath() SpEL function
@@ -166,4 +170,15 @@ private static void registerSpringJdkProxy(ProxyHints proxyHints, Class<?>... pr
 		proxyHints.registerJdkProxy(AopProxyUtils.completeJdkProxyInterfaces(proxiedInterfaces));
 	}
 
+	@Deprecated(since = "7.0", forRemoval = true)
+	private static void registerJackson2Hints(ReflectionHints reflectionHints) {
+		reflectionHints.registerType(
+				TypeReference.of("org.springframework.integration.json.JsonPropertyAccessor$ComparableJsonNode"),
+				MemberCategory.INVOKE_PUBLIC_METHODS);
+
+		reflectionHints.registerType(
+				TypeReference.of("org.springframework.integration.json.JsonPropertyAccessor$ArrayNodeAsList"),
+				MemberCategory.INVOKE_PUBLIC_METHODS);
+	}
+
 }

spring-integration-core/src/main/java/org/springframework/integration/config/ConverterRegistrar.java

@@ -26,6 +26,7 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.integration.json.JsonNodeWrapperConverter;
 import org.springframework.integration.json.JsonNodeWrapperToJsonNodeConverter;
 import org.springframework.integration.support.json.JacksonPresent;
 import org.springframework.integration.support.utils.IntegrationUtils;
@@ -39,6 +40,7 @@
  * @author Mark Fisher
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
  * @since 2.0
  */
@@ -73,6 +75,9 @@ private void registerConverters(GenericConversionService conversionService) {
 						.values()
 						.stream().map(IntegrationConverterRegistration::converter)
 						.collect(Collectors.toSet());
+		if (JacksonPresent.isJackson3Present()) {
+			converters.add(new JsonNodeWrapperConverter());
+		}
 		if (JacksonPresent.isJackson2Present()) {
 			converters.add(new JsonNodeWrapperToJsonNodeConverter());
 		}

spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java

@@ -53,6 +53,7 @@
  * @author Ruslan Stelmachenko
  * @author Gary Russell
  * @author Ngoc Nhan
+ * @author Jooyoung Pyoung
  */
 public abstract class AbstractMessageSplitter extends AbstractReplyProducingMessageHandler
 		implements DiscardingMessageHandler {
@@ -243,10 +244,14 @@ else if (result instanceof Publisher<?> publisher) {
 	 * @return the size of the {@link Iterable}
 	 * @since 5.0
 	 */
+	@SuppressWarnings("removal")
 	protected int obtainSizeIfPossible(Iterable<?> iterable) {
 		if (iterable instanceof Collection<?> collection) {
 			return collection.size();
 		}
+		else if (JacksonPresent.isJackson3Present() && JacksonTreeNodeHelper.isNode(iterable)) {
+			return JacksonTreeNodeHelper.nodeSize(iterable);
+		}
 		else if (JacksonPresent.isJackson2Present() && JacksonNodeHelper.isNode(iterable)) {
 			return JacksonNodeHelper.nodeSize(iterable);
 		}
@@ -345,6 +350,7 @@ public String getComponentType() {
 	 */
 	protected abstract Object splitMessage(Message<?> message);
 
+	@Deprecated(since = "7.0", forRemoval = true)
 	private static final class JacksonNodeHelper {
 
 		private static boolean isNode(Object object) {
@@ -357,4 +363,16 @@ private static int nodeSize(Object node) {
 
 	}
 
+	private static final class JacksonTreeNodeHelper {
+
+		private static boolean isNode(Object object) {
+			return object instanceof tools.jackson.core.TreeNode;
+		}
+
+		private static int nodeSize(Object node) {
+			return ((tools.jackson.core.TreeNode) node).size();
+		}
+
+	}
+
 }

spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java

@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
@@ -42,7 +44,7 @@ public class MessageGroupMetadata implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@SuppressWarnings("serial")
-	private final List<UUID> messageIds = new LinkedList<>();
+	private final List<UUID> messageIds;
 
 	private long timestamp;
 
@@ -55,9 +57,16 @@ public class MessageGroupMetadata implements Serializable {
 	private volatile String condition;
 
 	public MessageGroupMetadata() {
+		this.messageIds = new LinkedList<>();
+	}
+
+	@JsonCreator
+	private MessageGroupMetadata(List<UUID> messageIds) {
+		this.messageIds = messageIds;
 	}
 
 	public MessageGroupMetadata(MessageGroup messageGroup) {
+		this();
 		Assert.notNull(messageGroup, "'messageGroup' must not be null");
 		for (Message<?> message : messageGroup.getMessages()) {
 			this.messageIds.add(message.getHeaders().getId());

spring-integration-core/src/main/java/org/springframework/integration/support/converter/ConfigurableCompositeMessageConverter.java

@@ -22,18 +22,22 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import tools.jackson.databind.ObjectMapper;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.integration.support.json.Jackson2JsonObjectMapper;
+import org.springframework.integration.support.json.JacksonJsonObjectMapper;
 import org.springframework.integration.support.json.JacksonPresent;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.messaging.converter.ByteArrayMessageConverter;
 import org.springframework.messaging.converter.CompositeMessageConverter;
 import org.springframework.messaging.converter.GenericMessageConverter;
+import org.springframework.messaging.converter.JacksonJsonMessageConverter;
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.messaging.converter.MessageConverter;
 
@@ -44,13 +48,14 @@
  * <p>
  * The default converts are (declared exactly in this order):
  * <ul>
- *  <li> {@link MappingJackson2MessageConverter} if Jackson processor is present in classpath;
+ *  <li> {@link JacksonJsonMessageConverter} if Jackson processor is present in classpath;
  *  <li> {@link ByteArrayMessageConverter}
  *  <li> {@link ObjectStringMessageConverter}
  *  <li> {@link GenericMessageConverter}
  * </ul>
  *
  * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
  * @since 5.0
  */
@@ -109,7 +114,13 @@ public void afterPropertiesSet() {
 	private static Collection<MessageConverter> initDefaults() {
 		List<MessageConverter> converters = new LinkedList<>();
 
-		if (JacksonPresent.isJackson2Present()) {
+		if (JacksonPresent.isJackson3Present()) {
+			ObjectMapper objectMapper = new JacksonJsonObjectMapper().getObjectMapper();
+			JacksonJsonMessageConverter jsonMessageConverter = new JacksonJsonMessageConverter(objectMapper);
+			jsonMessageConverter.setStrictContentTypeMatch(true);
+			converters.add(jsonMessageConverter);
+		}
+		else if (JacksonPresent.isJackson2Present()) {
 			MappingJackson2MessageConverter mappingJackson2MessageConverter = new MappingJackson2MessageConverter();
 			mappingJackson2MessageConverter.setStrictContentTypeMatch(true);
 			mappingJackson2MessageConverter.setObjectMapper(new Jackson2JsonObjectMapper().getObjectMapper());

spring-integration-core/src/main/java/org/springframework/integration/support/json/AdviceMessageJacksonDeserializer.java

@@ -33,7 +33,9 @@
  * @author Ngoc Nhan
  *
  * @since 4.3.10
+ * @deprecated Since 7.0 in favor of {@link AdviceMessageJsonDeserializer} for Jackson 3.
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public class AdviceMessageJacksonDeserializer extends MessageJacksonDeserializer<AdviceMessage<?>> {
 
 	private static final long serialVersionUID = 1L;

spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java

@@ -78,8 +78,9 @@
  * @author Artem Bilan
  *
  * @since 5.0
- *
+ * @deprecated Since 7.0 in favor of {@link EmbeddedHeadersJsonMessageMapper} for Jackson 3.
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public class EmbeddedJsonHeadersMessageMapper implements BytesMessageMapper {
 
 	protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final

spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java

@@ -32,7 +32,9 @@
  * @author Artem Bilan
  *
  * @since 4.3.10
+ * @deprecated Since 7.0 in favor of {@link ErrorMessageJsonDeserializer} for Jackson 3.
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public class ErrorMessageJacksonDeserializer extends MessageJacksonDeserializer<ErrorMessage> {
 
 	private static final long serialVersionUID = 1L;

spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJacksonDeserializer.java

@@ -30,7 +30,9 @@
  * @author Artem Bilan
  *
  * @since 4.3.10
+ * @deprecated Since 7.0 in favor of {@link GenericMessageJsonDeserializer} for Jackson 3.
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public class GenericMessageJacksonDeserializer extends MessageJacksonDeserializer<GenericMessage<?>> {
 
 	private static final long serialVersionUID = 1L;