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

RESOLVED - BATCH-410 ChunkListeners called on chunkOperations open() and close()

Browse Source
This commit is contained in:
robokaso
2008-03-10 15:35:07 +00:00
parent 130f72a1d8
commit f53d10d879
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
View File

@@ -30,7 +30,6 @@ import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.reader.DelegatingItemReader;
import org.springframework.batch.item.writer.DelegatingItemWriter;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatOperations;
import org.springframework.batch.repeat.listener.RepeatListenerSupport;
@@ -113,11 +112,11 @@ class BatchListenerFactoryHelper {
}
/**
* @param stepOperations
* @param chunkOperations
* @param listeners
* @return
*/
public RepeatOperations addChunkListeners(RepeatOperations stepOperations, BatchListener[] listeners) {
public RepeatOperations addChunkListeners(RepeatOperations chunkOperations, BatchListener[] listeners) {
final CompositeChunkListener multicaster = new CompositeChunkListener();
@@ -135,23 +134,23 @@ class BatchListenerFactoryHelper {
if (hasChunkListener) {
Assert.state(stepOperations instanceof RepeatTemplate,
"Step operations is injected but not a RepeatTemplate, so chunk listeners cannot also be registered. "
Assert.state(chunkOperations instanceof RepeatTemplate,
"Chunk operations is injected but not a RepeatTemplate, so chunk listeners cannot also be registered. "
+ "Either inject a RepeatTemplate, or remove the ChunkListener.");
RepeatTemplate stepTemplate = (RepeatTemplate) stepOperations;
RepeatTemplate stepTemplate = (RepeatTemplate) chunkOperations;
stepTemplate.registerListener(new RepeatListenerSupport() {
public void before(RepeatContext context) {
public void open(RepeatContext context) {
multicaster.beforeChunk();
}
public void after(RepeatContext context, ExitStatus result) {
public void close(RepeatContext context) {
multicaster.afterChunk();
}
});
}
return stepOperations;
return chunkOperations;
}

5
spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepFactoryBean.java
View File

@@ -192,12 +192,11 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
BatchListenerFactoryHelper helper = new BatchListenerFactoryHelper();
stepOperations = new RepeatTemplate();
if (commitInterval > 0) {
RepeatTemplate chunkOperations = new RepeatTemplate();
chunkOperations.setCompletionPolicy(new SimpleCompletionPolicy(commitInterval));
helper.addChunkListeners(stepOperations, listeners);
helper.addChunkListeners(chunkOperations, listeners);
step.setChunkOperations(chunkOperations);
}
@@ -212,6 +211,8 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
step.setStepListeners(stepListeners);
stepOperations = new RepeatTemplate();
if (taskExecutor != null) {
TaskExecutorRepeatTemplate repeatTemplate = new TaskExecutorRepeatTemplate();
repeatTemplate.setTaskExecutor(taskExecutor);