Merge branch '3.3.x'

wilkinsona · wilkinsona · commit e8b8584175a0 · 2024-10-30T10:26:19.000Z
Closes gh-42943
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java
@@ -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);
 			}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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);
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
@@ -89,7 +89,7 @@ protected RabbitConnectionFactoryCreator(RabbitProperties properties) {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(RabbitConnectionDetails.class)
+		@ConditionalOnMissingBean
 		RabbitConnectionDetails rabbitConnectionDetails() {
 			return new PropertiesRabbitConnectionDetails(this.properties);
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
@@ -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),
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
@@ -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());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
 public class ActiveMQAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(ActiveMQConnectionDetails.class)
+	@ConditionalOnMissingBean
 	ActiveMQConnectionDetails activemqConnectionDetails(ActiveMQProperties properties) {
 		return new PropertiesActiveMQConnectionDetails(properties);
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java
@@ -50,7 +50,7 @@
 public class ArtemisAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(ArtemisConnectionDetails.class)
+	@ConditionalOnMissingBean
 	ArtemisConnectionDetails artemisConnectionDetails(ArtemisProperties properties) {
 		return new PropertiesArtemisConnectionDetails(properties);
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java
@@ -76,7 +76,7 @@ public DefaultExecuteListenerProvider jooqExceptionTranslatorExecuteListenerProv
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(ExceptionTranslatorExecuteListener.class)
+	@ConditionalOnMissingBean
 	public ExceptionTranslatorExecuteListener jooqExceptionTranslator() {
 		return ExceptionTranslatorExecuteListener.DEFAULT;
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ private PlatformTransactionManager getTransactionManager(
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(QuartzDataSourceScriptDatabaseInitializer.class)
+		@ConditionalOnMissingBean
 		@Conditional(OnQuartzDatasourceInitializationCondition.class)
 		public QuartzDataSourceScriptDatabaseInitializer quartzDataSourceScriptDatabaseInitializer(
 				DataSource dataSource, @QuartzDataSource ObjectProvider<DataSource> quartzDataSource,
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@
 class JdbcSessionConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(JdbcSessionDataSourceScriptDatabaseInitializer.class)
+	@ConditionalOnMissingBean
 	@Conditional(OnJdbcSessionDatasourceInitializationCondition.class)
 	JdbcSessionDataSourceScriptDatabaseInitializer jdbcSessionDataSourceScriptDatabaseInitializer(
 			@SpringSessionDataSource ObjectProvider<DataSource> sessionDataSource,
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class ClientHttpConnectorAutoConfiguration {
 
 	@Bean
 	@Lazy
-	@ConditionalOnMissingBean(ClientHttpConnector.class)
+	@ConditionalOnMissingBean
 	ClientHttpConnector webClientHttpConnector(ClientHttpConnectorFactory<?> clientHttpConnectorFactory) {
 		return clientHttpConnectorFactory.createClientHttpConnector();
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public MultipartAutoConfiguration(MultipartProperties multipartProperties) {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(MultipartConfigElement.class)
+	@ConditionalOnMissingBean
 	public MultipartConfigElement multipartConfigElement() {
 		return this.multipartProperties.createMultipartConfig();
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
@@ -551,7 +551,7 @@ static class FactoryBeanXmlConfiguration {
 	static class ConditionalOnFactoryBean {
 
 		@Bean
-		@ConditionalOnMissingBean(ExampleBean.class)
+		@ConditionalOnMissingBean
 		ExampleBean createExampleBean() {
 			return new ExampleBean("direct");
 		}

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ JerseyAdditionalHealthEndpointPathsResourcesRegistrar jerseyAdditionalHealthEndp`
`114`	`114`	`static class JerseyInfrastructureConfiguration {`
`115`	`115`
`116`	`116`	`@Bean`
`117`		`- @ConditionalOnMissingBean(JerseyApplicationPath.class)`
	`117`	`+ @ConditionalOnMissingBean`
`118`	`118`	`JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {`
`119`	`119`	`return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2022 the original author or authors.`
	`2`	`+ * Copyright 2012-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -60,7 +60,7 @@ ResourceConfigCustomizer managementResourceConfigCustomizerAdapter(`
`60`	`60`	`static class JerseyInfrastructureConfiguration {`
`61`	`61`
`62`	`62`	`@Bean`
`63`		`- @ConditionalOnMissingBean(JerseyApplicationPath.class)`
	`63`	`+ @ConditionalOnMissingBean`
`64`	`64`	`JerseyApplicationPath jerseyApplicationPath(JerseyProperties properties, ResourceConfig config) {`
`65`	`65`	`return new DefaultJerseyApplicationPath(properties.getApplicationPath(), config);`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected RabbitConnectionFactoryCreator(RabbitProperties properties) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Bean`
`92`		`- @ConditionalOnMissingBean(RabbitConnectionDetails.class)`
	`92`	`+ @ConditionalOnMissingBean`
`93`	`93`	`RabbitConnectionDetails rabbitConnectionDetails() {`
`94`	`94`	`return new PropertiesRabbitConnectionDetails(this.properties);`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2023 the original author or authors.`
	`2`	`+ * Copyright 2012-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -47,7 +47,7 @@`
`47`	`47`	`public class ActiveMQAutoConfiguration {`
`48`	`48`
`49`	`49`	`@Bean`
`50`		`- @ConditionalOnMissingBean(ActiveMQConnectionDetails.class)`
	`50`	`+ @ConditionalOnMissingBean`
`51`	`51`	`ActiveMQConnectionDetails activemqConnectionDetails(ActiveMQProperties properties) {`
`52`	`52`	`return new PropertiesActiveMQConnectionDetails(properties);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`public class ArtemisAutoConfiguration {`
`51`	`51`
`52`	`52`	`@Bean`
`53`		`- @ConditionalOnMissingBean(ArtemisConnectionDetails.class)`
	`53`	`+ @ConditionalOnMissingBean`
`54`	`54`	`ArtemisConnectionDetails artemisConnectionDetails(ArtemisProperties properties) {`
`55`	`55`	`return new PropertiesArtemisConnectionDetails(properties);`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public DefaultExecuteListenerProvider jooqExceptionTranslatorExecuteListenerProv`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Bean`
`79`		`- @ConditionalOnMissingBean(ExceptionTranslatorExecuteListener.class)`
	`79`	`+ @ConditionalOnMissingBean`
`80`	`80`	`public ExceptionTranslatorExecuteListener jooqExceptionTranslator() {`
`81`	`81`	`return ExceptionTranslatorExecuteListener.DEFAULT;`
`82`	`82`	`}`