GH-10058: Add Jackson 3 (de)serializer support

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017-present 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.integration.support.json;
+
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonNode;
+
+import org.springframework.integration.message.AdviceMessage;
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.Message;
+
+/**
+ * The {@link MessageJackson3Deserializer} implementation for the {@link AdviceMessage}.
+ *
+ * @author Jooyoung Pyoung
+ *
+ * @since 7.0
+ */
+public class AdviceMessageJackson3Deserializer extends MessageJackson3Deserializer<AdviceMessage<?>> {
+
+	@SuppressWarnings("unchecked")
+	public AdviceMessageJackson3Deserializer() {
+		super((Class<AdviceMessage<?>>) (Class<?>) AdviceMessage.class);
+	}
+
+	@Override
+	protected AdviceMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws JacksonException {
+		Message<?> inputMessage = getMapper().readValue(root.get("inputMessage").traverse(ctxt), Message.class);
+		return new AdviceMessage<>(payload, headers, inputMessage);
+	}
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2017-present 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.integration.support.json;
+
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.type.TypeFactory;
+
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.ErrorMessage;
+
+/**
+ * The {@link MessageJackson3Deserializer} implementation for the {@link ErrorMessage}.
+ *
+ * @author Jooyoung Pyoung
+ *
+ * @since 7.0
+ */
+public class ErrorMessageJackson3Deserializer extends MessageJackson3Deserializer<ErrorMessage> {
+
+	@SuppressWarnings("this-escape")
+	public ErrorMessageJackson3Deserializer() {
+		super(ErrorMessage.class);
+		setPayloadType(TypeFactory.createDefaultInstance().constructType(Throwable.class));
+	}
+
+	@Override
+	protected ErrorMessage buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws JacksonException {
+		Message<?> originalMessage = getMapper().readValue(root.get("originalMessage").traverse(ctxt), Message.class);
+		return new ErrorMessage((Throwable) payload, headers, originalMessage);
+	}
+
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017-present 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.integration.support.json;
+
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonNode;
+
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.support.GenericMessage;
+
+/**
+ * The {@link MessageJackson3Deserializer} implementation for the {@link GenericMessage}.
+ *
+ * @author Jooyoung Pyoung
+ *
+ * @since 7.0
+ */
+public class GenericMessageJackson3Deserializer extends MessageJackson3Deserializer<GenericMessage<?>> {
+
+	@SuppressWarnings("unchecked")
+	public GenericMessageJackson3Deserializer() {
+		super((Class<GenericMessage<?>>) (Class<?>) GenericMessage.class);
+	}
+
+	@Override
+	protected GenericMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws JacksonException {
+		return new GenericMessage<Object>(payload, headers);
+	}
+
+}

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

@@ -146,9 +146,9 @@ private static final class AllowListTypeResolverBuilder extends ObjectMapper.Def
 
 		@Override
 		protected TypeIdResolver idResolver(MapperConfig<?> config,
-				JavaType baseType,
-				PolymorphicTypeValidator subtypeValidator,
-				Collection<NamedType> subtypes, boolean forSer, boolean forDeser) {
+											JavaType baseType,
+											PolymorphicTypeValidator subtypeValidator,
+											Collection<NamedType> subtypes, boolean forSer, boolean forDeser) {
 
 			TypeIdResolver result = super.idResolver(config, baseType, subtypeValidator, subtypes, forSer, forDeser);
 			return new AllowListTypeIdResolver(result, this.trustedPackages);
@@ -168,7 +168,7 @@ private static final class AllowListTypeIdResolver implements TypeIdResolver {
 
 		private final TypeIdResolver delegate;
 
-		private final Set<String> trustedPackages = new LinkedHashSet<>(DEFAULT_TRUSTED_PACKAGES);
+		private final Set<String> trustedPackages = new LinkedHashSet<>(JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES);
 
 		AllowListTypeIdResolver(TypeIdResolver delegate, String... trustedPackages) {
 			this.delegate = delegate;