diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index 12a621faed88..e6c006c256a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -154,9 +154,11 @@ public RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties proper @Bean @ConditionalOnSingleCandidate(ConnectionFactory.class) @ConditionalOnMissingBean(RabbitOperations.class) - public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory) { + public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory, + ObjectProvider rabbitTemplateCustomizers) { RabbitTemplate template = new RabbitTemplate(); configurer.configure(template, connectionFactory); + rabbitTemplateCustomizers.orderedStream().forEach((customizer) -> customizer.customize(template)); return template; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateCustomizer.java new file mode 100644 index 000000000000..a87d10cf824a --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateCustomizer.java @@ -0,0 +1,37 @@ +/* + * Copyright 2012-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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.amqp; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; + +/** + * Callback interface that can be used to customize a {@link RabbitTemplate}. + * + * @author dang zhicairang + * @since 2.3.0 + */ +@FunctionalInterface +public interface RabbitTemplateCustomizer { + + /** + * Customize the {@link RabbitTemplate}, such as used in + * {@link RabbitAutoConfiguration}. + * @param rabbitTemplate the rabbitTemplate to customize + */ + void customize(RabbitTemplate rabbitTemplate); + +} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index c7ea9beeed7d..3d37447c5420 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -372,6 +372,22 @@ void testRabbitTemplateConfigurerUsesConfig() { }); } + @Test + void whenMultipleRabbitTemplateCustomizersAreDefinedThenTheyAreCalledInOrder() { + this.contextRunner.withUserConfiguration(MultipleRabbitTemplateCustomizersConfiguration.class) + .run((context) -> { + RabbitTemplateCustomizer firstCustomizer = context.getBean("firstCustomizer", + RabbitTemplateCustomizer.class); + RabbitTemplateCustomizer secondCustomizer = context.getBean("secondCustomizer", + RabbitTemplateCustomizer.class); + InOrder inOrder = inOrder(firstCustomizer, secondCustomizer); + RabbitTemplate template = context.getBean(RabbitTemplate.class); + then(firstCustomizer).should(inOrder).customize(template); + then(secondCustomizer).should(inOrder).customize(template); + inOrder.verifyNoMoreInteractions(); + }); + } + @Test void testConnectionFactoryBackOff() { this.contextRunner.withUserConfiguration(TestConfiguration2.class).run((context) -> { @@ -972,6 +988,23 @@ MessageRecoverer anotherMessageRecoverer() { } + @Configuration(proxyBeanMethods = false) + static class MultipleRabbitTemplateCustomizersConfiguration { + + @Bean + @Order(Ordered.LOWEST_PRECEDENCE) + RabbitTemplateCustomizer secondCustomizer() { + return mock(RabbitTemplateCustomizer.class); + } + + @Bean + @Order(0) + RabbitTemplateCustomizer firstCustomizer() { + return mock(RabbitTemplateCustomizer.class); + } + + } + @Configuration(proxyBeanMethods = false) static class ConnectionNameStrategyConfiguration {