Skip to content

Refactor Extract bean name string literals to constants #4761

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

Closed
wants to merge 1 commit into from
Closed

Refactor Extract bean name string literals to constants #4761

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
39 changes: 22 additions & 17 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 @@ -50,6 +50,11 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar {
private static final Log LOGGER = LogFactory.getLog(BatchRegistrar.class);

private static final String MISSING_ANNOTATION_ERROR_MESSAGE = "EnableBatchProcessing is not present on importing class '%s' as expected";
private static final String JOB_REPOSITORY = "jobRepository";
private static final String JOB_EXPLORER = "jobExplorer";
private static final String JOB_LAUNCHER = "jobLauncher";
private static final String JOB_REGISTRY = "jobRegistry";
private static final String JOB_LOADER = "jobLoader";

@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
Expand Down Expand Up @@ -80,7 +85,7 @@ private void validateState(AnnotationMetadata importingClassMetadata) {
}

private void registerJobRepository(BeanDefinitionRegistry registry, EnableBatchProcessing batchAnnotation) {
if (registry.containsBeanDefinition("jobRepository")) {
if (registry.containsBeanDefinition(JOB_REPOSITORY)) {
LOGGER.info("Bean jobRepository already defined in the application context, skipping"
+ " the registration of a jobRepository");
return;
Expand Down Expand Up @@ -143,11 +148,11 @@ private void registerJobRepository(BeanDefinitionRegistry registry, EnableBatchP

beanDefinitionBuilder.addPropertyValue("maxVarCharLength", batchAnnotation.maxVarCharLength());
beanDefinitionBuilder.addPropertyValue("clobType", batchAnnotation.clobType());
registry.registerBeanDefinition("jobRepository", beanDefinitionBuilder.getBeanDefinition());
registry.registerBeanDefinition(JOB_REPOSITORY, beanDefinitionBuilder.getBeanDefinition());
}

private void registerJobExplorer(BeanDefinitionRegistry registry, EnableBatchProcessing batchAnnotation) {
if (registry.containsBeanDefinition("jobExplorer")) {
if (registry.containsBeanDefinition(JOB_EXPLORER)) {
LOGGER.info("Bean jobExplorer already defined in the application context, skipping"
+ " the registration of a jobExplorer");
return;
Expand Down Expand Up @@ -192,37 +197,37 @@ private void registerJobExplorer(BeanDefinitionRegistry registry, EnableBatchPro
if (tablePrefix != null) {
beanDefinitionBuilder.addPropertyValue("tablePrefix", tablePrefix);
}
registry.registerBeanDefinition("jobExplorer", beanDefinitionBuilder.getBeanDefinition());
registry.registerBeanDefinition(JOB_EXPLORER, beanDefinitionBuilder.getBeanDefinition());
}

private void registerJobLauncher(BeanDefinitionRegistry registry, EnableBatchProcessing batchAnnotation) {
if (registry.containsBeanDefinition("jobLauncher")) {
if (registry.containsBeanDefinition(JOB_LAUNCHER)) {
LOGGER.info("Bean jobLauncher already defined in the application context, skipping"
+ " the registration of a jobLauncher");
return;
}
BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder
.genericBeanDefinition(TaskExecutorJobLauncher.class);
// set mandatory properties
beanDefinitionBuilder.addPropertyReference("jobRepository", "jobRepository");
beanDefinitionBuilder.addPropertyReference(JOB_REPOSITORY, JOB_REPOSITORY);

// set optional properties
String taskExecutorRef = batchAnnotation.taskExecutorRef();
if (registry.containsBeanDefinition(taskExecutorRef)) {
beanDefinitionBuilder.addPropertyReference("taskExecutor", taskExecutorRef);
}
registry.registerBeanDefinition("jobLauncher", beanDefinitionBuilder.getBeanDefinition());
registry.registerBeanDefinition(JOB_LAUNCHER, beanDefinitionBuilder.getBeanDefinition());
}

private void registerJobRegistry(BeanDefinitionRegistry registry) {
if (registry.containsBeanDefinition("jobRegistry")) {
if (registry.containsBeanDefinition(JOB_REGISTRY)) {
LOGGER.info("Bean jobRegistry already defined in the application context, skipping"
+ " the registration of a jobRegistry");
return;
}
BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(MapJobRegistry.class)
.getBeanDefinition();
registry.registerBeanDefinition("jobRegistry", beanDefinition);
registry.registerBeanDefinition(JOB_REGISTRY, beanDefinition);
}

private void registerJobRegistrySmartInitializingSingleton(BeanDefinitionRegistry registry) {
Expand All @@ -234,7 +239,7 @@ private void registerJobRegistrySmartInitializingSingleton(BeanDefinitionRegistr
}
BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder
.genericBeanDefinition(JobRegistrySmartInitializingSingleton.class);
beanDefinitionBuilder.addPropertyReference("jobRegistry", "jobRegistry");
beanDefinitionBuilder.addPropertyReference(JOB_REGISTRY, JOB_REGISTRY);

registry.registerBeanDefinition("jobRegistrySmartInitializingSingleton",
beanDefinitionBuilder.getBeanDefinition());
Expand All @@ -252,10 +257,10 @@ private void registerJobOperator(BeanDefinitionRegistry registry, EnableBatchPro
String transactionManagerRef = batchAnnotation.transactionManagerRef();
beanDefinitionBuilder.addPropertyReference("transactionManager", transactionManagerRef);

beanDefinitionBuilder.addPropertyReference("jobRepository", "jobRepository");
beanDefinitionBuilder.addPropertyReference("jobLauncher", "jobLauncher");
beanDefinitionBuilder.addPropertyReference("jobExplorer", "jobExplorer");
beanDefinitionBuilder.addPropertyReference("jobRegistry", "jobRegistry");
beanDefinitionBuilder.addPropertyReference(JOB_REPOSITORY, JOB_REPOSITORY);
beanDefinitionBuilder.addPropertyReference(JOB_LAUNCHER, JOB_LAUNCHER);
beanDefinitionBuilder.addPropertyReference(JOB_EXPLORER, JOB_EXPLORER);
beanDefinitionBuilder.addPropertyReference(JOB_REGISTRY, JOB_REGISTRY);

// set optional properties
String jobParametersConverterRef = batchAnnotation.jobParametersConverterRef();
Expand All @@ -276,12 +281,12 @@ private void registerAutomaticJobRegistrar(BeanDefinitionRegistry registry, Enab
return;
}
BeanDefinition jobLoaderBeanDefinition = BeanDefinitionBuilder.genericBeanDefinition(DefaultJobLoader.class)
.addPropertyReference("jobRegistry", "jobRegistry")
.addPropertyReference(JOB_REGISTRY, JOB_REGISTRY)
.getBeanDefinition();
registry.registerBeanDefinition("jobLoader", jobLoaderBeanDefinition);
registry.registerBeanDefinition(JOB_LOADER, jobLoaderBeanDefinition);
BeanDefinition jobRegistrarBeanDefinition = BeanDefinitionBuilder
.genericBeanDefinition(AutomaticJobRegistrar.class)
.addPropertyReference("jobLoader", "jobLoader")
.addPropertyReference(JOB_LOADER, JOB_LOADER)
.getBeanDefinition();
registry.registerBeanDefinition("jobRegistrar", jobRegistrarBeanDefinition);
}
Expand Down