Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine contribution #3933

Browse Source 
* Remove usage of the newly deprecated method
* Rename fields/variables/parameters to be more explicit
This commit is contained in:
Mahmoud Ben Hassine
2021-09-10 10:39:46 +02:00
parent 49134ea533
commit ba0900127d
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -153,7 +153,7 @@ implements InitializingBean {
protected JobInstanceDao createJobInstanceDao() throws Exception {
JdbcJobInstanceDao dao = new JdbcJobInstanceDao();
dao.setJdbcTemplate(jdbcOperations);
dao.setJobIncrementer(incrementer);
dao.setJobInstanceIncrementer(incrementer);
dao.setTablePrefix(tablePrefix);
dao.afterPropertiesSet();
return dao;

22
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
View File

@@ -88,13 +88,13 @@ JobInstanceDao, InitializingBean {
private static final String FIND_LAST_JOBS_LIKE_NAME = "SELECT JOB_INSTANCE_ID, JOB_NAME from %PREFIX%JOB_INSTANCE where JOB_NAME like ? order by JOB_INSTANCE_ID desc";
private DataFieldMaxValueIncrementer jobIncrementer;
private DataFieldMaxValueIncrementer jobInstanceIncrementer;
private JobKeyGenerator<JobParameters> jobKeyGenerator = new DefaultJobKeyGenerator();
/**
* In this JDBC implementation a job id is obtained by asking the
* jobIncrementer (which is likely a sequence) for the next long value, and
* In this JDBC implementation a job instance id is obtained by asking the
* jobInstanceIncrementer (which is likely a sequence) for the next long value, and
* then passing the Id and parameter values into an INSERT statement.
*
* @see JobInstanceDao#createJobInstance(String, JobParameters)
@@ -111,12 +111,12 @@ JobInstanceDao, InitializingBean {
Assert.state(getJobInstance(jobName, jobParameters) == null,
"JobInstance must not already exist");
Long jobId = jobIncrementer.nextLongValue();
Long jobInstanceId = jobInstanceIncrementer.nextLongValue();
JobInstance jobInstance = new JobInstance(jobId, jobName);
JobInstance jobInstance = new JobInstance(jobInstanceId, jobName);
jobInstance.incrementVersion();
Object[] parameters = new Object[] { jobId, jobName,
Object[] parameters = new Object[] { jobInstanceId, jobName,
jobKeyGenerator.generateKey(jobParameters), jobInstance.getVersion() };
getJdbcTemplate().update(
getQuery(CREATE_JOB_INSTANCE),
@@ -307,25 +307,25 @@ JobInstanceDao, InitializingBean {
*/
@Deprecated
public void setJobIncrementer(DataFieldMaxValueIncrementer jobIncrementer) {
this.jobIncrementer = jobIncrementer;
this.setJobInstanceIncrementer(jobIncrementer);
}
/**
* Setter for {@link DataFieldMaxValueIncrementer} to be used when
* generating primary keys for {@link JobInstance} instances.
*
* @param jobIncrementer the {@link DataFieldMaxValueIncrementer}
* @param jobInstanceIncrementer the {@link DataFieldMaxValueIncrementer}
*
* @since 5.0
*/
public void setJobInstanceIncrementer(DataFieldMaxValueIncrementer jobIncrementer) {
this.jobIncrementer = jobIncrementer;
public void setJobInstanceIncrementer(DataFieldMaxValueIncrementer jobInstanceIncrementer) {
this.jobInstanceIncrementer = jobInstanceIncrementer;
}
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
Assert.notNull(jobIncrementer, "JobIncrementer is required");
Assert.notNull(jobInstanceIncrementer, "jobInstanceIncrementer is required");
}
/**

3
spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java
View File

@@ -58,6 +58,7 @@ import static org.springframework.batch.support.DatabaseType.SYBASE;
* @author Lucas Ward
* @author Dave Syer
* @author Michael Minella
* @author Mahmoud Ben Hassine
*/
public class JobRepositoryFactoryBean extends AbstractJobRepositoryFactoryBean implements InitializingBean {
@@ -211,7 +212,7 @@ public class JobRepositoryFactoryBean extends AbstractJobRepositoryFactoryBean i
protected JobInstanceDao createJobInstanceDao() throws Exception {
JdbcJobInstanceDao dao = new JdbcJobInstanceDao();
dao.setJdbcTemplate(jdbcOperations);
dao.setJobIncrementer(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ"));
dao.setJobInstanceIncrementer(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ"));
dao.setTablePrefix(tablePrefix);
dao.afterPropertiesSet();
return dao;

2
spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
View File

@@ -25,7 +25,7 @@
<property name="dataSource" ref="dataSource" />
<property name="columnName" value="ID" />
</bean>
<bean id="jobIncrementer" parent="incrementerParent">
<bean id="jobInstanceIncrementer" parent="incrementerParent">
<property name="incrementerName" value="BATCH_JOB_SEQ" />
</bean>
<bean id="jobExecutionIncrementer" parent="incrementerParent">

2
spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml
View File

@@ -18,7 +18,7 @@
<bean id="jobInstanceDao" class="org.springframework.batch.core.repository.dao.JdbcJobInstanceDao">
<property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="jobIncrementer" ref="jobIncrementer" />
<property name="jobInstanceIncrementer" ref="jobInstanceIncrementer" />
</bean>
<bean id="jobExecutionDao" class="org.springframework.batch.core.repository.dao.JdbcJobExecutionDao">