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 2be167a

Browse files
Switch to ConditionalOnMissingBean
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
1 parent 2644bc2 commit 2be167a

File tree

6 files changed

+6
-23
lines changed

6 files changed

+6
-23
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import org.springframework.amqp.rabbit.core.RabbitMessagingTemplate;
3030
import org.springframework.amqp.rabbit.core.RabbitOperations;
3131
import org.springframework.amqp.rabbit.core.RabbitTemplate;
32+
import org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate;
3233
import org.springframework.amqp.support.converter.MessageConverter;
3334
import org.springframework.beans.factory.ObjectProvider;
3435
import org.springframework.boot.autoconfigure.AutoConfiguration;
3536
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3637
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
3738
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3839
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
39-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
4040
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
4141
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4242
import org.springframework.boot.ssl.SslBundles;
@@ -77,8 +77,7 @@
7777
*/
7878
@AutoConfiguration
7979
@ConditionalOnClass({ RabbitTemplate.class, Channel.class })
80-
@ConditionalOnMissingClass({ "com.rabbitmq.client.amqp.Connection",
81-
"org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate" })
80+
@ConditionalOnMissingBean(RabbitAmqpTemplate.class)
8281
@EnableConfigurationProperties(RabbitProperties.class)
8382
@Import({ RabbitAnnotationDrivenConfiguration.class, RabbitStreamConfiguration.class })
8483
public final class RabbitAutoConfiguration {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,13 @@
115115
* @author Phillip Webb
116116
* @author Scott Frederick
117117
* @author Yanming Zhou
118-
* @author Eddú Meléndez
119118
*/
120119
@ExtendWith(OutputCaptureExtension.class)
121120
class RabbitAutoConfigurationTests {
122121

123122
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
124123
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, SslAutoConfiguration.class))
125-
.withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream", "com.rabbitmq.client.amqp",
126-
"org.springframework.amqp.rabbitmq.client")); // gh-38750
124+
.withClassLoader(new FilteredClassLoader("org.springframework.rabbit.stream")); // gh-38750
127125

128126
@Test
129127
void testDefaultRabbitConfiguration() {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
3434
import org.springframework.amqp.support.converter.MessageConverter;
3535
import org.springframework.boot.autoconfigure.AutoConfigurations;
36-
import org.springframework.boot.test.context.FilteredClassLoader;
3736
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3837
import org.springframework.context.annotation.Bean;
3938
import org.springframework.context.annotation.Configuration;
@@ -61,9 +60,7 @@
6160
class RabbitStreamConfigurationTests {
6261

6362
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
64-
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class))
65-
.withClassLoader(
66-
new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
63+
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class));
6764

6865
@Test
6966
@SuppressWarnings("unchecked")

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.boot.amqp.health.RabbitHealthIndicator;
2323
import org.springframework.boot.autoconfigure.AutoConfigurations;
2424
import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
25-
import org.springframework.boot.test.context.FilteredClassLoader;
2625
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2726

2827
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,15 +30,12 @@
3130
* Tests for {@link RabbitHealthContributorAutoConfiguration}.
3231
*
3332
* @author Phillip Webb
34-
* @author Eddú Meléndez
3533
*/
3634
class RabbitHealthContributorAutoConfigurationTests {
3735

3836
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
3937
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class,
40-
RabbitHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class))
41-
.withClassLoader(
42-
new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
38+
RabbitHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
4339

4440
@Test
4541
void runShouldCreateIndicator() {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.amqp.rabbit.core.RabbitTemplate;
2525
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2626
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
27-
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
2827
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2928
import org.springframework.context.annotation.Bean;
3029
import org.springframework.context.annotation.Configuration;
@@ -37,10 +36,8 @@
3736
* dependency cycle when used with {@link MeterBinder}.
3837
*
3938
* @author Phillip Webb
40-
* @author Eddú Meléndez
4139
* @see <a href="https://github.com/spring-projects/spring-boot/issues/30636">gh-30636</a>
4240
*/
43-
@ClassPathExclusions(files = "spring-rabbitmq-client-*.jar", packages = "com.rabbitmq.client.amqp")
4441
class RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests {
4542

4643
@Test

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
2727
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
28-
import org.springframework.boot.test.context.FilteredClassLoader;
2928
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3029
import org.springframework.context.annotation.Bean;
3130
import org.springframework.context.annotation.Configuration;
@@ -36,17 +35,14 @@
3635
* Tests for {@link RabbitMetricsAutoConfiguration}.
3736
*
3837
* @author Stephane Nicoll
39-
* @author Eddú Meléndez
4038
*/
4139
class RabbitMetricsAutoConfigurationTests {
4240

4341
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
4442
.withBean(SimpleMeterRegistry.class)
4543
.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class, RabbitMetricsAutoConfiguration.class,
4644
MetricsAutoConfiguration.class))
47-
.withPropertyValues("management.metrics.use-global-registry=false")
48-
.withClassLoader(
49-
new FilteredClassLoader("com.rabbitmq.client.amqp", "org.springframework.amqp.rabbitmq.client"));
45+
.withPropertyValues("management.metrics.use-global-registry=false");
5046

5147
@Test
5248
void autoConfiguredConnectionFactoryIsInstrumented() {

0 commit comments

Comments
(0)

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