Add @SuppressWarnings("removal") into some reported places

artembilan · artembilan · commit a3152d99be0c · 2025-08-14T10:26:53.000-04:00
* Add missed new `JacksonJsonDeserializer` and `JacksonJsonSerializer` to `KafkaRuntimeHints`

The project build is now green
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/aot/KafkaRuntimeHints.java b/spring-kafka/src/main/java/org/springframework/kafka/aot/KafkaRuntimeHints.java
@@ -58,8 +58,8 @@
 import org.springframework.kafka.support.serializer.DelegatingDeserializer;
 import org.springframework.kafka.support.serializer.DelegatingSerializer;
 import org.springframework.kafka.support.serializer.ErrorHandlingDeserializer;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
-import org.springframework.kafka.support.serializer.JsonSerializer;
+import org.springframework.kafka.support.serializer.JacksonJsonDeserializer;
+import org.springframework.kafka.support.serializer.JacksonJsonSerializer;
 import org.springframework.kafka.support.serializer.ParseStringDeserializer;
 import org.springframework.kafka.support.serializer.StringOrBytesSerializer;
 import org.springframework.kafka.support.serializer.ToStringSerializer;
@@ -75,73 +75,76 @@
 public class KafkaRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
+	@SuppressWarnings("removal")
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		ReflectionHints reflectionHints = hints.reflection();
 		Stream.of(
-					ConsumerProperties.class,
-					ContainerProperties.class,
-					KafkaMessageHeaderAccessor.class,
-					ProducerListener.class)
+						ConsumerProperties.class,
+						ContainerProperties.class,
+						KafkaMessageHeaderAccessor.class,
+						ProducerListener.class)
 				.forEach(type -> reflectionHints.registerType(type,
 						builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_METHODS)));
 
 		Stream.of(
-					Message.class,
-					ImplicitLinkedHashCollection.Element.class,
-					NewTopic.class,
-					AbstractKafkaListenerContainerFactory.class,
-					ConcurrentKafkaListenerContainerFactory.class,
-					KafkaListenerContainerFactory.class,
-					KafkaListenerEndpointRegistry.class,
-					DefaultKafkaConsumerFactory.class,
-					DefaultKafkaProducerFactory.class,
-					KafkaAdmin.class,
-					KafkaOperations.class,
-					KafkaResourceFactory.class,
-					KafkaTemplate.class,
-					ProducerFactory.class,
-					ConsumerFactory.class,
-					LoggingProducerListener.class,
-					KafkaListenerAnnotationBeanPostProcessor.class)
+						Message.class,
+						ImplicitLinkedHashCollection.Element.class,
+						NewTopic.class,
+						AbstractKafkaListenerContainerFactory.class,
+						ConcurrentKafkaListenerContainerFactory.class,
+						KafkaListenerContainerFactory.class,
+						KafkaListenerEndpointRegistry.class,
+						DefaultKafkaConsumerFactory.class,
+						DefaultKafkaProducerFactory.class,
+						KafkaAdmin.class,
+						KafkaOperations.class,
+						KafkaResourceFactory.class,
+						KafkaTemplate.class,
+						ProducerFactory.class,
+						ConsumerFactory.class,
+						LoggingProducerListener.class,
+						KafkaListenerAnnotationBeanPostProcessor.class)
 				.forEach(type -> reflectionHints.registerType(type,
 						builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
 								MemberCategory.INVOKE_DECLARED_METHODS)));
 
 		Stream.of(
-					KafkaBootstrapConfiguration.class,
-					CreatableTopic.class)
+						KafkaBootstrapConfiguration.class,
+						CreatableTopic.class)
 				.forEach(type -> reflectionHints.registerType(type,
 						builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)));
 
 		Stream.of(
-					AppInfo.class,
-					// standard serialization
-					// Spring serialization
-					DelegatingByTopicDeserializer.class,
-					DelegatingByTypeSerializer.class,
-					DelegatingDeserializer.class,
-					ErrorHandlingDeserializer.class,
-					DelegatingSerializer.class,
-					JsonDeserializer.class,
-					JsonSerializer.class,
-					ParseStringDeserializer.class,
-					StringOrBytesSerializer.class,
-					ToStringSerializer.class,
-					Serdes.class,
-					CRC32C.class)
+						AppInfo.class,
+						// standard serialization
+						// Spring serialization
+						DelegatingByTopicDeserializer.class,
+						DelegatingByTypeSerializer.class,
+						DelegatingDeserializer.class,
+						ErrorHandlingDeserializer.class,
+						DelegatingSerializer.class,
+						org.springframework.kafka.support.serializer.JsonDeserializer.class,
+						org.springframework.kafka.support.serializer.JsonSerializer.class,
+						JacksonJsonDeserializer.class,
+						JacksonJsonSerializer.class,
+						ParseStringDeserializer.class,
+						StringOrBytesSerializer.class,
+						ToStringSerializer.class,
+						Serdes.class,
+						CRC32C.class)
 				.forEach(type -> reflectionHints.registerType(type, builder ->
 						builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS)));
 
 		hints.proxies().registerJdkProxy(AopProxyUtils.completeJdkProxyInterfaces(Consumer.class));
 		hints.proxies().registerJdkProxy(AopProxyUtils.completeJdkProxyInterfaces(Producer.class));
 
 		Stream.of(
-				"sun.security.provider.ConfigFile",
-				"org.apache.kafka.streams.processor.internals.assignment.StickyTaskAssignor",
-				"org.apache.kafka.streams.processor.internals.assignment.FallbackPriorTaskAssignor",
-				"org.apache.kafka.streams.errors.LogAndFailProcessingExceptionHandler")
-			.forEach(type -> reflectionHints.registerTypeIfPresent(classLoader, type, builder ->
-					builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS)));
+						"sun.security.provider.ConfigFile",
+						"org.apache.kafka.streams.processor.internals.assignment.StickyTaskAssignor",
+						"org.apache.kafka.streams.processor.internals.assignment.FallbackPriorTaskAssignor",
+						"org.apache.kafka.streams.errors.LogAndFailProcessingExceptionHandler")
+				.forEach(type -> reflectionHints.registerTypeIfPresent(classLoader, type, builder ->
+						builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS)));
 	}
 
 }
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MappingJacksonParameterizedConverter.java b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MappingJacksonParameterizedConverter.java
@@ -26,16 +26,12 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.kafka.support.KafkaHeaders;
-import org.springframework.kafka.support.mapping.DefaultJackson2JavaTypeMapper;
-import org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper;
-import org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
 
 /**
- * Subclass of {@link MappingJackson2MessageConverter} that can handle parameterized
+ * Subclass of {@link org.springframework.messaging.converter.MappingJackson2MessageConverter} that can handle parameterized
  * (generic) types.
  *
  * @author Gary Russell
@@ -44,11 +40,14 @@
  * @deprecated since 4.0 in favor of {@link MappingJacksonJsonParameterizedConverter} for Jackson 3.
  */
 @Deprecated(forRemoval = true, since = "4.0")
