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

Back off Jooq's TransactionProvider on custom TransactionProvider

Browse Source 
Closes gh-32899
This commit is contained in:
Moritz Halbritter 2023-01-12 11:24:49 +01:00
parent 2cdd071775
commit 1606f5b88c
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ public class JooqAutoConfiguration {
@Bean
@ConditionalOnBean(PlatformTransactionManager.class)
@ConditionalOnMissingBean(TransactionProvider.class)
public SpringTransactionProvider transactionProvider(PlatformTransactionManager txManager) {
return new SpringTransactionProvider(txManager);
}

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

@ -29,7 +29,9 @@ import org.jooq.RecordListenerProvider;
import org.jooq.RecordMapperProvider;
import org.jooq.RecordUnmapperProvider;
import org.jooq.SQLDialect;
import org.jooq.TransactionContext;
import org.jooq.TransactionListenerProvider;
import org.jooq.TransactionProvider;
import org.jooq.TransactionalRunnable;
import org.jooq.VisitListenerProvider;
import org.jooq.impl.DataSourceConnectionProvider;
@ -188,6 +190,16 @@ class JooqAutoConfigurationTests {
.isEqualTo(SQLDialect.POSTGRES));
}
@Test
void transactionProviderBacksOffOnExistingTransactionProvider() {
this.contextRunner
.withUserConfiguration(JooqDataSourceConfiguration.class, CustomTransactionProviderConfiguration.class)
.run((context) -> {
TransactionProvider transactionProvider = context.getBean(TransactionProvider.class);
assertThat(transactionProvider).isInstanceOf(CustomTransactionProvider.class);
});
}
static class AssertFetch implements TransactionalRunnable {
private final DSLContext dsl;
@ -239,6 +251,16 @@ class JooqAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class CustomTransactionProviderConfiguration {
@Bean
TransactionProvider transactionProvider() {
return new CustomTransactionProvider();
}
}
@Configuration(proxyBeanMethods = false)
static class TxManagerConfiguration {
@ -259,4 +281,23 @@ class JooqAutoConfigurationTests {
}
static class CustomTransactionProvider implements TransactionProvider {
@Override
public void begin(TransactionContext ctx) {
}
@Override
public void commit(TransactionContext ctx) {
}
@Override
public void rollback(TransactionContext ctx) {
}
}
}