OPEN - issue BATCH-378: RepeatListener is confusing and too generic to use for 'intercepting' a step
http://jira.springframework.org/browse/BATCH-378 No need for setListener() methods.
This commit is contained in:
@@ -57,10 +57,6 @@ public class SimpleJob extends AbstractJob {
|
||||
}
|
||||
}
|
||||
|
||||
public void setListener(JobListener listener) {
|
||||
this.listener.register(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Run the specified job by looping through the steps and delegating to the
|
||||
* {@link Step}.
|
||||
|
||||
@@ -116,15 +116,6 @@ public class ItemOrientedStep extends AbstractStep implements InitializingBean {
|
||||
listener.register(listeners[i]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the objects as a listener.
|
||||
* @see #setListeners(Object[])
|
||||
* @param listener the listener to set
|
||||
*/
|
||||
public void setListener(Object listener) {
|
||||
this.listener.register(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* The {@link RepeatOperations} to use for the outer loop of the batch
|
||||
|
||||
@@ -141,14 +141,14 @@ public class SimpleJobTests extends TestCase {
|
||||
}
|
||||
|
||||
public void testRunNormallyWithListener() throws Exception {
|
||||
job.setListener(new JobListenerSupport() {
|
||||
job.setListeners(new JobListenerSupport[] {new JobListenerSupport() {
|
||||
public void beforeJob(JobExecution jobExecution) {
|
||||
list.add("before");
|
||||
}
|
||||
public void afterJob() {
|
||||
list.add("after");
|
||||
}
|
||||
});
|
||||
}});
|
||||
job.execute(jobExecution);
|
||||
assertEquals(4, list.size());
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileInputTemplate" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<bean id="compositeProcessorJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileInputTemplate" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<bean id="fixedLengthImportJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileInputTemplate" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<bean id="multilineJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileItemReader"/>
|
||||
<property name="listeners" ref="fileItemReader"/>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.AggregateItemReader">
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<property name="commitInterval" value="2" />
|
||||
<property name="startLimit" value="100" />
|
||||
<property name="allowStartIfComplete" value="false" />
|
||||
<property name="listener" ref="fileInputTemplate"/>
|
||||
<property name="listeners" ref="fileInputTemplate"/>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<bean id="restartSampleJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileItemReader"/>
|
||||
<property name="listeners" ref="fileItemReader"/>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler" p:limit="5"/>
|
||||
</property>
|
||||
<property name="listener" ref="fileInputTemplate" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="listener" ref="fileInputTemplate" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
|
||||
@@ -36,7 +36,6 @@ public class XmlStaxJobFunctionalTests extends AbstractValidatingBatchLauncherTe
|
||||
* Output should be the same as input
|
||||
*/
|
||||
protected void validatePostConditions() throws Exception {
|
||||
|
||||
XMLUnit.setIgnoreWhitespace(true);
|
||||
XMLAssert.assertXMLEqual(new FileReader(EXPECTED_OUTPUT_FILE), new FileReader(OUTPUT_FILE));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user