Skip to content

Commit c100510

Browse files
izeyesnicoll
authored andcommitted
Remove value in @ConditionalOnMissingBean if possible
See gh-12604
1 parent 5c04e7d commit c100510

27 files changed

+33
-33
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static class MeterBindersConfiguration {
115115
@ConditionalOnClass(name = { "ch.qos.logback.classic.LoggerContext",
116116
"org.slf4j.LoggerFactory" })
117117
@Conditional(LogbackLoggingCondition.class)
118-
@ConditionalOnMissingBean(LogbackMetrics.class)
118+
@ConditionalOnMissingBean
119119
@ConditionalOnProperty(value = "management.metrics.binders.logback.enabled", matchIfMissing = true)
120120
public LogbackMetrics logbackMetrics() {
121121
return new LogbackMetrics();

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
public class AtlasMetricsExportAutoConfiguration {
5353

5454
@Bean
55-
@ConditionalOnMissingBean(AtlasConfig.class)
55+
@ConditionalOnMissingBean
5656
public AtlasConfig atlasConfig(AtlasProperties atlasProperties) {
5757
return new AtlasPropertiesConfigAdapter(atlasProperties);
5858
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
public class InfluxMetricsExportAutoConfiguration {
5252

5353
@Bean
54-
@ConditionalOnMissingBean(InfluxConfig.class)
54+
@ConditionalOnMissingBean
5555
public InfluxConfig influxConfig(InfluxProperties influxProperties) {
5656
return new InfluxPropertiesConfigAdapter(influxProperties);
5757
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public SimpleMeterRegistry simpleMeterRegistry(SimpleConfig config, Clock clock)
5656
}
5757

5858
@Bean
59-
@ConditionalOnMissingBean(SimpleConfig.class)
59+
@ConditionalOnMissingBean
6060
public SimpleConfig simpleConfig(SimpleProperties simpleProperties) {
6161
return new SimplePropertiesConfigAdapter(simpleProperties);
6262
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
public class StatsdMetricsExportAutoConfiguration {
5454

5555
@Bean
56-
@ConditionalOnMissingBean(StatsdConfig.class)
56+
@ConditionalOnMissingBean
5757
public StatsdConfig statsdConfig(StatsdProperties statsdProperties) {
5858
return new StatsdPropertiesConfigAdapter(statsdProperties);
5959
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
public class WavefrontMetricsExportAutoConfiguration {
5252

5353
@Bean
54-
@ConditionalOnMissingBean(WavefrontConfig.class)
54+
@ConditionalOnMissingBean
5555
public WavefrontConfig wavefrontConfig(WavefrontProperties props) {
5656
return new WavefrontPropertiesConfigAdapter(props);
5757
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class TomcatMetricsAutoConfiguration {
4545
private volatile Context context;
4646

4747
@Bean
48-
@ConditionalOnMissingBean(TomcatMetrics.class)
48+
@ConditionalOnMissingBean
4949
public TomcatMetrics tomcatMetrics() {
5050
return new TomcatMetrics(this.context == null ? null : this.context.getManager(),
5151
Collections.emptyList());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public RabbitTemplateConfiguration(
167167

168168
@Bean
169169
@ConditionalOnSingleCandidate(ConnectionFactory.class)
170-
@ConditionalOnMissingBean(RabbitTemplate.class)
170+
@ConditionalOnMissingBean
171171
public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
172172
PropertyMapper map = PropertyMapper.get();
173173
RabbitTemplate template = new RabbitTemplate(connectionFactory);
@@ -213,7 +213,7 @@ private RetryTemplate createRetryTemplate(RabbitProperties.Retry properties) {
213213
@Bean
214214
@ConditionalOnSingleCandidate(ConnectionFactory.class)
215215
@ConditionalOnProperty(prefix = "spring.rabbitmq", name = "dynamic", matchIfMissing = true)
216-
@ConditionalOnMissingBean(AmqpAdmin.class)
216+
@ConditionalOnMissingBean
217217
public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
218218
return new RabbitAdmin(connectionFactory);
219219
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public class PersistenceExceptionTranslationAutoConfiguration {
3838

3939
@Bean
40-
@ConditionalOnMissingBean(PersistenceExceptionTranslationPostProcessor.class)
40+
@ConditionalOnMissingBean
4141
@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", matchIfMissing = true)
4242
public static PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor(
4343
Environment environment) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
public class CassandraReactiveDataAutoConfiguration {
5050

5151
@Bean
52-
@ConditionalOnMissingBean(ReactiveSession.class)
52+
@ConditionalOnMissingBean
5353
public ReactiveSession reactiveCassandraSession(Session session) {
5454
return new DefaultBridgedReactiveSession(session);
5555
}

0 commit comments

Comments
 (0)