RESOLVED - issue BATCH-404: FactoryBeans for step configuration
http://jira.springframework.org/browse/BATCH-404 Better name for helper method.
This commit is contained in:
@@ -30,6 +30,7 @@ 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;
|
||||
@@ -116,7 +117,7 @@ class BatchListenerFactoryHelper {
|
||||
* @param listeners
|
||||
* @return
|
||||
*/
|
||||
public RepeatOperations getStepOperations(RepeatOperations stepOperations, BatchListener[] listeners) {
|
||||
public RepeatOperations addChunkListeners(RepeatOperations stepOperations, BatchListener[] listeners) {
|
||||
|
||||
final CompositeChunkListener multicaster = new CompositeChunkListener();
|
||||
|
||||
@@ -140,11 +141,10 @@ class BatchListenerFactoryHelper {
|
||||
|
||||
RepeatTemplate stepTemplate = (RepeatTemplate) stepOperations;
|
||||
stepTemplate.registerListener(new RepeatListenerSupport() {
|
||||
public void open(RepeatContext context) {
|
||||
public void before(RepeatContext context) {
|
||||
multicaster.beforeChunk();
|
||||
}
|
||||
|
||||
public void close(RepeatContext context) {
|
||||
public void after(RepeatContext context, ExitStatus result) {
|
||||
multicaster.afterChunk();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -184,7 +184,7 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
|
||||
itemReader = helper.getItemReader(itemReader, listeners);
|
||||
itemWriter = helper.getItemWriter(itemWriter, listeners);
|
||||
stepOperations = new RepeatTemplate();
|
||||
stepOperations = (RepeatTemplate) helper.getStepOperations(stepOperations, listeners);
|
||||
stepOperations = (RepeatTemplate) helper.addChunkListeners(stepOperations, listeners);
|
||||
|
||||
// In case they are used by subclasses:
|
||||
setItemReader(itemReader);
|
||||
|
||||
@@ -123,7 +123,7 @@ public class RepeatOperationsStepFactoryBean extends AbstractStepFactoryBean {
|
||||
StepListener[] stepListeners = helper.getStepListeners(listeners);
|
||||
itemReader = helper.getItemReader(itemReader, listeners);
|
||||
itemWriter = helper.getItemWriter(itemWriter, listeners);
|
||||
RepeatOperations stepOperations = helper.getStepOperations(this.stepOperations, listeners);
|
||||
RepeatOperations stepOperations = helper.addChunkListeners(this.stepOperations, listeners);
|
||||
|
||||
// In case they are used by subclasses:
|
||||
setItemReader(itemReader);
|
||||
|
||||
@@ -61,12 +61,6 @@
|
||||
|
||||
<bean id="lobHandler" class="${batch.lob.handler.class}"/>
|
||||
|
||||
<bean id="incrementerParent"
|
||||
class="${batch.database.incrementer.class}">
|
||||
<property name="dataSource" ref="dataSource" />
|
||||
<property name="incrementerName" value="ID" />
|
||||
</bean>
|
||||
|
||||
<!--import resource="alt-data-source-context.xml" /-->
|
||||
|
||||
</beans>
|
||||
Reference in New Issue
Block a user