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

IN PROGRESS - BATCH-518: clean up the *Or* repository methods

Browse Source 
removed unused getJobExecutionCount(..)
This commit is contained in:
robokaso
2008-07-28 11:59:00 +00:00
parent f67acdc56b
commit 43354849a5
5 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
View File

@@ -38,9 +38,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
private static final int DEFAULT_EXIT_MESSAGE_LENGTH = 2500;
private static final String GET_JOB_EXECUTION_COUNT = "SELECT count(JOB_EXECUTION_ID) from %PREFIX%JOB_EXECUTION "
+ "where JOB_INSTANCE_ID = ?";
private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(JOB_EXECUTION_ID, JOB_INSTANCE_ID, START_TIME, "
+ "END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE, VERSION, CREATE_TIME) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
@@ -82,19 +79,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
new JobExecutionRowMapper(job));
}
/**
* @see JobExecutionDao#getJobExecutionCount(JobInstance)
* @throws IllegalArgumentException if jobId is null.
*/
public int getJobExecutionCount(JobInstance jobInstance) {
Long jobId = jobInstance.getId();
Assert.notNull(jobId, "JobId cannot be null");
Object[] parameters = new Object[] { jobId };
return getJdbcTemplate().queryForInt(getQuery(GET_JOB_EXECUTION_COUNT), parameters);
}
/**
*
* SQL implementation using Sequences via the Spring incrementer

7
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
View File

@@ -33,13 +33,6 @@ public interface JobExecutionDao {
*/
void updateJobExecution(JobExecution jobExecution);
/**
* Return the number of JobExecutions for the given JobInstance
*
* Preconditions: jobInstance must have an id.
*/
int getJobExecutionCount(JobInstance jobInstance);
/**
* Return list of JobExecutions for given JobInstance.
*

12
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java
View File

@@ -12,9 +12,7 @@ import org.springframework.util.Assert;
/**
* In-memory implementation of {@link JobExecutionDao}.
*
*/
public class MapJobExecutionDao implements JobExecutionDao {
private static Map<Long, JobExecution> executionsById = TransactionAwareProxyFactory.createTransactionalMap();
@@ -29,16 +27,6 @@ public class MapJobExecutionDao implements JobExecutionDao {
contextsByJobExecutionId.clear();
}
public int getJobExecutionCount(JobInstance jobInstance) {
int count = 0;
for (JobExecution execution : executionsById.values()) {
if (execution.getJobInstance().equals(jobInstance)) {
count++;
}
}
return count;
}
public void saveJobExecution(JobExecution jobExecution) {
Assert.isTrue(jobExecution.getId() == null);
Long newId = new Long(currentId++);

18
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
View File

@@ -189,24 +189,6 @@ public abstract class AbstractJobDaoTests extends AbstractTransactionalDataSourc
}
}
public void testIncrementExecutionCount() {
// 1 JobExection already added in setup
assertEquals(jobExecutionDao.getJobExecutionCount(jobInstance), 1);
// Save new JobExecution for same job
JobExecution testJobExecution = new JobExecution(jobInstance);
jobExecutionDao.saveJobExecution(testJobExecution);
// JobExecutionCount should be incremented by 1
assertEquals(jobExecutionDao.getJobExecutionCount(jobInstance), 2);
}
public void testZeroExecutionCount() {
JobInstance testJob = jobInstanceDao.createJobInstance(new JobSupport("test"), new JobParameters());
// no jobExecutions saved for new job, count should be 0
assertEquals(jobExecutionDao.getJobExecutionCount(testJob), 0);
}
@SuppressWarnings("unchecked")
public void testJobWithSimpleJobIdentifier() throws Exception {

16
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java
View File

@@ -52,22 +52,6 @@ public abstract class AbstractJobExecutionDaoTests extends AbstractTransactional
assertNotNull(execution.getVersion());
}
/**
* Execution count increases by one with every save for the same job
* instance.
*/
public void testGetExecutionCount() {
JobExecution exec1 = new JobExecution(jobInstance);
JobExecution exec2 = new JobExecution(jobInstance);
dao.saveJobExecution(exec1);
assertEquals(1, dao.getJobExecutionCount(jobInstance));
dao.saveJobExecution(exec2);
assertEquals(2, dao.getJobExecutionCount(jobInstance));
}
/**
* Update and retrieve job execution - check attributes have changed as
* expected.