-public class MappingJacksonParameterizedConverter extends MappingJackson2MessageConverter {
+@SuppressWarnings("removal")
+public class MappingJacksonParameterizedConverter
+		extends org.springframework.messaging.converter.MappingJackson2MessageConverter {
 
 	private static final JavaType OBJECT = TypeFactory.defaultInstance().constructType(Object.class);
 
-	private Jackson2JavaTypeMapper typeMapper = new DefaultJackson2JavaTypeMapper();
+	private org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper typeMapper =
+			new org.springframework.kafka.support.mapping.DefaultJackson2JavaTypeMapper();
 
 	/**
 	 * Construct a {@code MappingJacksonParameterizedConverter} supporting
@@ -70,15 +69,15 @@ public MappingJacksonParameterizedConverter(MimeType... supportedMimeTypes) {
 	 * Return the type mapper.
 	 * @return the mapper.
 	 */
-	public Jackson2JavaTypeMapper getTypeMapper() {
+	public org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper getTypeMapper() {
 		return this.typeMapper;
 	}
 
 	/**
 	 * Set a customized type mapper.
 	 * @param typeMapper the type mapper.
 	 */
-	public void setTypeMapper(Jackson2JavaTypeMapper typeMapper) {
+	public void setTypeMapper(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper typeMapper) {
 		Assert.notNull(typeMapper, "'typeMapper' cannot be null");
 		this.typeMapper = typeMapper;
 	}
@@ -119,7 +118,8 @@ private JavaType determineJavaType(Message<?> message, @Nullable Object hint) {
 			type = (Type) hint;
 			Headers nativeHeaders = message.getHeaders().get(KafkaHeaders.NATIVE_HEADERS, Headers.class);
 			if (nativeHeaders != null) {
-				javaType = this.typeMapper.getTypePrecedence().equals(TypePrecedence.INFERRED)
+				javaType = this.typeMapper.getTypePrecedence()
+						.equals(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.INFERRED)
 						? TypeFactory.defaultInstance().constructType(type)
 						: this.typeMapper.toJavaType(nativeHeaders);
 			}
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonDeserializer.java b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonDeserializer.java
@@ -40,11 +40,6 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.kafka.support.JacksonUtils;
-import org.springframework.kafka.support.mapping.AbstractJavaTypeMapper;
-import org.springframework.kafka.support.mapping.DefaultJackson2JavaTypeMapper;
-import org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper;
-import org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
@@ -71,6 +66,7 @@
  * @deprecated since 4.0 in favor of {@link JacksonJsonDeserializer} for Jackson 3.
  */
 @Deprecated(forRemoval = true, since = "4.0")
+@SuppressWarnings("removal")
 public class JsonDeserializer<T> implements Deserializer<T> {
 
 	/**
@@ -134,7 +130,8 @@ public class JsonDeserializer<T> implements Deserializer<T> {
 
 	protected @Nullable JavaType targetType; // NOSONAR
 
-	protected Jackson2JavaTypeMapper typeMapper = new DefaultJackson2JavaTypeMapper(); // NOSONAR
+	protected org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper typeMapper =
+			new org.springframework.kafka.support.mapping.DefaultJackson2JavaTypeMapper(); // NOSONAR
 
 	private @Nullable ObjectReader reader;
 
@@ -203,7 +200,7 @@ public JsonDeserializer(@Nullable JavaType targetType) {
 	 * @since 2.2
 	 */
 	public JsonDeserializer(@Nullable Class<? super T> targetType, boolean useHeadersIfPresent) {
-		this(targetType, JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
+		this(targetType, org.springframework.kafka.support.JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
 	}
 
 	/**
@@ -215,7 +212,7 @@ public JsonDeserializer(@Nullable Class<? super T> targetType, boolean useHeader
 	 * @since 2.3
 	 */
 	public JsonDeserializer(@Nullable TypeReference<? super T> targetType, boolean useHeadersIfPresent) {
-		this(targetType, JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
+		this(targetType, org.springframework.kafka.support.JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
 	}
 
 	/**
@@ -227,7 +224,7 @@ public JsonDeserializer(@Nullable TypeReference<? super T> targetType, boolean u
 	 * @since 2.3
 	 */
 	public JsonDeserializer(@Nullable JavaType targetType, boolean useHeadersIfPresent) {
-		this(targetType, JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
+		this(targetType, org.springframework.kafka.support.JacksonUtils.enhancedObjectMapper(), useHeadersIfPresent);
 	}
 
 	/**
@@ -318,22 +315,22 @@ public JsonDeserializer(@Nullable JavaType targetType, ObjectMapper objectMapper
 		initialize(targetType, useHeadersIfPresent);
 	}
 
-	public Jackson2JavaTypeMapper getTypeMapper() {
+	public org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper getTypeMapper() {
 		return this.typeMapper;
 	}
 
 	/**
-	 * Set a customized type mapper. If the mapper is an {@link AbstractJavaTypeMapper},
+	 * Set a customized type mapper. If the mapper is an {@link org.springframework.kafka.support.mapping.AbstractJavaTypeMapper},
 	 * any class mappings configured in the mapper will be added to the trusted packages.
 	 * @param typeMapper the type mapper.
 	 * @since 2.1
 	 */
-	public void setTypeMapper(Jackson2JavaTypeMapper typeMapper) {
+	public void setTypeMapper(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper typeMapper) {
 		Assert.notNull(typeMapper, "'typeMapper' cannot be null");
 		this.typeMapper = typeMapper;
 		this.typeMapperExplicitlySet = true;
-		if (typeMapper instanceof AbstractJavaTypeMapper) {
-			addMappingsToTrusted(((AbstractJavaTypeMapper) typeMapper).getIdClassMapping());
+		if (typeMapper instanceof org.springframework.kafka.support.mapping.AbstractJavaTypeMapper typeMapperToUse) {
+			addMappingsToTrusted(typeMapperToUse.getIdClassMapping());
 		}
 		this.setterCalled = true;
 	}
@@ -350,8 +347,8 @@ public void setUseTypeMapperForKey(boolean isKey) {
 
 	private void doSetUseTypeMapperForKey(boolean isKey) {
 		if (!this.typeMapperExplicitlySet
-				&& this.getTypeMapper() instanceof AbstractJavaTypeMapper) {
-			((AbstractJavaTypeMapper) this.getTypeMapper()).setUseForKey(isKey);
+				&& this.getTypeMapper() instanceof org.springframework.kafka.support.mapping.AbstractJavaTypeMapper typeMapperToUse) {
+			typeMapperToUse.setUseForKey(isKey);
 		}
 	}
 
@@ -422,8 +419,8 @@ public void configure(Map<String, ?> configs, boolean isKey) {
 						StringUtils.delimitedListToStringArray((String) configs.get(TRUSTED_PACKAGES), ",", " \r\n\f\t"));
 			}
 			if (configs.containsKey(TYPE_MAPPINGS) && !this.typeMapperExplicitlySet
-					&& this.typeMapper instanceof AbstractJavaTypeMapper) {
-				((AbstractJavaTypeMapper) this.typeMapper).setIdClassMapping(createMappings(configs));
+					&& this.typeMapper instanceof org.springframework.kafka.support.mapping.AbstractJavaTypeMapper typeMapperToUse) {
+				typeMapperToUse.setIdClassMapping(createMappings(configs));
 			}
 			if (configs.containsKey(REMOVE_TYPE_INFO_HEADERS)) {
 				this.removeTypeHeaders = Boolean.parseBoolean(configs.get(REMOVE_TYPE_INFO_HEADERS).toString());
@@ -469,8 +466,8 @@ private void setUpTypeResolver(String method) {
 		catch (IllegalStateException e) {
 			if (e.getCause() instanceof NoSuchMethodException) {
 				this.typeResolver = (topic, data, headers) ->
-					(JavaType) SerializationUtils.propertyToMethodInvokingFunction(
-							method, byte[].class, getClass().getClassLoader()).apply(data, headers);
+						(JavaType) SerializationUtils.propertyToMethodInvokingFunction(
+								method, byte[].class, getClass().getClassLoader()).apply(data, headers);
 				return;
 			}
 			throw e;
@@ -482,7 +479,10 @@ private void setUpTypePrecedence(Map<String, ?> configs) {
 			if (configs.containsKey(USE_TYPE_INFO_HEADERS)) {
 				this.useTypeHeaders = Boolean.parseBoolean(configs.get(USE_TYPE_INFO_HEADERS).toString());
 			}
-			this.typeMapper.setTypePrecedence(this.useTypeHeaders ? TypePrecedence.TYPE_ID : TypePrecedence.INFERRED);
+			this.typeMapper.setTypePrecedence(
+					this.useTypeHeaders
+							? org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.TYPE_ID
+							: org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.INFERRED);
 		}
 	}
 
@@ -497,7 +497,9 @@ else if (!isKey && configs.containsKey(VALUE_DEFAULT_TYPE)) {
 			}
 
 			if (javaType != null) {
-				initialize(javaType, TypePrecedence.TYPE_ID.equals(this.typeMapper.getTypePrecedence()));
+				initialize(javaType,
+						org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.TYPE_ID
+								.equals(this.typeMapper.getTypePrecedence()));
 			}
 		}
 		catch (ClassNotFoundException | LinkageError e) {
@@ -516,7 +518,10 @@ private void initialize(@Nullable JavaType type, boolean useHeadersIfPresent) {
 		}
 
 		addTargetPackageToTrusted();
-		this.typeMapper.setTypePrecedence(useHeadersIfPresent ? TypePrecedence.TYPE_ID : TypePrecedence.INFERRED);
+		this.typeMapper.setTypePrecedence(
+				useHeadersIfPresent
+						? org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.TYPE_ID
+						: org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.INFERRED);
 	}
 
 	private JavaType setupTargetType(Map<String, ?> configs, String key) throws ClassNotFoundException, LinkageError {
@@ -525,7 +530,7 @@ private JavaType setupTargetType(Map<String, ?> configs, String key) throws Clas
 		}
 		else if (configs.get(key) instanceof String) {
 			return TypeFactory.defaultInstance()
-							.constructType(ClassUtils.forName((String) configs.get(key), null));
+					.constructType(ClassUtils.forName((String) configs.get(key), null));
 		}
 		else {
 			throw new IllegalStateException(key + " must be Class or String");
@@ -587,7 +592,9 @@ private void doAddTrustedPackages(String... packages) {
 		if (this.typeResolver != null) {
 			javaType = this.typeResolver.resolveType(topic, data, headers);
 		}
-		if (javaType == null && this.typeMapper.getTypePrecedence().equals(TypePrecedence.TYPE_ID)) {
+		if (javaType == null && this.typeMapper.getTypePrecedence()
+				.equals(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper.TypePrecedence.TYPE_ID)) {
+
 			javaType = this.typeMapper.toJavaType(headers);
 		}
 		if (javaType != null) {
@@ -708,13 +715,13 @@ public JsonDeserializer<T> ignoreTypeHeaders() {
 	}
 
 	/**
-	 * Use the supplied {@link Jackson2JavaTypeMapper}.
+	 * Use the supplied {@link org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper}.
 	 * @param mapper the mapper.
 	 * @return the deserializer.
 	 * @since 2.3
-	 * @see #setTypeMapper(Jackson2JavaTypeMapper)
+	 * @see #setTypeMapper(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper)
 	 */
-	public JsonDeserializer<T> typeMapper(Jackson2JavaTypeMapper mapper) {
+	public JsonDeserializer<T> typeMapper(org.springframework.kafka.support.mapping.Jackson2JavaTypeMapper mapper) {
 		setTypeMapper(mapper);
 		return this;
 	}
@@ -723,7 +730,7 @@ public JsonDeserializer<T> typeMapper(Jackson2JavaTypeMapper mapper) {
 	 * Add trusted packages to the default type mapper.
 	 * @param packages the packages.
 	 * @return the deserializer.
-	 * @since 2,5
+	 * @since 2, 5
 	 */
 	public JsonDeserializer<T> trustedPackages(String... packages) {
 		try {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonSerde.java b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonSerde.java
