root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-34040
This commit is contained in:
Andy Wilkinson 2023-02-01 15:19:56 +00:00
parent 0440e23233 f2361dd9b1
commit 636b70a77d
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java
View File

@ -87,11 +87,13 @@ public class JooqAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(org.jooq.Configuration.class) @ConditionalOnMissingBean(org.jooq.Configuration.class)
public DefaultConfiguration jooqConfiguration(JooqProperties properties, ConnectionProvider connectionProvider, public DefaultConfiguration jooqConfiguration(JooqProperties properties, ConnectionProvider connectionProvider,
DataSource dataSource, ObjectProvider<ExecuteListenerProvider> executeListenerProviders, DataSource dataSource, ObjectProvider<TransactionProvider> transactionProvider,
ObjectProvider<ExecuteListenerProvider> executeListenerProviders,
ObjectProvider<DefaultConfigurationCustomizer> configurationCustomizers) { ObjectProvider<DefaultConfigurationCustomizer> configurationCustomizers) {
DefaultConfiguration configuration = new DefaultConfiguration(); DefaultConfiguration configuration = new DefaultConfiguration();
configuration.set(properties.determineSqlDialect(dataSource)); configuration.set(properties.determineSqlDialect(dataSource));
configuration.set(connectionProvider); configuration.set(connectionProvider);
transactionProvider.ifAvailable(configuration::set);
configuration.set(executeListenerProviders.orderedStream().toArray(ExecuteListenerProvider[]::new)); configuration.set(executeListenerProviders.orderedStream().toArray(ExecuteListenerProvider[]::new));
configurationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(configuration)); configurationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(configuration));
return configuration; return configuration;

34
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java
View File

@ -113,6 +113,17 @@ class JooqAutoConfigurationTests {
}); });
} }
@Test
void jooqWithDefaultTransactionProvider() {
this.contextRunner.withUserConfiguration(JooqDataSourceConfiguration.class, TxManagerConfiguration.class)
.run((context) -> {
DSLContext dsl = context.getBean(DSLContext.class);
TransactionProvider expectedTransactionProvider = context.getBean(TransactionProvider.class);
TransactionProvider transactionProvider = dsl.configuration().transactionProvider();
assertThat(transactionProvider).isSameAs(expectedTransactionProvider);
});
}
@Test @Test
void jooqWithDefaultExecuteListenerProvider() { void jooqWithDefaultExecuteListenerProvider() {
this.contextRunner.withUserConfiguration(JooqDataSourceConfiguration.class).run((context) -> { this.contextRunner.withUserConfiguration(JooqDataSourceConfiguration.class).run((context) -> {
@ -164,6 +175,19 @@ class JooqAutoConfigurationTests {
.run((context) -> { .run((context) -> {
TransactionProvider transactionProvider = context.getBean(TransactionProvider.class); TransactionProvider transactionProvider = context.getBean(TransactionProvider.class);
assertThat(transactionProvider).isInstanceOf(CustomTransactionProvider.class); assertThat(transactionProvider).isInstanceOf(CustomTransactionProvider.class);
DSLContext dsl = context.getBean(DSLContext.class);
assertThat(dsl.configuration().transactionProvider()).isSameAs(transactionProvider);
});
}
@Test
void transactionProviderFromConfigurationCustomizerOverridesTransactionProviderBean() {
this.contextRunner.withUserConfiguration(JooqDataSourceConfiguration.class, TxManagerConfiguration.class,
CustomTransactionProviderFromCustomizerConfiguration.class).run((context) -> {
TransactionProvider transactionProvider = context.getBean(TransactionProvider.class);
assertThat(transactionProvider).isInstanceOf(SpringTransactionProvider.class);
DSLContext dsl = context.getBean(DSLContext.class);
assertThat(dsl.configuration().transactionProvider()).isInstanceOf(CustomTransactionProvider.class);
}); });
} }
@ -228,6 +252,16 @@ class JooqAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false)
static class CustomTransactionProviderFromCustomizerConfiguration {
@Bean
DefaultConfigurationCustomizer transactionProviderCustomizer() {
return (configuration) -> configuration.setTransactionProvider(new CustomTransactionProvider());
}
}
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class TxManagerConfiguration { static class TxManagerConfiguration {