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

IN PROGRESS - issue BATCH-121: BatchResourceFactoryBean - is it adding any value?

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/BATCH-121

Expose the StepExecution to the StepContext early enough for a stepOperations interceptor to find it in the open() method.  See also BATCH-125.
This commit is contained in:
dsyer
2007-10-05 16:04:08 +00:00
parent 3b7b95626b
commit efc6247e90
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java
View File

@@ -161,6 +161,7 @@ public class SimpleStepExecutor implements StepExecutor {
ExitStatus status = ExitStatus.FAILED;
final SimpleStepContext stepScopeContext = StepSynchronizationManager.open();
stepScopeContext.setStepExecution(stepExecution);
try {
stepExecution.setStartTime(new Timestamp(System.currentTimeMillis()));
@@ -182,7 +183,6 @@ public class SimpleStepExecutor implements StepExecutor {
stepExecution.getJobExecution().unregisterStepContext(context);
}
});
stepScopeContext.setStepExecution(stepExecution);
context.setAttribute(StepScope.ID_KEY, stepExecution.getJobExecution()
.getJobIdentifier());
// Mark the context as a step context as a hint to scope

40
execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java
View File

@@ -39,6 +39,8 @@ import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemProvider;
import org.springframework.batch.item.provider.ListItemProvider;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.interceptor.RepeatInterceptorAdapter;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.RepeatTemplate;
import org.springframework.batch.restart.RestartData;
@@ -58,6 +60,8 @@ public class DefaultStepExecutorTests extends TestCase {
private StepConfigurationSupport stepConfiguration;
private RepeatTemplate template;
private ItemProvider getProvider(String[] args) {
return new ListItemProvider(Arrays.asList(args));
}
@@ -85,8 +89,7 @@ public class DefaultStepExecutorTests extends TestCase {
stepConfiguration = new SimpleStepConfiguration();
stepConfiguration.setTasklet(getTasklet(new String[] { "foo", "bar",
"spam" }));
// Only process one chunk:
RepeatTemplate template = new RepeatTemplate();
template = new RepeatTemplate();
template.setCompletionPolicy(new SimpleCompletionPolicy(1));
stepExecutor.setStepOperations(template);
// Only process one item:
@@ -110,7 +113,7 @@ public class DefaultStepExecutorTests extends TestCase {
public void testChunkExecutor() throws Exception {
RepeatTemplate template = new RepeatTemplate();
template = new RepeatTemplate();
// Only process one item:
template.setCompletionPolicy(new SimpleCompletionPolicy(1));
@@ -129,7 +132,7 @@ public class DefaultStepExecutorTests extends TestCase {
public void testStepContextInitialized() throws Exception {
RepeatTemplate template = new RepeatTemplate();
template = new RepeatTemplate();
// Only process one item:
template.setCompletionPolicy(new SimpleCompletionPolicy(1));
@@ -159,6 +162,35 @@ public class DefaultStepExecutorTests extends TestCase {
}
public void testStepContextInitializedBeforeTasklet() throws Exception {
template = new RepeatTemplate();
// Only process one chunk:
template.setCompletionPolicy(new SimpleCompletionPolicy(1));
stepExecutor.setStepOperations(template);
final StepInstance step = new StepInstance(new Long(1));
SimpleJobIdentifier jobIdentifier = new SimpleJobIdentifier("FOO");
final JobExecution jobExecution = new JobExecution(new JobInstance(
jobIdentifier, new Long(3)));
final StepExecution stepExecution = new StepExecution(step,
jobExecution);
template.setInterceptor(new RepeatInterceptorAdapter() {
public void open(RepeatContext context) {
assertNotNull(StepSynchronizationManager.getContext()
.getStepExecution());
assertEquals(stepExecution, StepSynchronizationManager.getContext()
.getStepExecution());
}
});
stepExecutor.process(stepConfiguration, stepExecution);
assertEquals(1, processed.size());
}
public void testRepository() throws Exception {
SimpleJobRepository repository = new SimpleJobRepository(