Remove unnecessary values from @ConditionalOnMissingBean

See gh-42933
This commit is contained in:
Yanming Zhou 2024-10-30 09:37:41 +08:00 committed by Andy Wilkinson
parent bb29625872
commit 88d7a1e74a
12 changed files with 12 additions and 12 deletions

View File

@ -118,7 +118,7 @@ class HealthEndpointWebExtensionConfiguration {
static class JerseyInfrastructureConfiguration {
@Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class)
@ConditionalOnMissingBean
JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {
return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);
}

View File

@ -60,7 +60,7 @@ public class JerseySameManagementContextConfiguration {
static class JerseyInfrastructureConfiguration {
@Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class)
@ConditionalOnMissingBean
JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {
return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);
}

View File

@ -89,7 +89,7 @@ public class RabbitAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(RabbitConnectionDetails.class)
@ConditionalOnMissingBean
RabbitConnectionDetails rabbitConnectionDetails() {
return new PropertiesRabbitConnectionDetails(this.properties);
}

View File

@ -149,7 +149,7 @@ public class BatchAutoConfiguration {
static class DataSourceInitializerConfiguration {
@Bean
@ConditionalOnMissingBean(BatchDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
BatchDataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource dataSource,
@BatchDataSource ObjectProvider<DataSource> batchDataSource, BatchProperties properties) {
return new BatchDataSourceScriptDatabaseInitializer(batchDataSource.getIfAvailable(() -> dataSource),

View File

@ -251,7 +251,7 @@ public class IntegrationAutoConfiguration {
protected static class IntegrationJdbcConfiguration {
@Bean
@ConditionalOnMissingBean(IntegrationDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
public IntegrationDataSourceScriptDatabaseInitializer integrationDataSourceInitializer(DataSource dataSource,
IntegrationProperties properties) {
return new IntegrationDataSourceScriptDatabaseInitializer(dataSource, properties.getJdbc());

View File

@ -47,7 +47,7 @@ import org.springframework.context.annotation.Import;
public class ActiveMQAutoConfiguration {
@Bean
@ConditionalOnMissingBean(ActiveMQConnectionDetails.class)
@ConditionalOnMissingBean
ActiveMQConnectionDetails activemqConnectionDetails(ActiveMQProperties properties) {
return new PropertiesActiveMQConnectionDetails(properties);
}

View File

@ -53,7 +53,7 @@ public class MongoAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(MongoClient.class)
@ConditionalOnMissingBean
public MongoClient mongo(ObjectProvider<MongoClientSettingsBuilderCustomizer> builderCustomizers,
MongoClientSettings settings) {
return new MongoClientFactory(builderCustomizers.orderedStream().toList()).createMongoClient(settings);

View File

@ -132,7 +132,7 @@ public class QuartzAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(QuartzDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
@Conditional(OnQuartzDatasourceInitializationCondition.class)
public QuartzDataSourceScriptDatabaseInitializer quartzDataSourceScriptDatabaseInitializer(
DataSource dataSource, @QuartzDataSource ObjectProvider<DataSource> quartzDataSource,

View File

@ -56,7 +56,7 @@ import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessi
class JdbcSessionConfiguration {
@Bean
@ConditionalOnMissingBean(JdbcSessionDataSourceScriptDatabaseInitializer.class)
@ConditionalOnMissingBean
@Conditional(OnJdbcSessionDatasourceInitializationCondition.class)
JdbcSessionDataSourceScriptDatabaseInitializer jdbcSessionDataSourceScriptDatabaseInitializer(
@SpringSessionDataSource ObjectProvider<DataSource> sessionDataSource,

View File

@ -52,7 +52,7 @@ public class ClientHttpConnectorAutoConfiguration {
@Bean
@Lazy
@ConditionalOnMissingBean(ClientHttpConnector.class)
@ConditionalOnMissingBean
ClientHttpConnector webClientHttpConnector(ClientHttpConnectorFactory<?> clientHttpConnectorFactory) {
return clientHttpConnectorFactory.createClientHttpConnector();
}

View File

@ -63,7 +63,7 @@ public class MultipartAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(MultipartConfigElement.class)
@ConditionalOnMissingBean
public MultipartConfigElement multipartConfigElement() {
return this.multipartProperties.createMultipartConfig();
}

View File

@ -495,7 +495,7 @@ class ConditionalOnMissingBeanTests {
static class ConditionalOnFactoryBean {
@Bean
@ConditionalOnMissingBean(ExampleBean.class)
@ConditionalOnMissingBean
ExampleBean createExampleBean() {
return new ExampleBean("direct");
}