Skip to content

Polish BatchRegistrar #5146

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
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Polish BatchRegistrar #5146

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
19 changes: 6 additions & 13 deletions ...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 @@ -45,6 +45,7 @@
* @since 5.0
* @see EnableBatchProcessing
*/
@SuppressWarnings("removal")
class BatchRegistrar implements ImportBeanDefinitionRegistrar {

private static final Log LOGGER = LogFactory.getLog(BatchRegistrar.class);
Expand Down Expand Up @@ -128,14 +129,10 @@ private void registerJdbcJobRepository(BeanDefinitionRegistry registry, Annotati
}

String charset = jdbcJobRepositoryAnnotation.charset();
if (charset != null) {
beanDefinitionBuilder.addPropertyValue("charset", Charset.forName(charset));
}
beanDefinitionBuilder.addPropertyValue("charset", Charset.forName(charset));

String tablePrefix = jdbcJobRepositoryAnnotation.tablePrefix();
if (tablePrefix != null) {
beanDefinitionBuilder.addPropertyValue("tablePrefix", tablePrefix);
}
beanDefinitionBuilder.addPropertyValue("tablePrefix", tablePrefix);

String databaseType = jdbcJobRepositoryAnnotation.databaseType();
if (StringUtils.hasText(databaseType)) {
Expand All @@ -153,9 +150,7 @@ private void registerJdbcJobRepository(BeanDefinitionRegistry registry, Annotati
jdbcJobRepositoryAnnotation.validateTransactionState());

Isolation isolationLevelForCreate = jdbcJobRepositoryAnnotation.isolationLevelForCreate();
if (isolationLevelForCreate != null) {
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreateEnum", isolationLevelForCreate);
}
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreateEnum", isolationLevelForCreate);

String jobKeyGeneratorRef = jdbcJobRepositoryAnnotation.jobKeyGeneratorRef();
if (registry.containsBeanDefinition(jobKeyGeneratorRef)) {
Expand All @@ -181,9 +176,7 @@ private void registerMongoJobRepository(BeanDefinitionRegistry registry,
beanDefinitionBuilder.addPropertyReference("transactionManager", transactionManagerRef);
}
Isolation isolationLevelForCreate = mongoJobRepositoryAnnotation.isolationLevelForCreate();
if (isolationLevelForCreate != null) {
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreate", isolationLevelForCreate);
}
beanDefinitionBuilder.addPropertyValue("isolationLevelForCreate", isolationLevelForCreate);

String jobKeyGeneratorRef = mongoJobRepositoryAnnotation.jobKeyGeneratorRef();
if (registry.containsBeanDefinition(jobKeyGeneratorRef)) {
Expand Down Expand Up @@ -248,7 +241,7 @@ private void registerJobOperator(BeanDefinitionRegistry registry, EnableBatchPro
if (registry.containsBeanDefinition(taskExecutorRef)) {
beanDefinitionBuilder.addPropertyReference("taskExecutor", taskExecutorRef);
}
@SuppressWarnings("removal")

String jobParametersConverterRef = batchAnnotation.jobParametersConverterRef();
if (registry.containsBeanDefinition(jobParametersConverterRef)) {
beanDefinitionBuilder.addPropertyReference("jobParametersConverter", jobParametersConverterRef);
Expand Down