Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6572c36

Browse files
Fix comments
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
1 parent 93d232d commit 6572c36

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

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

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
import com.rabbitmq.client.amqp.impl.AmqpEnvironmentBuilder.EnvironmentConnectionSettings;
2424

2525
import org.springframework.amqp.rabbit.config.ContainerCustomizer;
26-
import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder;
2726
import org.springframework.amqp.rabbit.retry.MessageRecoverer;
28-
import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer;
2927
import org.springframework.amqp.rabbitmq.client.AmqpConnectionFactory;
3028
import org.springframework.amqp.rabbitmq.client.RabbitAmqpAdmin;
3129
import org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate;
@@ -35,8 +33,6 @@
3533
import org.springframework.amqp.support.converter.MessageConverter;
3634
import org.springframework.beans.factory.ObjectProvider;
3735
import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address;
38-
import org.springframework.boot.amqp.autoconfigure.RabbitProperties.ListenerRetry;
39-
import org.springframework.boot.amqp.autoconfigure.RabbitRetryTemplateCustomizer.Target;
4036
import org.springframework.boot.autoconfigure.AutoConfiguration;
4137
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4238
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -45,15 +41,14 @@
4541
import org.springframework.boot.context.properties.PropertyMapper;
4642
import org.springframework.boot.ssl.SslBundles;
4743
import org.springframework.context.annotation.Bean;
48-
import org.springframework.retry.support.RetryTemplate;
4944

5045
/**
5146
* {@link EnableAutoConfiguration Auto-configuration} for {@link RabbitAmqpTemplate}.
5247
*
5348
* @author Eddú Meléndez
5449
* @since 4.0.0
5550
*/
56-
@AutoConfiguration
51+
@AutoConfiguration(before = RabbitAutoConfiguration.class)
5752
@ConditionalOnClass({ RabbitAmqpTemplate.class, Connection.class })
5853
@EnableConfigurationProperties(RabbitProperties.class)
5954
public final class RabbitAmqpAutoConfiguration {
@@ -82,20 +77,6 @@ RabbitAmqpListenerContainerFactory rabbitAmqpListenerContainerFactory(
8277

8378
RabbitProperties.AmqpContainer configuration = this.properties.getListener().getSimple();
8479
factory.setObservationEnabled(configuration.isObservationEnabled());
85-
ListenerRetry retryConfig = configuration.getRetry();
86-
if (retryConfig.isEnabled()) {
87-
RetryInterceptorBuilder<?, ?> builder = (retryConfig.isStateless()) ? RetryInterceptorBuilder.stateless()
88-
: RetryInterceptorBuilder.stateful();
89-
90-
RetryTemplate retryTemplate = new RetryTemplateFactory(retryTemplateCustomizers.orderedStream().toList())
91-
.createRetryTemplate(retryConfig, Target.LISTENER);
92-
93-
builder.retryOperations(retryTemplate);
94-
MessageRecoverer recoverer = (messageRecoverer.getIfAvailable() != null) ? messageRecoverer.getIfAvailable()
95-
: new RejectAndDontRequeueRecoverer();
96-
builder.recoverer(recoverer);
97-
factory.setAdviceChain(builder.build());
98-
}
9980
return factory;
10081
}
10182

@@ -123,7 +104,7 @@ Environment rabbitAmqpEnvironment(RabbitConnectionDetails connectionDetails,
123104

124105
@Bean
125106
@ConditionalOnMissingBean
126-
AmqpConnectionFactory amqpConnection(Environment environment) {
107+
AmqpConnectionFactory amqpConnectionFactory(Environment environment) {
127108
return new SingleAmqpConnectionFactory(environment);
128109
}
129110

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,6 @@ void whenMultipleRabbitAmqpTemplateCustomizersAreDefinedThenTheyAreCalledInOrder
9292
});
9393
}
9494

95-
@Test
96-
void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
97-
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
98-
.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true")
99-
.run((context) -> {
100-
RabbitAmqpListenerContainerFactory rabbitListenerContainerFactory = context
101-
.getBean("rabbitAmqpListenerContainerFactory", RabbitAmqpListenerContainerFactory.class);
102-
assertListenerRetryTemplate(rabbitListenerContainerFactory,
103-
context.getBean(RabbitRetryTemplateCustomizerConfiguration.class).retryPolicy);
104-
});
105-
}
106-
10795
private void assertListenerRetryTemplate(BaseRabbitListenerContainerFactory<?> rabbitListenerContainerFactory,
10896
RetryPolicy retryPolicy) {
10997
Advice[] adviceChain = rabbitListenerContainerFactory.getAdviceChain();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /