Skip to content

Fix isolationLevelForCreate binding for Mongo job repository #5141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
banseok1216 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −1
Open

Fix isolationLevelForCreate binding for Mongo job repository #5141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private void registerMongoJobRepository(BeanDefinitionRegistry registry,
}
Isolation isolationLevelForCreate = mongoJobRepositoryAnnotation.isolationLevelForCreate();
if (isolationLevelForCreate != null) {
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreate", isolationLevelForCreate);
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreateEnum", isolationLevelForCreate);
}

String jobKeyGeneratorRef = mongoJobRepositoryAnnotation.jobKeyGeneratorRef();
Expand Down
30 changes: 30 additions & 0 deletions ...est/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.MongoTransactionManager;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
Expand Down Expand Up @@ -202,6 +204,17 @@ public void testCustomJobParametersConverterConfiguration() {
Assertions.assertEquals(JsonJobParametersConverter.class, jobParametersConverter.getClass());
}

@Test
@DisplayName("Mongo job repository should be configured successfully with @EnableMongoJobRepository")
void testMongoJobRepositoryConfiguredWithEnableMongoJobRepository() {
AnnotationConfigApplicationContext context =
new AnnotationConfigApplicationContext(MongoJobConfiguration.class);

JobRepository jobRepository = context.getBean(JobRepository.class);

Assertions.assertNotNull(jobRepository);
}

@Configuration
@EnableBatchProcessing
public static class JobConfigurationWithUserDefinedInfrastructureBeans {
Expand Down Expand Up @@ -322,6 +335,23 @@ public JobParametersConverter jobParametersConverter() {

}

@Configuration
@EnableBatchProcessing
@EnableMongoJobRepository
public static class MongoJobConfiguration {

@Bean
public MongoOperations mongoTemplate() {
return Mockito.mock(MongoOperations.class);
}

@Bean
public MongoTransactionManager transactionManager() {
return Mockito.mock(MongoTransactionManager.class);
}

}

private PlatformTransactionManager getTransactionManagerSetOnJobRepository(JobRepository jobRepository) {
Advised target = (Advised) jobRepository; // proxy created by
// AbstractJobRepositoryFactoryBean
Expand Down