SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug where spring.cloud.task.transaction-manager was not working

Browse Source 
Added additional for the default case
This commit is contained in:
wjyan
2023-11-17 17:57:13 +08:00
committed by Glenn Renfro
parent a2145b258a
commit 8f1b318db4
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/NoTransactionManagerProperty.java
View File

@@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.condition.NoneNestedConditions;
class NoTransactionManagerProperty extends NoneNestedConditions {
NoTransactionManagerProperty() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
super(ConfigurationPhase.REGISTER_BEAN);
}
@ConditionalOnProperty(prefix = "spring.cloud.task", name = "transaction-manager")

28
spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java
View File

@@ -23,6 +23,7 @@ import org.junit.jupiter.api.function.Executable;
import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ import org.springframework.context.ApplicationContextException;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.PlatformTransactionManager;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -173,6 +175,32 @@ public class SimpleTaskAutoConfigurationTests {
}
@Test
void testSpecifyTransactionManager() {
ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
SimpleTaskAutoConfiguration.class, SingleTaskConfiguration.class))
.withBean("transactionManager", ResourcelessTransactionManager.class)
.withPropertyValues("spring.cloud.task.transaction-manager=transactionManager");
applicationContextRunner.run((context) -> {
assertThat(context.getBeanNamesForType(PlatformTransactionManager.class)).hasSize(1)
.contains("transactionManager")
.doesNotContain("springCloudTaskTransactionManager");
});
}
@Test
void testDefaultTransactionManager() {
ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
SimpleTaskAutoConfiguration.class, SingleTaskConfiguration.class));
applicationContextRunner.run((context) -> {
assertThat(context.getBeanNamesForType(PlatformTransactionManager.class)).hasSize(1)
.contains("springCloudTaskTransactionManager")
.doesNotContain("transactionManager");
});
}
public void verifyExceptionThrownDefaultExecutable(Class classToCheck,
ApplicationContextRunner applicationContextRunner) {
Executable executable = () -> {