Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static class MeterBindersConfiguration {
@ConditionalOnClass(name = { "ch.qos.logback.classic.LoggerContext",
"org.slf4j.LoggerFactory" })
@Conditional(LogbackLoggingCondition.class)
@ConditionalOnMissingBean(LogbackMetrics.class)
@ConditionalOnMissingBean
@ConditionalOnProperty(value = "management.metrics.binders.logback.enabled", matchIfMissing = true)
public LogbackMetrics logbackMetrics() {
return new LogbackMetrics();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
public class AtlasMetricsExportAutoConfiguration {

@Bean
@ConditionalOnMissingBean(AtlasConfig.class)
@ConditionalOnMissingBean
public AtlasConfig atlasConfig(AtlasProperties atlasProperties) {
return new AtlasPropertiesConfigAdapter(atlasProperties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
public class InfluxMetricsExportAutoConfiguration {

@Bean
@ConditionalOnMissingBean(InfluxConfig.class)
@ConditionalOnMissingBean
public InfluxConfig influxConfig(InfluxProperties influxProperties) {
return new InfluxPropertiesConfigAdapter(influxProperties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public SimpleMeterRegistry simpleMeterRegistry(SimpleConfig config, Clock clock)
}

@Bean
@ConditionalOnMissingBean(SimpleConfig.class)
@ConditionalOnMissingBean
public SimpleConfig simpleConfig(SimpleProperties simpleProperties) {
return new SimplePropertiesConfigAdapter(simpleProperties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
public class StatsdMetricsExportAutoConfiguration {

@Bean
@ConditionalOnMissingBean(StatsdConfig.class)
@ConditionalOnMissingBean
public StatsdConfig statsdConfig(StatsdProperties statsdProperties) {
return new StatsdPropertiesConfigAdapter(statsdProperties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
public class WavefrontMetricsExportAutoConfiguration {

@Bean
@ConditionalOnMissingBean(WavefrontConfig.class)
@ConditionalOnMissingBean
public WavefrontConfig wavefrontConfig(WavefrontProperties props) {
return new WavefrontPropertiesConfigAdapter(props);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class TomcatMetricsAutoConfiguration {
private volatile Context context;

@Bean
@ConditionalOnMissingBean(TomcatMetrics.class)
@ConditionalOnMissingBean
public TomcatMetrics tomcatMetrics(ApplicationContext applicationContext) {
return new TomcatMetrics(this.context == null ? null : this.context.getManager(),
Collections.emptyList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public RabbitTemplateConfiguration(

@Bean
@ConditionalOnSingleCandidate(ConnectionFactory.class)
@ConditionalOnMissingBean(RabbitTemplate.class)
@ConditionalOnMissingBean
public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
PropertyMapper map = PropertyMapper.get();
RabbitTemplate template = new RabbitTemplate(connectionFactory);
Expand Down Expand Up @@ -213,7 +213,7 @@ private RetryTemplate createRetryTemplate(RabbitProperties.Retry properties) {
@Bean
@ConditionalOnSingleCandidate(ConnectionFactory.class)
@ConditionalOnProperty(prefix = "spring.rabbitmq", name = "dynamic", matchIfMissing = true)
@ConditionalOnMissingBean(AmqpAdmin.class)
@ConditionalOnMissingBean
public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
return new RabbitAdmin(connectionFactory);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class PersistenceExceptionTranslationAutoConfiguration {

@Bean
@ConditionalOnMissingBean(PersistenceExceptionTranslationPostProcessor.class)
@ConditionalOnMissingBean
@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", matchIfMissing = true)
public static PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor(
Environment environment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
public class CassandraReactiveDataAutoConfiguration {

@Bean
@ConditionalOnMissingBean(ReactiveSession.class)
@ConditionalOnMissingBean
public ReactiveSession reactiveCassandraSession(Session session) {
return new DefaultBridgedReactiveSession(session);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public RedisTemplate<Object, Object> redisTemplate(
}

@Bean
@ConditionalOnMissingBean(StringRedisTemplate.class)
@ConditionalOnMissingBean
public StringRedisTemplate stringRedisTemplate(
RedisConnectionFactory redisConnectionFactory) throws UnknownHostException {
StringRedisTemplate template = new StringRedisTemplate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
public class GsonAutoConfiguration {

@Bean
@ConditionalOnMissingBean(GsonBuilder.class)
@ConditionalOnMissingBean
public GsonBuilder gsonBuilder(List<GsonBuilderCustomizer> customizers) {
GsonBuilder builder = new GsonBuilder();
customizers.forEach((c) -> c.customize(builder));
return builder;
}

@Bean
@ConditionalOnMissingBean(Gson.class)
@ConditionalOnMissingBean
public Gson gson(GsonBuilder gsonBuilder) {
return gsonBuilder.create();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static class JacksonObjectMapperConfiguration {

@Bean
@Primary
@ConditionalOnMissingBean(ObjectMapper.class)
@ConditionalOnMissingBean
public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
return builder.createXmlMapper(false).build();
}
Expand Down Expand Up @@ -161,7 +161,7 @@ private JacksonJodaDateFormat getJacksonJodaDateFormat() {
static class ParameterNamesModuleConfiguration {

@Bean
@ConditionalOnMissingBean(ParameterNamesModule.class)
@ConditionalOnMissingBean
public ParameterNamesModule parameterNamesModule() {
return new ParameterNamesModule(JsonCreator.Mode.DEFAULT);
}
Expand All @@ -179,7 +179,7 @@ static class JacksonObjectMapperBuilderConfiguration {
}

@Bean
@ConditionalOnMissingBean(Jackson2ObjectMapperBuilder.class)
@ConditionalOnMissingBean
public Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder(
List<Jackson2ObjectMapperBuilderCustomizer> customizers) {
Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public ParentAwareNamingStrategy objectNamingStrategy() {
}

@Bean
@ConditionalOnMissingBean(MBeanServer.class)
@ConditionalOnMissingBean
public MBeanServer mbeanServer() {
SpecificPlatform platform = SpecificPlatform.get();
if (platform != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
public class JooqAutoConfiguration {

@Bean
@ConditionalOnMissingBean(DataSourceConnectionProvider.class)
@ConditionalOnMissingBean
public DataSourceConnectionProvider dataSourceConnectionProvider(
DataSource dataSource) {
return new DataSourceConnectionProvider(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public KafkaJaasLoginModuleInitializer kafkaJaasInitializer() throws IOException
}

@Bean
@ConditionalOnMissingBean(KafkaAdmin.class)
@ConditionalOnMissingBean
public KafkaAdmin kafkaAdmin() {
KafkaAdmin kafkaAdmin = new KafkaAdmin(this.properties.buildAdminProperties());
kafkaAdmin.setFatalIfBrokerNotAvailable(this.properties.getAdmin().isFailFast());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void checkTemplateLocationExists() {
}

@Bean
@ConditionalOnMissingBean(Mustache.Compiler.class)
@ConditionalOnMissingBean
public Mustache.Compiler mustacheCompiler(TemplateLoader mustacheTemplateLoader) {
return Mustache.compiler().withLoader(mustacheTemplateLoader)
.withCollector(collector());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected MustacheReactiveWebConfiguration(MustacheProperties mustache) {
}

@Bean
@ConditionalOnMissingBean(MustacheViewResolver.class)
@ConditionalOnMissingBean
public MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler) {
MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
resolver.setPrefix(this.mustache.getPrefix());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected MustacheServletWebConfiguration(MustacheProperties mustache) {
}

@Bean
@ConditionalOnMissingBean(MustacheViewResolver.class)
@ConditionalOnMissingBean
public MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler) {
MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
this.mustache.applyToMvcViewResolver(resolver);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ protected JpaBaseConfiguration(DataSource dataSource, JpaProperties properties,
}

@Bean
@ConditionalOnMissingBean(PlatformTransactionManager.class)
@ConditionalOnMissingBean
public PlatformTransactionManager transactionManager() {
JpaTransactionManager transactionManager = new JpaTransactionManager();
if (this.transactionManagerCustomizers != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
EvaluationContextExtensionSupport.class })
public class SecurityDataConfiguration {

@ConditionalOnMissingBean(SecurityEvaluationContextExtension.class)
@ConditionalOnMissingBean
@Bean
public SecurityEvaluationContextExtension securityEvaluationContextExtension() {
return new SecurityEvaluationContextExtension();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public SendGridAutoConfiguration(SendGridProperties properties) {
}

@Bean
@ConditionalOnMissingBean(SendGrid.class)
@ConditionalOnMissingBean
public SendGrid sendGrid() {
if (this.properties.isProxyConfigured()) {
HttpHost proxy = new HttpHost(this.properties.getProxy().getHost(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public ThymeleafDefaultConfiguration(ThymeleafProperties properties,
}

@Bean
@ConditionalOnMissingBean(SpringTemplateEngine.class)
@ConditionalOnMissingBean
public SpringTemplateEngine templateEngine() {
SpringTemplateEngine engine = new SpringTemplateEngine();
engine.setEnableSpringELCompiler(this.properties.isEnableSpringElCompiler());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public JtaTransactionManager transactionManager(UserTransaction userTransaction,
}

@Bean
@ConditionalOnMissingBean(XADataSourceWrapper.class)
@ConditionalOnMissingBean
public XADataSourceWrapper xaDataSourceWrapper(
NarayanaRecoveryManagerBean narayanaRecoveryManagerBean,
NarayanaProperties narayanaProperties) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public HttpEncodingAutoConfiguration(HttpEncodingProperties properties) {
}

@Bean
@ConditionalOnMissingBean(CharacterEncodingFilter.class)
@ConditionalOnMissingBean
public CharacterEncodingFilter characterEncodingFilter() {
CharacterEncodingFilter filter = new OrderedCharacterEncodingFilter();
filter.setEncoding(this.properties.getCharset().name());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public View defaultErrorView() {
// If the user adds @EnableWebMvc then the bean name view resolver from
// WebMvcAutoConfiguration disappears, so add it back in to avoid disappointment.
@Bean
@ConditionalOnMissingBean(BeanNameViewResolver.class)
@ConditionalOnMissingBean
public BeanNameViewResolver beanNameViewResolver() {
BeanNameViewResolver resolver = new BeanNameViewResolver();
resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 10);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class RestDocsAutoConfiguration {
static class RestDocsMockMvcAutoConfiguration {

@Bean
@ConditionalOnMissingBean(MockMvcRestDocumentationConfigurer.class)
@ConditionalOnMissingBean
public MockMvcRestDocumentationConfigurer restDocsMockMvcConfigurer(
ObjectProvider<RestDocsMockMvcConfigurationCustomizer> configurationCustomizerProvider,
RestDocumentationContextProvider contextProvider) {
Expand Down Expand Up @@ -88,7 +88,7 @@ public RestDocsMockMvcBuilderCustomizer restDocumentationConfigurer(
static class RestDocsRestAssuredAutoConfiguration {

@Bean
@ConditionalOnMissingBean(RequestSpecification.class)
@ConditionalOnMissingBean
public RequestSpecification restDocsRestAssuredConfigurer(
ObjectProvider<RestDocsRestAssuredConfigurationCustomizer> configurationCustomizerProvider,
RestDocumentationContextProvider contextProvider) {
Expand Down Expand Up @@ -117,7 +117,7 @@ public RestDocsRestAssuredBuilderCustomizer restAssuredBuilderCustomizer(
static class RestDocsWebTestClientAutoConfiguration {

@Bean
@ConditionalOnMissingBean(WebTestClientRestDocumentationConfigurer.class)
@ConditionalOnMissingBean
public WebTestClientRestDocumentationConfigurer restDocsWebTestClientConfigurer(
ObjectProvider<RestDocsWebTestClientConfigurationCustomizer> configurationCustomizerProvider,
RestDocumentationContextProvider contextProvider) {
Expand Down