Apply code review feedback

* Remove `Jackson3` suffix from deserializer/serializer classes
* Copy `DEFAULT_TRUSTED_PACKAGES` from `JacksonJsonUtils` for future deprecation
* Inline dedicated method and constants in test

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

Author: anthologia

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -25,22 +25,23 @@
 import org.springframework.messaging.Message;
 
 /**
- * The {@link MessageJackson3Deserializer} implementation for the {@link AdviceMessage}.
+ * The {@link MessageJsonDeserializer} implementation for the {@link AdviceMessage}.
  *
  * @author Jooyoung Pyoung
  *
  * @since 7.0
  */
-public class AdviceMessageJackson3Deserializer extends MessageJackson3Deserializer<AdviceMessage<?>> {
+public class AdviceMessageJsonDeserializer extends MessageJsonDeserializer<AdviceMessage<?>> {
 
 	@SuppressWarnings("unchecked")
-	public AdviceMessageJackson3Deserializer() {
+	public AdviceMessageJsonDeserializer() {
 		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 renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJsonDeserializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -26,23 +26,24 @@
 import org.springframework.messaging.support.ErrorMessage;
 
 /**
- * The {@link MessageJackson3Deserializer} implementation for the {@link ErrorMessage}.
+ * The {@link MessageJsonDeserializer} implementation for the {@link ErrorMessage}.
  *
  * @author Jooyoung Pyoung
  *
  * @since 7.0
  */
-public class ErrorMessageJackson3Deserializer extends MessageJackson3Deserializer<ErrorMessage> {
+public class ErrorMessageJsonDeserializer extends MessageJsonDeserializer<ErrorMessage> {
 
 	@SuppressWarnings("this-escape")
-	public ErrorMessageJackson3Deserializer() {
+	public ErrorMessageJsonDeserializer() {
 		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 renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJsonDeserializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -24,23 +24,24 @@
 import org.springframework.messaging.support.GenericMessage;
 
 /**
- * The {@link MessageJackson3Deserializer} implementation for the {@link GenericMessage}.
+ * The {@link MessageJsonDeserializer} implementation for the {@link GenericMessage}.
  *
  * @author Jooyoung Pyoung
  *
  * @since 7.0
  */
-public class GenericMessageJackson3Deserializer extends MessageJackson3Deserializer<GenericMessage<?>> {
+public class GenericMessageJsonDeserializer extends MessageJsonDeserializer<GenericMessage<?>> {
 
 	@SuppressWarnings("unchecked")
-	public GenericMessageJackson3Deserializer() {
+	public GenericMessageJsonDeserializer() {
 		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);
+
+		return new GenericMessage<>(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<>(JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES);
+		private final Set<String> trustedPackages = new LinkedHashSet<>(DEFAULT_TRUSTED_PACKAGES);
 
 		AllowListTypeIdResolver(TypeIdResolver delegate, String... trustedPackages) {
 			this.delegate = delegate;

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

@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -53,6 +54,21 @@
  */
 public final class JacksonMessagingUtils {
 
+	/**
+	 * The packages to trust on JSON deserialization by default.
+	 */
+	public static final List<String> DEFAULT_TRUSTED_PACKAGES =
+			List.of(
+					"java.util",
+					"java.lang",
+					"org.springframework.messaging.support",
+					"org.springframework.integration.support",
+					"org.springframework.integration.message",
+					"org.springframework.integration.store",
+					"org.springframework.integration.history",
+					"org.springframework.integration.handler"
+			);
+
 	private JacksonMessagingUtils() {
 	}
 
@@ -67,14 +83,14 @@ private JacksonMessagingUtils() {
 	 */
 	public static ObjectMapper messagingAwareMapper(String... trustedPackages) {
 		if (JacksonPresent.isJackson3Present()) {
-			GenericMessageJackson3Deserializer genericMessageDeserializer = new GenericMessageJackson3Deserializer();
-			ErrorMessageJackson3Deserializer errorMessageDeserializer = new ErrorMessageJackson3Deserializer();
-			AdviceMessageJackson3Deserializer adviceMessageDeserializer = new AdviceMessageJackson3Deserializer();
-			MutableMessageJackson3Deserializer mutableMessageDeserializer = new MutableMessageJackson3Deserializer();
+			GenericMessageJsonDeserializer genericMessageDeserializer = new GenericMessageJsonDeserializer();
+			ErrorMessageJsonDeserializer errorMessageDeserializer = new ErrorMessageJsonDeserializer();
+			AdviceMessageJsonDeserializer adviceMessageDeserializer = new AdviceMessageJsonDeserializer();
+			MutableMessageJsonDeserializer mutableMessageDeserializer = new MutableMessageJsonDeserializer();
 
 			SimpleModule simpleModule = new SimpleModule()
-					.addSerializer(new MessageHeadersJackson3Serializer())
-					.addSerializer(new MimeTypeJackson3Serializer())
+					.addSerializer(new MessageHeadersJsonSerializer())
+					.addSerializer(new MimeTypeJsonSerializer())
 					.addDeserializer(GenericMessage.class, genericMessageDeserializer)
 					.addDeserializer(ErrorMessage.class, errorMessageDeserializer)
 					.addDeserializer(AdviceMessage.class, adviceMessageDeserializer)
@@ -143,7 +159,7 @@ private static final class AllowListTypeIdResolver implements TypeIdResolver {
 
 		private final TypeIdResolver delegate;
 
-		private final Set<String> trustedPackages = new LinkedHashSet<>(JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES);
+		private final Set<String> trustedPackages = new LinkedHashSet<>(DEFAULT_TRUSTED_PACKAGES);
 
 		AllowListTypeIdResolver(TypeIdResolver delegate, String... trustedPackages) {
 			this.delegate = delegate;

spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJackson3Serializer.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJsonSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -37,14 +37,16 @@
  *
  * @since 7.0
  */
-public class MessageHeadersJackson3Serializer extends StdSerializer<MessageHeaders> {
+public class MessageHeadersJsonSerializer extends StdSerializer<MessageHeaders> {
 
-	public MessageHeadersJackson3Serializer() {
+	public MessageHeadersJsonSerializer() {
 		super(MessageHeaders.class);
 	}
 
 	@Override
-	public void serializeWithType(MessageHeaders value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException {
+	public void serializeWithType(MessageHeaders value, JsonGenerator gen, SerializationContext ctxt,
+			TypeSerializer typeSer) throws JacksonException {
+
 		serialize(value, gen, ctxt);
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJackson3Deserializer.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJsonDeserializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -42,13 +42,13 @@
  *
  * @since 7.0
  */
-public abstract class MessageJackson3Deserializer<T extends Message<?>> extends StdNodeBasedDeserializer<T> {
+public abstract class MessageJsonDeserializer<T extends Message<?>> extends StdNodeBasedDeserializer<T> {
 
 	private JavaType payloadType = TypeFactory.createDefaultInstance().constructType(Object.class);
 
 	private ObjectMapper mapper = new ObjectMapper();
 
-	protected MessageJackson3Deserializer(Class<T> targetType) {
+	protected MessageJsonDeserializer(Class<T> targetType) {
 		super(targetType);
 	}
 
@@ -76,7 +76,7 @@ public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt, Ty
 	@Override
 	public T convert(JsonNode root, DeserializationContext ctxt) throws JacksonException {
 		Map<String, Object> headers = this.mapper.readValue(root.get("headers").traverse(ctxt),
-				TypeFactory.createDefaultInstance().constructMapType(HashMap.class, String.class, Object.class));
+				this.mapper.getTypeFactory().constructMapType(HashMap.class, String.class, Object.class));
 		Object payload = this.mapper.readValue(root.get("payload").traverse(ctxt), this.payloadType);
 		return buildMessage(new MutableMessageHeaders(headers), payload, root, ctxt);
 	}

spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeJackson3Serializer.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeJsonSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-present the original author or authors.
+ * Copyright 2025-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.
@@ -32,14 +32,16 @@
  *
  * @since 7.0
  */
-public class MimeTypeJackson3Serializer extends StdSerializer<MimeType> {
+public class MimeTypeJsonSerializer extends StdSerializer<MimeType> {
 
-	public MimeTypeJackson3Serializer() {
+	public MimeTypeJsonSerializer() {
 		super(MimeType.class);
 	}
 
 	@Override
-	public void serializeWithType(MimeType value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException {
+	public void serializeWithType(MimeType value, JsonGenerator gen, SerializationContext ctxt,
+			TypeSerializer typeSer) throws JacksonException {
+
 		serialize(value, gen, ctxt);
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJackson3Deserializer.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJsonDeserializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present the original author or authors.
+ * Copyright 2025-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.
@@ -24,23 +24,24 @@
 import org.springframework.integration.support.MutableMessageHeaders;
 
 /**
- * The {@link MessageJackson3Deserializer} implementation for the {@link MutableMessage}.
+ * The {@link MessageJsonDeserializer} implementation for the {@link MutableMessage}.
  *
  * @author Jooyoung Pyoung
  *
  * @since 7.0
  */
-public class MutableMessageJackson3Deserializer extends MessageJackson3Deserializer<MutableMessage<?>> {
+public class MutableMessageJsonDeserializer extends MessageJsonDeserializer<MutableMessage<?>> {
 
 	@SuppressWarnings("unchecked")
-	public MutableMessageJackson3Deserializer() {
+	public MutableMessageJsonDeserializer() {
 		super((Class<MutableMessage<?>>) (Class<?>) MutableMessage.class);
 	}
 
 	@Override
 	protected MutableMessage<?> buildMessage(MutableMessageHeaders headers, Object payload, JsonNode root,
 			DeserializationContext ctxt) throws JacksonException {
-		return new MutableMessage<Object>(payload, headers);
+
+		return new MutableMessage<>(payload, headers);
 	}
 
 }

spring-integration-core/src/test/java/org/springframework/integration/support/json/JacksonMessagingUtilsTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.integration.support.json;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -44,10 +45,6 @@
  */
 class JacksonMessagingUtilsTests {
 
-	private static final JacksonModule JODA_MODULE = new JodaModule();
-
-	private static final JacksonModule KOTLIN_MODULE = new KotlinModule.Builder().build();
-
 	private ObjectMapper mapper;
 
 	@BeforeEach
@@ -56,11 +53,16 @@ void setUp() {
 	}
 
 	@Test
-	void shouldAutoDiscoverAllWellKnownModules() {
-		Set<String> collectedModuleNames = getModuleNames(collectWellKnownModulesIfAvailable());
+	void shouldIncludeWellKnownModules() {
+		List<JacksonModule> wellKnownModules = Arrays.asList(
+				new JodaModule(),
+				new KotlinModule.Builder().build()
+		);
+
+		Set<String> wellKnownModuleNames = getModuleNames(wellKnownModules);
+		Set<String> registeredModuleNames = getModuleNames(mapper.getRegisteredModules());
 
-		Set<String> autoModuleNames = getModuleNames(mapper.getRegisteredModules());
-		assertThat(autoModuleNames).containsAll(collectedModuleNames);
+		assertThat(registeredModuleNames).containsAll(wellKnownModuleNames);
 	}
 
 	@Test
@@ -138,8 +140,4 @@ private Set<String> getModuleNames(Collection<JacksonModule> modules) {
 				.collect(Collectors.toUnmodifiableSet());
 	}
 
-	private List<JacksonModule> collectWellKnownModulesIfAvailable() {
-		return List.of(JODA_MODULE, KOTLIN_MODULE);
-	}
-
 }