diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java index 93b70e401..7013efc57 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java @@ -73,17 +73,17 @@ public interface JobRepository { void update(JobExecution jobExecution); /** - * Save the {@link StepExecution}. ID will be assigned - it is not advisable + * Save the {@link StepExecution}. ID will be assigned - it is not permitted * that an ID be assigned before calling this method. Instead, it should be * left blank, to be assigned by a {@link JobRepository}. The * {@link ExecutionContext} of the {@link StepExecution} is not - * saved: see {@link #persistExecutionContext(StepExecution)}. + * saved: see {@link #updateExecutionContext(StepExecution)}. * * Preconditions: {@link StepExecution} must have a valid {@link Step}. * * @param stepExecution */ - void save(StepExecution stepExecution); + void add(StepExecution stepExecution); /** * Update the {@link StepExecution}. @@ -101,7 +101,7 @@ public interface JobRepository { * @param stepExecution the {@link StepExecution} containing the * {@link ExecutionContext} to be saved. */ - void persistExecutionContext(StepExecution stepExecution); + void updateExecutionContext(StepExecution stepExecution); /** * @return the last execution of step for the given job instance. 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 dc14e295d..d98d90a60 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 @@ -222,7 +222,7 @@ public class SimpleJobRepository implements JobRepository { * Preconditions: step name must be given and associated * {@link JobExecution} must already be saved (have an id assigned). */ - public void save(StepExecution stepExecution) { + public void add(StepExecution stepExecution) { validateStepExecution(stepExecution); stepExecutionDao.saveStepExecution(stepExecution); @@ -254,7 +254,7 @@ public class SimpleJobRepository implements JobRepository { * persistExecutionContext * (org.springframework.batch.core.domain.StepExecution) */ - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { // Until there is an interface change ( ecDao.persistExecutionContext(stepExecution.getJobExecution()); ecDao.persistExecutionContext(stepExecution); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java index 1b4a84eef..5e5b712b5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java @@ -181,7 +181,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw UnexpectedJobExecutionException { stepExecution.setStartTime(new Date()); stepExecution.setStatus(BatchStatus.STARTED); - getJobRepository().save(stepExecution); + getJobRepository().add(stepExecution); ExitStatus exitStatus = ExitStatus.FAILED; Exception commitException = null; @@ -207,7 +207,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw try { getJobRepository().update(stepExecution); - getJobRepository().persistExecutionContext(stepExecution); + getJobRepository().updateExecutionContext(stepExecution); } catch (Exception e) { commitException = e; @@ -223,7 +223,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw try { exitStatus = exitStatus.and(getCompositeListener().onErrorInStep(stepExecution, e)); - getJobRepository().persistExecutionContext(stepExecution); + getJobRepository().updateExecutionContext(stepExecution); } catch (Exception ex) { logger.error("Encountered an error on listener error callback.", ex); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java index 199ac0946..047e9236d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java @@ -222,7 +222,7 @@ public class ItemOrientedStep extends AbstractStep { */ protected ExitStatus doExecute(final StepExecution stepExecution) throws Exception { stream.update(stepExecution.getExecutionContext()); - getJobRepository().persistExecutionContext(stepExecution); + getJobRepository().updateExecutionContext(stepExecution); itemHandler.mark(); final ExceptionHolder fatalException = new ExceptionHolder(); @@ -286,7 +286,7 @@ public class ItemOrientedStep extends AbstractStep { } try { - getJobRepository().persistExecutionContext(stepExecution); + getJobRepository().updateExecutionContext(stepExecution); } catch (Exception e) { fatalException.setException(e); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java index 4d3454f8a..919b73ebf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java @@ -503,8 +503,8 @@ public class SimpleJobTests extends TestCase { passedInStepContext = new ExecutionContext(stepExecution.getExecutionContext()); stepExecution.getExecutionContext().putString("stepKey", "stepValue"); stepExecution.getJobExecution().getExecutionContext().putString("jobKey", "jobValue"); - jobRepository.save(stepExecution); - jobRepository.persistExecutionContext(stepExecution); + jobRepository.add(stepExecution); + jobRepository.updateExecutionContext(stepExecution); if (exception instanceof RuntimeException) { stepExecution.setExitStatus(ExitStatus.FAILED); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java index 819b7eaae..27cde414d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java @@ -120,7 +120,7 @@ public class SimpleJobRepositoryIntegrationTests { JobExecution firstJobExec = jobRepository.createJobExecution(job, jobParameters); StepExecution firstStepExec = new StepExecution(step.getName(), firstJobExec); jobRepository.update(firstJobExec); - jobRepository.save(firstStepExec); + jobRepository.add(firstStepExec); assertEquals(1, jobRepository.getStepExecutionCount(firstJobExec.getJobInstance(), step)); assertEquals(firstStepExec, jobRepository.getLastStepExecution(firstJobExec.getJobInstance(), step)); @@ -139,7 +139,7 @@ public class SimpleJobRepositoryIntegrationTests { JobExecution secondJobExec = jobRepository.createJobExecution(job, jobParameters); StepExecution secondStepExec = new StepExecution(step.getName(), secondJobExec); jobRepository.update(secondJobExec); - jobRepository.save(secondStepExec); + jobRepository.add(secondStepExec); assertEquals(2, jobRepository.getStepExecutionCount(secondJobExec.getJobInstance(), step)); assertEquals(secondStepExec, jobRepository.getLastStepExecution(secondJobExec.getJobInstance(), step)); @@ -162,8 +162,8 @@ public class SimpleJobRepositoryIntegrationTests { StepExecution stepExec = new StepExecution(step.getName(), jobExec); stepExec.setExecutionContext(ctx); - jobRepository.save(stepExec); - jobRepository.persistExecutionContext(stepExec); + jobRepository.add(stepExec); + jobRepository.updateExecutionContext(stepExec); StepExecution retrievedStepExec = jobRepository.getLastStepExecution(jobExec.getJobInstance(), step); assertEquals(stepExec, retrievedStepExec); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java index e34e3cbe7..3a928c1d4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java @@ -140,7 +140,7 @@ public class SimpleJobRepositoryTests extends TestCase { // failure scenario -- no step id set. try { - jobRepository.save(stepExecution); + jobRepository.add(stepExecution); fail(); } catch (Exception ex) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java index 83082c24c..f6d2eb93d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/AbstractStepTests.java @@ -107,13 +107,13 @@ public class AbstractStepTests extends TestCase { static long counter = 0; - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { Assert.state(stepExecution.getId() != null, "StepExecution must already be saved"); saved = stepExecution.getExecutionContext(); } @Override - public void save(StepExecution stepExecution) { + public void add(StepExecution stepExecution) { if (stepExecution.getId() == null) { stepExecution.setId(counter); counter++; @@ -237,7 +237,7 @@ public class AbstractStepTests extends TestCase { } }; repository = new JobRepositoryStub() { - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { throw new RuntimeException("Bad context!"); } }; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java index 06be8e89d..b23854d6c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java @@ -64,13 +64,13 @@ public class JobRepositorySupport implements JobRepository { return null; } - public void save(StepExecution stepExecution) { + public void add(StepExecution stepExecution) { } public void update(StepExecution stepExecution) { } - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java index 7f32e4def..eed9bc08d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java @@ -266,7 +266,7 @@ public class ItemOrientedStepTests extends TestCase { final JobExecution jobExecution = new JobExecution(jobInstance); final StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecution); itemOrientedStep.setJobRepository(new JobRepositorySupport() { - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { list.add(stepExecution); } }); @@ -285,7 +285,7 @@ public class ItemOrientedStepTests extends TestCase { private int counter = 0; // initial save before item processing succeeds, later calls fail - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { if (counter > 0) throw new RuntimeException("foo"); counter++; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java index 15f1a959f..460886ae1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java @@ -72,7 +72,7 @@ public class TaskletStepTests extends TestCase { public void testSuccessfulExecutionWithExecutionContext() throws Exception { TaskletStep step = new TaskletStep(new StubTasklet(false, false), new JobRepositorySupport() { - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { list.add(stepExecution); } }); @@ -82,7 +82,7 @@ public class TaskletStepTests extends TestCase { public void testSuccessfulExecutionWithFailureOnSaveOfExecutionContext() throws Exception { TaskletStep step = new TaskletStep(new StubTasklet(false, false, true), new JobRepositorySupport() { - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { throw new RuntimeException("foo"); } }); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java index ed515f8f8..4dde29d32 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java @@ -69,10 +69,10 @@ public class JobRepositorySupport implements JobRepository { /* (non-Javadoc) * @see org.springframework.batch.core.repository.JobRepository#saveOrUpdateExecutionContext(org.springframework.batch.core.StepExecution) */ - public void persistExecutionContext(StepExecution stepExecution) { + public void updateExecutionContext(StepExecution stepExecution) { } - public void save(StepExecution stepExecution) { + public void add(StepExecution stepExecution) { } public void update(StepExecution stepExecution) {