Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-41084
This commit is contained in:
Moritz Halbritter 2024-06-12 11:12:07 +02:00
commit 76e2009bd8
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,
after = TransactionManagerCustomizationAutoConfiguration.class)
@ConditionalOnClass({ JdbcTemplate.class, TransactionManager.class })
@ConditionalOnClass({ DataSource.class, JdbcTemplate.class, TransactionManager.class })
@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
@EnableConfigurationProperties(DataSourceProperties.class)
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.transaction.TransactionAutoConfiguration;
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.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.support.JdbcTransactionManager;
@ -40,6 +41,7 @@ import static org.mockito.Mockito.mock;
* @author Stephane Nicoll
* @author Kazuki Shimizu
* @author Davin Byeon
* @author Moritz Halbritter
*/
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));
}
}