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 
consistent naming of update methods
This commit is contained in:
robokaso
2008-07-28 11:24:19 +00:00
parent 1b4babb4cd
commit 035fe28113
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
View File

@@ -136,14 +136,14 @@ public class SimpleJob extends AbstractJob {
execution.setEndTime(new Date());
execution.setExitStatus(status);
getJobRepository().updateJobExecution(execution);
getJobRepository().update(execution);
}
}
private void updateStatus(JobExecution jobExecution, BatchStatus status) {
jobExecution.setStatus(status);
getJobRepository().updateJobExecution(jobExecution);
getJobRepository().update(jobExecution);
}
/*

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

@@ -70,7 +70,7 @@ public interface JobRepository {
*
* @param jobExecution
*/
void updateJobExecution(JobExecution jobExecution);
void update(JobExecution jobExecution);
/**
* Save the {@link StepExecution}. ID will be assigned - it is not advisable

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

@@ -203,7 +203,7 @@ public class SimpleJobRepository implements JobRepository {
* @param jobExecution to be stored.
* @throws IllegalArgumentException if jobExecution is null.
*/
public void updateJobExecution(JobExecution jobExecution) {
public void update(JobExecution jobExecution) {
Assert.notNull(jobExecution, "JobExecution cannot be null.");
Assert.notNull(jobExecution.getJobId(), "JobExecution must have a Job ID set.");

14
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
View File

@@ -55,9 +55,9 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
assertEquals(job.getName(), firstExecution.getJobInstance().getJobName());
jobRepository.updateJobExecution(firstExecution);
jobRepository.update(firstExecution);
firstExecution.setEndTime(new Date());
jobRepository.updateJobExecution(firstExecution);
jobRepository.update(firstExecution);
JobExecution secondExecution = jobRepository.createJobExecution(job, jobParams);
assertEquals(firstExecution.getJobInstance(), secondExecution.getJobInstance());
@@ -74,7 +74,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
JobExecution firstExecution = jobRepository.createJobExecution(job, jobParameters);
firstExecution.setStartTime(new Date(0));
firstExecution.setEndTime(new Date(1));
jobRepository.updateJobExecution(firstExecution);
jobRepository.update(firstExecution);
JobExecution secondExecution = jobRepository.createJobExecution(job, jobParameters);
assertEquals(firstExecution.getJobInstance(), secondExecution.getJobInstance());
@@ -89,7 +89,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
job.setRestartable(false);
JobExecution firstExecution = jobRepository.createJobExecution(job, jobParameters);
jobRepository.updateJobExecution(firstExecution);
jobRepository.update(firstExecution);
try {
jobRepository.createJobExecution(job, jobParameters);
@@ -111,7 +111,7 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
// first execution
JobExecution firstJobExec = jobRepository.createJobExecution(job, jobParameters);
StepExecution firstStepExec = new StepExecution(step.getName(), firstJobExec);
jobRepository.updateJobExecution(firstJobExec);
jobRepository.update(firstJobExec);
jobRepository.save(firstStepExec);
assertEquals(1, jobRepository.getStepExecutionCount(firstJobExec.getJobInstance(), step));
@@ -125,12 +125,12 @@ public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDa
jobRepository.update(firstStepExec);
firstJobExec.setStatus(BatchStatus.FAILED);
firstJobExec.setEndTime(new Date(7));
jobRepository.updateJobExecution(firstJobExec);
jobRepository.update(firstJobExec);
// second execution
JobExecution secondJobExec = jobRepository.createJobExecution(job, jobParameters);
StepExecution secondStepExec = new StepExecution(step.getName(), secondJobExec);
jobRepository.updateJobExecution(secondJobExec);
jobRepository.update(secondJobExec);
jobRepository.save(secondStepExec);
assertEquals(2, jobRepository.getStepExecutionCount(secondJobExec.getJobInstance(), step));

4
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
View File

@@ -116,7 +116,7 @@ public class SimpleJobRepositoryTests extends TestCase {
// failure scenario - must have job ID
JobExecution jobExecution = new JobExecution(null);
try {
jobRepository.updateJobExecution(jobExecution);
jobRepository.update(jobExecution);
fail();
}
catch (Exception ex) {
@@ -131,7 +131,7 @@ public class SimpleJobRepositoryTests extends TestCase {
// new execution - call update on job dao
jobExecutionDao.updateJobExecution(jobExecution);
jobExecutionDaoControl.replay();
jobRepository.updateJobExecution(jobExecution);
jobRepository.update(jobExecution);
jobExecutionDaoControl.verify();
}

2
spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
View File

@@ -39,7 +39,7 @@ public class JobRepositorySupport implements JobRepository {
/* (non-Javadoc)
* @see org.springframework.batch.container.common.repository.JobRepository#saveOrUpdate(org.springframework.batch.container.common.domain.JobExecution)
*/
public void updateJobExecution(JobExecution jobExecution) {
public void update(JobExecution jobExecution) {
}
/* (non-Javadoc)

2
spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
View File

@@ -57,7 +57,7 @@ public class JobRepositorySupport implements JobRepository {
/* (non-Javadoc)
* @see org.springframework.batch.core.repository.JobRepository#saveOrUpdate(org.springframework.batch.core.JobExecution)
*/
public void updateJobExecution(JobExecution jobExecution) {
public void update(JobExecution jobExecution) {
}
/* (non-Javadoc)

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JdbcJobRepositoryTests.java
View File

@@ -165,7 +165,7 @@ public class JdbcJobRepositoryTests {
JobExecution execution = repository.createJobExecution(jobConfiguration, new JobParameters());
cacheJobIds(execution);
execution.setEndTime(new Timestamp(System.currentTimeMillis()));
repository.updateJobExecution(execution);
repository.update(execution);
execution.setStatus(BatchStatus.FAILED);
int before = jdbcTemplate.queryForInt("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE");