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

IN PROGRESS - BATCH-518: removed ExecutionContext-related methods from JobExecutionDao impls

Browse Source
This commit is contained in:
robokaso
2008-07-29 13:05:32 +00:00
parent cccf34c7bd
commit a6be5b6ff7
3 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

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

@@ -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<Long, JobExecution> 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);
}
}

2
spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
View File

@@ -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