Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Back off if DataSource is not on the classpath

Browse Source 
Closes gh-41082
This commit is contained in:
Moritz Halbritter 2024-06-12 10:59:45 +02:00
parent 847ff50676
commit fed13b0e0c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
View File

@ -49,7 +49,7 @@ import org.springframework.transaction.TransactionManager;
*/ */
@AutoConfiguration(before = TransactionAutoConfiguration.class, @AutoConfiguration(before = TransactionAutoConfiguration.class,
after = TransactionManagerCustomizationAutoConfiguration.class) after = TransactionManagerCustomizationAutoConfiguration.class)
@ConditionalOnClass({ JdbcTemplate.class, TransactionManager.class }) @ConditionalOnClass({ DataSource.class, JdbcTemplate.class, TransactionManager.class })
@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
@EnableConfigurationProperties(DataSourceProperties.class) @EnableConfigurationProperties(DataSourceProperties.class)
public class DataSourceTransactionManagerAutoConfiguration { public class DataSourceTransactionManagerAutoConfiguration {

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
View File

@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration; import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.support.JdbcTransactionManager; import org.springframework.jdbc.support.JdbcTransactionManager;
@ -40,6 +41,7 @@ import static org.mockito.Mockito.mock;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Kazuki Shimizu * @author Kazuki Shimizu
* @author Davin Byeon * @author Davin Byeon
* @author Moritz Halbritter
*/ */
class DataSourceTransactionManagerAutoConfigurationTests { class DataSourceTransactionManagerAutoConfigurationTests {
@ -124,4 +126,10 @@ class DataSourceTransactionManagerAutoConfigurationTests {
}); });
} }
@Test
void shouldNotUseDataSourcePropertiesIfDataSourceIsNotOnTheClasspath() {
this.contextRunner.withClassLoader(new FilteredClassLoader(DataSource.class))
.run((context) -> assertThat(context).doesNotHaveBean(DataSourceProperties.class));
}
} }