diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java index 8f602fa34..3e5972fc5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java @@ -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 diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java index 8e0c574c5..24b04bcca 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java @@ -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. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java index 3f1a6b6b8..b678a83de 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java @@ -12,9 +12,7 @@ import org.springframework.util.Assert; /** * In-memory implementation of {@link JobExecutionDao}. - * */ - public class MapJobExecutionDao implements JobExecutionDao { private static Map 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++); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java index 0011b3a35..4e25fc594 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java @@ -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 { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java index babae2f7b..a508786a1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java @@ -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.