Fix deprecation warning in Kafka channel adapters

* The `DefaultKafkaHeaderMapper` is deprecated in Spring Kafka, so we cannot `import` it
* Also fix `PostgresChannelMessageTableSubscriberTests` for `delay(Duration.ZERO)` on retry
to minimize test execution time

Author: artembilan

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/postgres/PostgresChannelMessageTableSubscriberTests.java

@@ -248,7 +248,7 @@ void testRetryOnErrorDuringDispatch(boolean transactionsEnabled) throws Interrup
 
 		int maxAttempts = 2;
 		postgresSubscribableChannel.setRetryTemplate(
-				new RetryTemplate(RetryPolicy.builder().maxAttempts(maxAttempts).build()));
+				new RetryTemplate(RetryPolicy.builder().maxAttempts(maxAttempts).delay(Duration.ZERO).build()));
 
 		if (transactionsEnabled) {
 			postgresSubscribableChannel.setTransactionManager(transactionManager);

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java

@@ -46,7 +46,6 @@
 import org.springframework.kafka.listener.ContainerProperties;
 import org.springframework.kafka.listener.adapter.RecordMessagingMessageListenerAdapter;
 import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
 import org.springframework.kafka.support.JacksonPresent;
 import org.springframework.kafka.support.JsonKafkaHeaderMapper;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -123,7 +122,7 @@ public KafkaInboundGateway(AbstractMessageListenerContainer<K, V> messageListene
 		}
 		else if (JacksonPresent.isJackson2Present()) {
 			MessagingMessageConverter messageConverter = new MessagingMessageConverter();
-			DefaultKafkaHeaderMapper headerMapper = new DefaultKafkaHeaderMapper();
+			var headerMapper = new org.springframework.kafka.support.DefaultKafkaHeaderMapper();
 			headerMapper.addTrustedPackages(
 					org.springframework.integration.support.json.JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES
 							.toArray(new String[0]));

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java

@@ -53,7 +53,6 @@
 import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
 import org.springframework.kafka.listener.adapter.RecordMessagingMessageListenerAdapter;
 import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
 import org.springframework.kafka.support.JacksonPresent;
 import org.springframework.kafka.support.JsonKafkaHeaderMapper;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -150,7 +149,7 @@ public KafkaMessageDrivenChannelAdapter(AbstractMessageListenerContainer<K, V> m
 			this.batchListener.setMessageConverter(messageConverter);
 		}
 		else if (JacksonPresent.isJackson2Present()) {
-			DefaultKafkaHeaderMapper headerMapper = new DefaultKafkaHeaderMapper();
+			var headerMapper = new org.springframework.kafka.support.DefaultKafkaHeaderMapper();
 			headerMapper.addTrustedPackages(
 					org.springframework.integration.support.json.JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES
 							.toArray(new String[0]));

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageSource.java

@@ -66,7 +66,6 @@
 import org.springframework.kafka.listener.ErrorHandlingUtils;
 import org.springframework.kafka.listener.LoggingCommitCallback;
 import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
 import org.springframework.kafka.support.JacksonPresent;
 import org.springframework.kafka.support.JsonKafkaHeaderMapper;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -273,7 +272,7 @@ public KafkaMessageSource(ConsumerFactory<K, V> consumerFactory,
 			messagingMessageConverter.setHeaderMapper(headerMapper);
 		}
 		else if (JacksonPresent.isJackson2Present()) {
-			DefaultKafkaHeaderMapper headerMapper = new DefaultKafkaHeaderMapper();
+			var headerMapper = new org.springframework.kafka.support.DefaultKafkaHeaderMapper();
 			headerMapper.addTrustedPackages(
 					org.springframework.integration.support.json.JacksonJsonUtils.DEFAULT_TRUSTED_PACKAGES
 							.toArray(new String[0]));