Skip to content

Remove unnecessary values from @ConditionalOnMissingBean #42933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
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 @@ -114,7 +114,7 @@ JerseyAdditionalHealthEndpointPathsResourcesRegistrar jerseyAdditionalHealthEndp
static class JerseyInfrastructureConfiguration {

@Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class)
@ConditionalOnMissingBean
JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {
return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ResourceConfigCustomizer managementResourceConfigCustomizerAdapter(
static class JerseyInfrastructureConfiguration {

@Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class)
@ConditionalOnMissingBean
JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {
return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected RabbitConnectionFactoryCreator(RabbitProperties properties) {
}

@Bean
@ConditionalOnMissingBean(RabbitConnectionDetails.class)
@ConditionalOnMissingBean
RabbitConnectionDetails rabbitConnectionDetails() {
return new PropertiesRabbitConnectionDetails(this.properties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ protected TaskExecutor getTaskExecutor() {
static class DataSourceInitializerConfiguration {

@Bean
@ConditionalOnMissingBean(BatchDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
BatchDataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource dataSource,
@BatchDataSource ObjectProvider<DataSource> batchDataSource, BatchProperties properties) {
return new BatchDataSourceScriptDatabaseInitializer(batchDataSource.getIfAvailable(() -> dataSource),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ protected static class IntegrationComponentScanConfiguration {
protected static class IntegrationJdbcConfiguration {

@Bean
@ConditionalOnMissingBean(IntegrationDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
public IntegrationDataSourceScriptDatabaseInitializer integrationDataSourceInitializer(DataSource dataSource,
IntegrationProperties properties) {
return new IntegrationDataSourceScriptDatabaseInitializer(dataSource, properties.getJdbc());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
public class ActiveMQAutoConfiguration {

@Bean
@ConditionalOnMissingBean(ActiveMQConnectionDetails.class)
@ConditionalOnMissingBean
ActiveMQConnectionDetails activemqConnectionDetails(ActiveMQProperties properties) {
return new PropertiesActiveMQConnectionDetails(properties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
public class ArtemisAutoConfiguration {

@Bean
@ConditionalOnMissingBean(ArtemisConnectionDetails.class)
@ConditionalOnMissingBean
ArtemisConnectionDetails artemisConnectionDetails(ArtemisProperties properties) {
return new PropertiesArtemisConnectionDetails(properties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public DefaultExecuteListenerProvider jooqExceptionTranslatorExecuteListenerProv
}

@Bean
@ConditionalOnMissingBean(ExceptionTranslatorExecuteListener.class)
@ConditionalOnMissingBean
public ExceptionTranslatorExecuteListener jooqExceptionTranslator() {
return ExceptionTranslatorExecuteListener.DEFAULT;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PropertiesMongoConnectionDetails mongoConnectionDetails(MongoProperties properti
}

@Bean
@ConditionalOnMissingBean(MongoClient.class)
@ConditionalOnMissingBean
public MongoClient mongo(ObjectProvider<MongoClientSettingsBuilderCustomizer> builderCustomizers,
MongoClientSettings settings) {
return new MongoClientFactory(builderCustomizers.orderedStream().toList()).createMongoClient(settings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private PlatformTransactionManager getTransactionManager(
}

@Bean
@ConditionalOnMissingBean(QuartzDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
@Conditional(OnQuartzDatasourceInitializationCondition.class)
public QuartzDataSourceScriptDatabaseInitializer quartzDataSourceScriptDatabaseInitializer(
DataSource dataSource, @QuartzDataSource ObjectProvider<DataSource> quartzDataSource,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
class JdbcSessionConfiguration {

@Bean
@ConditionalOnMissingBean(JdbcSessionDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
@Conditional(OnJdbcSessionDatasourceInitializationCondition.class)
JdbcSessionDataSourceScriptDatabaseInitializer jdbcSessionDataSourceScriptDatabaseInitializer(
@SpringSessionDataSource ObjectProvider<DataSource> sessionDataSource,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class ClientHttpConnectorAutoConfiguration {

@Bean
@Lazy
@ConditionalOnMissingBean(ClientHttpConnector.class)
@ConditionalOnMissingBean
ClientHttpConnector webClientHttpConnector(ClientHttpConnectorFactory<?> clientHttpConnectorFactory) {
return clientHttpConnectorFactory.createClientHttpConnector();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public MultipartAutoConfiguration(MultipartProperties multipartProperties) {
}

@Bean
@ConditionalOnMissingBean(MultipartConfigElement.class)
@ConditionalOnMissingBean
public MultipartConfigElement multipartConfigElement() {
return this.multipartProperties.createMultipartConfig();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ static class FactoryBeanXmlConfiguration {
static class ConditionalOnFactoryBean {

@Bean
@ConditionalOnMissingBean(ExampleBean.class)
@ConditionalOnMissingBean
ExampleBean createExampleBean() {
return new ExampleBean("direct");
}
Expand Down