From a6be5b6ff7ff21cf0a2ea4a20d74c3b67f2bc181 Mon Sep 17 00:00:00 2001 From: robokaso Date: Tue, 29 Jul 2008 13:05:32 +0000 Subject: [PATCH] IN PROGRESS - BATCH-518: removed ExecutionContext-related methods from JobExecutionDao impls --- .../repository/dao/JdbcJobExecutionDao.java | 24 ------------------- .../repository/dao/MapJobExecutionDao.java | 11 --------- .../support/SimpleJobRepository.java | 2 +- 3 files changed, 1 insertion(+), 36 deletions(-) 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 0ee653889..12659df79 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 @@ -10,13 +10,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInstance; -import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.InitializingBean; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; -import org.springframework.jdbc.support.lob.DefaultLobHandler; -import org.springframework.jdbc.support.lob.LobHandler; import org.springframework.util.Assert; /** @@ -56,10 +53,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements private DataFieldMaxValueIncrementer jobExecutionIncrementer; - private LobHandler lobHandler = new DefaultLobHandler(); - - private JdbcExecutionContextDao ecDao = new JdbcExecutionContextDao(); - /** * Public setter for the exit message length in database. Do not set this if * you haven't modified the schema. @@ -179,10 +172,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(jobExecutionIncrementer); - ecDao.setJdbcTemplate(getJdbcTemplate()); - ecDao.setLobHandler(lobHandler); - ecDao.setTablePrefix(getTablePrefix()); - ecDao.afterPropertiesSet(); } /** @@ -208,7 +197,6 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements jobExecution.setStatus(BatchStatus.valueOf(rs.getString(4))); jobExecution.setExitStatus(new ExitStatus("Y".equals(rs.getString(5)), rs.getString(6), rs.getString(7))); jobExecution.setCreateTime(rs.getDate(8)); - jobExecution.setExecutionContext(findExecutionContext(jobExecution)); return jobExecution; } @@ -232,16 +220,4 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements } } - public ExecutionContext findExecutionContext(JobExecution jobExecution) { - return ecDao.getExecutionContext(jobExecution); - } - - public void persistExecutionContext(JobExecution jobExecution) { - ecDao.persistExecutionContext(jobExecution); - } - - public void setLobHandler(LobHandler lobHandler) { - this.lobHandler = lobHandler; - } - } 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 a67046184..e31bab7be 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 @@ -6,7 +6,6 @@ import java.util.Map; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInstance; -import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.util.Assert; @@ -18,8 +17,6 @@ public class MapJobExecutionDao implements JobExecutionDao { private static Map executionsById = TransactionAwareProxyFactory.createTransactionalMap(); private static long currentId = 0; - - private MapExecutionContextDao ecDao = new MapExecutionContextDao(); public static void clear() { executionsById.clear(); @@ -67,12 +64,4 @@ public class MapJobExecutionDao implements JobExecutionDao { return lastExec; } - public ExecutionContext findExecutionContext(JobExecution jobExecution) { - return ecDao.getExecutionContext(jobExecution); - } - - public void persistExecutionContext(JobExecution jobExecution) { - ecDao.persistExecutionContext(jobExecution); - - } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java index d5cb7fd8e..659549535 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java @@ -177,7 +177,7 @@ public class SimpleJobRepository implements JobRepository { + ". If you want to run this job again, change the parameters."); } } - executionContext = jobExecutionDao.getLastJobExecution(jobInstance).getExecutionContext(); + executionContext = ecDao.getExecutionContext(jobExecutionDao.getLastJobExecution(jobInstance)); } else { // no job found, create one