Fix comments

Signed-off-by: Eddú Meléndez <[email protected]>

Author: eddumelendez

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

@@ -23,9 +23,7 @@
 import com.rabbitmq.client.amqp.impl.AmqpEnvironmentBuilder.EnvironmentConnectionSettings;
 
 import org.springframework.amqp.rabbit.config.ContainerCustomizer;
-import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder;
 import org.springframework.amqp.rabbit.retry.MessageRecoverer;
-import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer;
 import org.springframework.amqp.rabbitmq.client.AmqpConnectionFactory;
 import org.springframework.amqp.rabbitmq.client.RabbitAmqpAdmin;
 import org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate;
@@ -35,8 +33,6 @@
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address;
-import org.springframework.boot.amqp.autoconfigure.RabbitProperties.ListenerRetry;
-import org.springframework.boot.amqp.autoconfigure.RabbitRetryTemplateCustomizer.Target;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -45,15 +41,14 @@
 import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
-import org.springframework.retry.support.RetryTemplate;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link RabbitAmqpTemplate}.
  *
  * @author Eddú Meléndez
  * @since 4.0.0
  */
-@AutoConfiguration
+@AutoConfiguration(before = RabbitAutoConfiguration.class)
 @ConditionalOnClass({ RabbitAmqpTemplate.class, Connection.class })
 @EnableConfigurationProperties(RabbitProperties.class)
 public final class RabbitAmqpAutoConfiguration {
@@ -82,20 +77,6 @@ RabbitAmqpListenerContainerFactory rabbitAmqpListenerContainerFactory(
 
 		RabbitProperties.AmqpContainer configuration = this.properties.getListener().getSimple();
 		factory.setObservationEnabled(configuration.isObservationEnabled());
-		ListenerRetry retryConfig = configuration.getRetry();
-		if (retryConfig.isEnabled()) {
-			RetryInterceptorBuilder<?, ?> builder = (retryConfig.isStateless()) ? RetryInterceptorBuilder.stateless()
-					: RetryInterceptorBuilder.stateful();
-
-			RetryTemplate retryTemplate = new RetryTemplateFactory(retryTemplateCustomizers.orderedStream().toList())
-				.createRetryTemplate(retryConfig, Target.LISTENER);
-
-			builder.retryOperations(retryTemplate);
-			MessageRecoverer recoverer = (messageRecoverer.getIfAvailable() != null) ? messageRecoverer.getIfAvailable()
-					: new RejectAndDontRequeueRecoverer();
-			builder.recoverer(recoverer);
-			factory.setAdviceChain(builder.build());
-		}
 		return factory;
 	}
 
@@ -123,7 +104,7 @@ Environment rabbitAmqpEnvironment(RabbitConnectionDetails connectionDetails,
 
 	@Bean
 	@ConditionalOnMissingBean
-	AmqpConnectionFactory amqpConnection(Environment environment) {
+	AmqpConnectionFactory amqpConnectionFactory(Environment environment) {
 		return new SingleAmqpConnectionFactory(environment);
 	}
 

module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfigurationTests.java

@@ -92,18 +92,6 @@ void whenMultipleRabbitAmqpTemplateCustomizersAreDefinedThenTheyAreCalledInOrder
 			});
 	}
 
-	@Test
-	void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
-		this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
-			.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true")
-			.run((context) -> {
-				RabbitAmqpListenerContainerFactory rabbitListenerContainerFactory = context
-					.getBean("rabbitAmqpListenerContainerFactory", RabbitAmqpListenerContainerFactory.class);
-				assertListenerRetryTemplate(rabbitListenerContainerFactory,
-						context.getBean(RabbitRetryTemplateCustomizerConfiguration.class).retryPolicy);
-			});
-	}
-
 	private void assertListenerRetryTemplate(BaseRabbitListenerContainerFactory<?> rabbitListenerContainerFactory,
 			RetryPolicy retryPolicy) {
 		Advice[] adviceChain = rabbitListenerContainerFactory.getAdviceChain();