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

Related to: #10058

* Add Jackson3-compatible messaging (de)serializers
* Add Jackson 3 `messagingAwareMapper()` support
* Maintain existing Jackson 2 functionality

Signed-off-by: Jooyoung Pyoung <[email protected]>

Author: anthologia

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

@@ -0,0 +1,53 @@
+/*
+ * 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 java.io.IOException;
+
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import org.springframework.integration.message.AdviceMessage;
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
+
+/**
+ * The {@link MessageJackson2Deserializer} implementation for the {@link AdviceMessage}.
+ *
+ * @author Artem Bilan
+ * @author Ngoc Nhan
+ *
+ * @since 4.3.10
+ */
+public class AdviceMessageJackson2Deserializer extends MessageJackson2Deserializer<AdviceMessage<?>> {
+
+	private static final long serialVersionUID = 1L;
+
+	@SuppressWarnings("unchecked")
+	public AdviceMessageJackson2Deserializer() {
+		super((Class<AdviceMessage<?>>) (Class<?>) AdviceMessage.class);
+	}
+
+	@Override
+	protected AdviceMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws IOException {
+		Message<?> inputMessage = getMapper().readValue(root.get("inputMessage").traverse(), Message.class);
+		return new AdviceMessage<>(payload, (MessageHeaders) headers, inputMessage);
+	}
+
+}

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

@@ -16,23 +16,20 @@
 
 package org.springframework.integration.support.json;
 
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
+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;
-import org.springframework.messaging.MessageHeaders;
 
 /**
  * The {@link MessageJacksonDeserializer} implementation for the {@link AdviceMessage}.
  *
- * @author Artem Bilan
- * @author Ngoc Nhan
+ * @author Jooyoung Pyoung
  *
- * @since 4.3.10
+ * @since 7.0
  */
 public class AdviceMessageJacksonDeserializer extends MessageJacksonDeserializer<AdviceMessage<?>> {
 
@@ -45,9 +42,9 @@ public AdviceMessageJacksonDeserializer() {
 
 	@Override
 	protected AdviceMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
-			DeserializationContext ctxt) throws IOException {
-		Message<?> inputMessage = getMapper().readValue(root.get("inputMessage").traverse(), Message.class);
-		return new AdviceMessage<>(payload, (MessageHeaders) headers, inputMessage);
+			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/EmbeddedJsonHeadersMessageMapper.java

@@ -70,12 +70,13 @@
  * </pre>
  * <p>
  * To add more packages, create an object mapper using
- * {@link JacksonJsonUtils#messagingAwareMapper(String...)}.
+ * {@link Jackson2MessagingAwareMapperUtils#messagingAwareMapper(String...)}.
  * <p>
  * A constructor is provided allowing the provision of such a configured object mapper.
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
  * @since 5.0
  *
@@ -109,7 +110,7 @@ public EmbeddedJsonHeadersMessageMapper() {
 	 * @see PatternMatchUtils#smartMatch(String, String...)
 	 */
 	public EmbeddedJsonHeadersMessageMapper(String... headerPatterns) {
-		this(JacksonJsonUtils.messagingAwareMapper(), headerPatterns);
+		this(Jackson2MessagingAwareMapperUtils.messagingAwareMapper(), headerPatterns);
 	}
 
 	/**

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

@@ -0,0 +1,53 @@
+/*
+ * 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 java.io.IOException;
+
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.ErrorMessage;
+
+/**
+ * The {@link MessageJackson2Deserializer} implementation for the {@link ErrorMessage}.
+ *
+ * @author Artem Bilan
+ *
+ * @since 4.3.10
+ */
+public class ErrorMessageJackson2Deserializer extends MessageJackson2Deserializer<ErrorMessage> {
+
+	private static final long serialVersionUID = 1L;
+
+	@SuppressWarnings("this-escape")
+	public ErrorMessageJackson2Deserializer() {
+		super(ErrorMessage.class);
+		setPayloadType(TypeFactory.defaultInstance().constructType(Throwable.class));
+	}
+
+	@Override
+	protected ErrorMessage buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws IOException {
+		Message<?> originalMessage = getMapper().readValue(root.get("originalMessage").traverse(), Message.class);
+		return new ErrorMessage((Throwable) payload, headers, originalMessage);
+	}
+
+}

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

@@ -16,11 +16,10 @@
 
 package org.springframework.integration.support.json;
 
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+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;
@@ -29,9 +28,9 @@
 /**
  * The {@link MessageJacksonDeserializer} implementation for the {@link ErrorMessage}.
  *
- * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
- * @since 4.3.10
+ * @since 7.0
  */
 public class ErrorMessageJacksonDeserializer extends MessageJacksonDeserializer<ErrorMessage> {
 
@@ -40,13 +39,13 @@ public class ErrorMessageJacksonDeserializer extends MessageJacksonDeserializer<
 	@SuppressWarnings("this-escape")
 	public ErrorMessageJacksonDeserializer() {
 		super(ErrorMessage.class);
-		setPayloadType(TypeFactory.defaultInstance().constructType(Throwable.class));
+		setPayloadType(TypeFactory.createDefaultInstance().constructType(Throwable.class));
 	}
 
 	@Override
 	protected ErrorMessage buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
-			DeserializationContext ctxt) throws IOException {
-		Message<?> originalMessage = getMapper().readValue(root.get("originalMessage").traverse(), Message.class);
+			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/GenericMessageJackson2Deserializer.java

@@ -0,0 +1,49 @@
+/*
+ * 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 java.io.IOException;
+
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import org.springframework.integration.support.MutableMessageHeaders;
+import org.springframework.messaging.support.GenericMessage;
+
+/**
+ * The {@link MessageJackson2Deserializer} implementation for the {@link GenericMessage}.
+ *
+ * @author Artem Bilan
+ *
+ * @since 4.3.10
+ */
+public class GenericMessageJackson2Deserializer extends MessageJackson2Deserializer<GenericMessage<?>> {
+
+	private static final long serialVersionUID = 1L;
+
+	@SuppressWarnings("unchecked")
+	public GenericMessageJackson2Deserializer() {
+		super((Class<GenericMessage<?>>) (Class<?>) GenericMessage.class);
+	}
+
+	@Override
+	protected GenericMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
+			DeserializationContext ctxt) throws IOException {
+		return new GenericMessage<Object>(payload, headers);
+	}
+
+}

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

@@ -16,20 +16,19 @@
 
 package org.springframework.integration.support.json;
 
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
+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 MessageJacksonDeserializer} implementation for the {@link GenericMessage}.
  *
- * @author Artem Bilan
+ * @author Jooyoung Pyoung
  *
- * @since 4.3.10
+ * @since 7.0
  */
 public class GenericMessageJacksonDeserializer extends MessageJacksonDeserializer<GenericMessage<?>> {
 
@@ -42,7 +41,7 @@ public GenericMessageJacksonDeserializer() {
 
 	@Override
 	protected GenericMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
-			DeserializationContext ctxt) throws IOException {
+			DeserializationContext ctxt) throws JacksonException {
 		return new GenericMessage<Object>(payload, headers);
 	}