GH-2225: Fix New Package Tangle

Resolves #2255

* Also move test; fix deprecation warnings.

**Cherry-pick to 2.9.x**

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafkaRetryTopic.java

@@ -24,7 +24,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.kafka.config.RetryTopicConfigurationSupport;
+import org.springframework.kafka.retrytopic.RetryTopicConfigurationSupport;
 
 /**
  * Enables the non-blocking topic-based delayed retries feature. To be used in

spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicBootstrapper.java

@@ -45,7 +45,7 @@
  *
  * @author Tomaz Fernandes
  * @since 2.7
- * @deprecated in favor of {@link org.springframework.kafka.config.RetryTopicConfigurationSupport}
+ * @deprecated in favor of {@link org.springframework.kafka.retrytopic.RetryTopicConfigurationSupport}
  *
  */
 @Deprecated

spring-kafka/src/main/java/org/springframework/kafka/config/RetryTopicComponentFactory.java renamed to spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicComponentFactory.java

@@ -14,31 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.kafka.config;
+package org.springframework.kafka.retrytopic;
 
 import java.time.Clock;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.kafka.config.KafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerEndpoint;
 import org.springframework.kafka.listener.DeadLetterPublishingRecoverer;
 import org.springframework.kafka.listener.KafkaBackOffManagerFactory;
 import org.springframework.kafka.listener.KafkaConsumerBackoffManager;
 import org.springframework.kafka.listener.ListenerContainerRegistry;
 import org.springframework.kafka.listener.MessageListenerContainer;
 import org.springframework.kafka.listener.PartitionPausingBackOffManagerFactory;
 import org.springframework.kafka.listener.adapter.KafkaBackoffAwareMessageListenerAdapter;
-import org.springframework.kafka.retrytopic.DeadLetterPublishingRecovererFactory;
-import org.springframework.kafka.retrytopic.DefaultDestinationTopicProcessor;
-import org.springframework.kafka.retrytopic.DefaultDestinationTopicResolver;
-import org.springframework.kafka.retrytopic.DestinationTopic;
-import org.springframework.kafka.retrytopic.DestinationTopicContainer;
-import org.springframework.kafka.retrytopic.DestinationTopicProcessor;
-import org.springframework.kafka.retrytopic.DestinationTopicResolver;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryConfigurer;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryResolver;
-import org.springframework.kafka.retrytopic.RetryTopicConfiguration;
-import org.springframework.kafka.retrytopic.RetryTopicConfigurer;
-import org.springframework.kafka.retrytopic.RetryTopicNamesProviderFactory;
-import org.springframework.kafka.retrytopic.SuffixingRetryTopicNamesProviderFactory;
 
 /**
  * Provide the component instances that will be used with

spring-kafka/src/main/java/org/springframework/kafka/config/RetryTopicConfigurationSupport.java renamed to spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.kafka.config;
+package org.springframework.kafka.retrytopic;
 
 import java.time.Clock;
 import java.util.ArrayList;
@@ -32,6 +32,8 @@
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.kafka.annotation.EnableKafkaRetryTopic;
 import org.springframework.kafka.annotation.KafkaListenerAnnotationBeanPostProcessor;
+import org.springframework.kafka.config.KafkaListenerConfigUtils;
+import org.springframework.kafka.config.KafkaListenerEndpoint;
 import org.springframework.kafka.listener.CommonErrorHandler;
 import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 import org.springframework.kafka.listener.DeadLetterPublishingRecoverer;
@@ -44,18 +46,6 @@
 import org.springframework.kafka.listener.MessageListenerContainer;
 import org.springframework.kafka.listener.PartitionPausingBackOffManagerFactory;
 import org.springframework.kafka.listener.WakingKafkaConsumerTimingAdjuster;
-import org.springframework.kafka.retrytopic.DeadLetterPublishingRecovererFactory;
-import org.springframework.kafka.retrytopic.DefaultDestinationTopicResolver;
-import org.springframework.kafka.retrytopic.DestinationTopic;
-import org.springframework.kafka.retrytopic.DestinationTopicProcessor;
-import org.springframework.kafka.retrytopic.DestinationTopicResolver;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryConfigurer;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryResolver;
-import org.springframework.kafka.retrytopic.RetryTopicBeanNames;
-import org.springframework.kafka.retrytopic.RetryTopicBootstrapper;
-import org.springframework.kafka.retrytopic.RetryTopicConfigurer;
-import org.springframework.kafka.retrytopic.RetryTopicInternalBeanNames;
-import org.springframework.kafka.retrytopic.RetryTopicNamesProviderFactory;
 import org.springframework.kafka.support.JavaUtils;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.Assert;

spring-kafka/src/test/java/org/springframework/kafka/config/RetryTopicConfigurationSupportTests.java renamed to spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationSupportTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.kafka.config;
+package org.springframework.kafka.retrytopic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -42,14 +42,6 @@
 import org.springframework.kafka.listener.KafkaConsumerBackoffManager;
 import org.springframework.kafka.listener.ListenerContainerRegistry;
 import org.springframework.kafka.listener.PartitionPausingBackOffManagerFactory;
-import org.springframework.kafka.retrytopic.DeadLetterPublishingRecovererFactory;
-import org.springframework.kafka.retrytopic.DefaultDestinationTopicResolver;
-import org.springframework.kafka.retrytopic.DestinationTopicProcessor;
-import org.springframework.kafka.retrytopic.DestinationTopicResolver;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryConfigurer;
-import org.springframework.kafka.retrytopic.ListenerContainerFactoryResolver;
-import org.springframework.kafka.retrytopic.RetryTopicConfigurer;
-import org.springframework.kafka.retrytopic.RetryTopicNamesProviderFactory;
 import org.springframework.kafka.support.converter.ConversionException;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.backoff.BackOff;

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicExceptionRoutingIntegrationTests.java

@@ -43,7 +43,6 @@
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.annotation.RetryableTopic;
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-import org.springframework.kafka.config.RetryTopicConfigurationSupport;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaProducerFactory;

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicInternalBeanNamesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.