diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java index 7632fd459..72ff04c87 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java @@ -24,7 +24,7 @@ import org.springframework.batch.item.ItemWriter; * @author Lucas Ward * */ -public interface ItemReadListener extends StepListener { +public interface ItemReadListener extends StepListener { /** * Called before {@link ItemReader#read()} @@ -36,7 +36,7 @@ public interface ItemReadListener extends StepListener { * * @param item returned from read() */ - void afterRead(Object item); + void afterRead(T item); /** * Called if an error occurs while trying to read. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java index 9bf82427a..8fcfd4cb2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/SkipListener.java @@ -23,7 +23,7 @@ package org.springframework.batch.core; * @author Robert Kasanicky * */ -public interface SkipListener extends StepListener { +public interface SkipListener extends StepListener { /** * Callback for a failure on read that is legal, so is not going to be @@ -44,6 +44,6 @@ public interface SkipListener extends StepListener { * @param item the failed item * @param t the cause of the failure */ - void onSkipInWrite(Object item, Throwable t); + void onSkipInWrite(S item, Throwable t); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java index 1dfae55f4..98c411972 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import org.springframework.batch.core.ChunkListener; import org.springframework.core.Ordered; @@ -34,8 +34,8 @@ public class CompositeChunkListener implements ChunkListener { * * @param listeners */ - public void setListeners(ChunkListener[] listeners) { - this.listeners.setItems(Arrays.asList(listeners)); + public void setListeners(List listeners) { + this.listeners.setItems(listeners); } /** @@ -55,7 +55,7 @@ public class CompositeChunkListener implements ChunkListener { */ public void afterChunk() { for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - ChunkListener listener = (ChunkListener) iterator.next(); + ChunkListener listener = iterator.next(); listener.afterChunk(); } } @@ -67,7 +67,7 @@ public class CompositeChunkListener implements ChunkListener { */ public void beforeChunk() { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { - ChunkListener listener = (ChunkListener) iterator.next(); + ChunkListener listener = iterator.next(); listener.beforeChunk(); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java index cb071751f..c11ee86c4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecutionListener; @@ -35,8 +35,8 @@ public class CompositeExecutionJobListener implements JobExecutionListener { * * @param listeners */ - public void setListeners(JobExecutionListener[] listeners) { - this.listeners.setItems(Arrays.asList(listeners)); + public void setListeners(List listeners) { + this.listeners.setItems(listeners); } /** @@ -55,7 +55,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { */ public void afterJob(JobExecution jobExecution) { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { - JobExecutionListener listener = (JobExecutionListener) iterator.next(); + JobExecutionListener listener = iterator.next(); listener.afterJob(jobExecution); } } @@ -67,7 +67,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { */ public void beforeJob(JobExecution jobExecution) { for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - JobExecutionListener listener = (JobExecutionListener) iterator.next(); + JobExecutionListener listener = iterator.next(); listener.beforeJob(jobExecution); } } @@ -80,7 +80,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { */ public void onError(JobExecution jobExecution, Throwable e) { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { - JobExecutionListener listener = (JobExecutionListener) iterator.next(); + JobExecutionListener listener = iterator.next(); listener.onError(jobExecution, e); } @@ -93,7 +93,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { */ public void onInterrupt(JobExecution jobExecution) { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { - JobExecutionListener listener = (JobExecutionListener) iterator.next(); + JobExecutionListener listener = iterator.next(); listener.onInterrupt(jobExecution); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java index 91b6cc9da..e1841d1aa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import org.springframework.batch.core.ItemReadListener; import org.springframework.core.Ordered; @@ -26,17 +26,17 @@ import org.springframework.core.Ordered; * @author Dave Syer * */ -public class CompositeItemReadListener implements ItemReadListener { +public class CompositeItemReadListener implements ItemReadListener { - private OrderedComposite listeners = new OrderedComposite(); + private OrderedComposite> listeners = new OrderedComposite>(); /** * Public setter for the listeners. * * @param itemReadListeners */ - public void setListeners(ItemReadListener[] itemReadListeners) { - this.listeners.setItems(Arrays.asList(itemReadListeners)); + public void setListeners(List> itemReadListeners) { + this.listeners.setItems(itemReadListeners); } /** @@ -44,7 +44,7 @@ public class CompositeItemReadListener implements ItemReadListener { * * @param itemReaderListener */ - public void register(ItemReadListener itemReaderListener) { + public void register(ItemReadListener itemReaderListener) { listeners.add(itemReaderListener); } @@ -53,9 +53,9 @@ public class CompositeItemReadListener implements ItemReadListener { * prioritising those that implement {@link Ordered}. * @see org.springframework.batch.core.ItemReadListener#afterRead(java.lang.Object) */ - public void afterRead(Object item) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { - ItemReadListener listener = (ItemReadListener) iterator.next(); + public void afterRead(T item) { + for (Iterator> iterator = listeners.reverse(); iterator.hasNext();) { + ItemReadListener listener = iterator.next(); listener.afterRead(item); } } @@ -66,8 +66,8 @@ public class CompositeItemReadListener implements ItemReadListener { * @see org.springframework.batch.core.ItemReadListener#beforeRead() */ public void beforeRead() { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - ItemReadListener listener = (ItemReadListener) iterator.next(); + for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { + ItemReadListener listener = iterator.next(); listener.beforeRead(); } } @@ -78,8 +78,8 @@ public class CompositeItemReadListener implements ItemReadListener { * @see org.springframework.batch.core.ItemReadListener#onReadError(java.lang.Exception) */ public void onReadError(Exception ex) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - ItemReadListener listener = (ItemReadListener) iterator.next(); + for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { + ItemReadListener listener = iterator.next(); listener.onReadError(ex); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java index c54fecfd9..9aae1476b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java @@ -35,7 +35,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * * @param itemWriteListeners */ - public void setListeners(List> itemWriteListeners) { + public void setListeners(List> itemWriteListeners) { this.listeners.setItems(itemWriteListeners); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java index cebd2cb60..f54f019ae 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import org.springframework.batch.core.SkipListener; import org.springframework.core.Ordered; @@ -25,17 +25,17 @@ import org.springframework.core.Ordered; * @author Dave Syer * */ -public class CompositeSkipListener implements SkipListener { +public class CompositeSkipListener implements SkipListener { - private OrderedComposite listeners = new OrderedComposite(); + private OrderedComposite> listeners = new OrderedComposite>(); /** * Public setter for the listeners. * * @param listeners */ - public void setListeners(SkipListener[] listeners) { - this.listeners.setItems(Arrays.asList(listeners)); + public void setListeners(List> listeners) { + this.listeners.setItems(listeners); } /** @@ -43,7 +43,7 @@ public class CompositeSkipListener implements SkipListener { * * @param listener */ - public void register(SkipListener listener) { + public void register(SkipListener listener) { listeners.add(listener); } @@ -53,8 +53,8 @@ public class CompositeSkipListener implements SkipListener { * @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable) */ public void onSkipInRead(Throwable t) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - SkipListener listener = (SkipListener) iterator.next(); + for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { + SkipListener listener = iterator.next(); listener.onSkipInRead(t); } } @@ -65,9 +65,9 @@ public class CompositeSkipListener implements SkipListener { * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object, * java.lang.Throwable) */ - public void onSkipInWrite(Object item, Throwable t) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { - SkipListener listener = (SkipListener) iterator.next(); + public void onSkipInWrite(S item, Throwable t) { + for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { + SkipListener listener = iterator.next(); listener.onSkipInWrite(item, t); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java index d3f8f6c38..91fa5a845 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java @@ -28,7 +28,7 @@ import org.springframework.batch.core.ItemWriteListener; * @author Lucas Ward * */ -public class ItemListenerSupport implements ItemWriteListener, ItemReadListener { +public class ItemListenerSupport implements ItemWriteListener, ItemReadListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemWriteListener#afterWrite() @@ -51,7 +51,7 @@ public class ItemListenerSupport implements ItemWriteListener, ItemReadLis /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemReadListener#afterRead(java.lang.Object) */ - public void afterRead(Object item) { + public void afterRead(T item) { } /* (non-Javadoc) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java index d344eb6ad..d4635dbb1 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java @@ -31,18 +31,18 @@ import org.springframework.batch.repeat.ExitStatus; * @author Dave Syer * */ -public class MulticasterBatchListener implements StepExecutionListener, ChunkListener, ItemReadListener, - ItemWriteListener, SkipListener { +public class MulticasterBatchListener implements StepExecutionListener, ChunkListener, ItemReadListener, + ItemWriteListener, SkipListener { private CompositeStepExecutionListener stepListener = new CompositeStepExecutionListener(); private CompositeChunkListener chunkListener = new CompositeChunkListener(); - private CompositeItemReadListener itemReadListener = new CompositeItemReadListener(); + private CompositeItemReadListener itemReadListener = new CompositeItemReadListener(); private CompositeItemWriteListener itemWriteListener = new CompositeItemWriteListener(); - private CompositeSkipListener skipListener = new CompositeSkipListener(); + private CompositeSkipListener skipListener = new CompositeSkipListener(); /** * Initialise the listener instance. @@ -55,12 +55,11 @@ public class MulticasterBatchListener implements StepExecutionListener, Chunk * Register each of the objects as listeners. Once registered, calls to the * {@link MulticasterBatchListener} broadcast to the individual listeners. * - * @param listeners an array of listener objects of types known to the - * multicaster. + * @param listeners listener objects of types known to the multicaster. */ - public void setListeners(StepListener[] listeners) { - for (int i = 0; i < listeners.length; i++) { - register(listeners[i]); + public void setListeners(List listeners) { + for (StepListener stepListener : listeners) { + register(stepListener); } } @@ -157,7 +156,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Chunk * @param item * @see org.springframework.batch.core.listener.CompositeItemReadListener#afterRead(java.lang.Object) */ - public void afterRead(Object item) { + public void afterRead(T item) { try { itemReadListener.afterRead(item); } @@ -246,7 +245,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Chunk * @see org.springframework.batch.core.listener.CompositeSkipListener#onSkipInWrite(java.lang.Object, * java.lang.Throwable) */ - public void onSkipInWrite(Object item, Throwable t) { + public void onSkipInWrite(S item, Throwable t) { skipListener.onSkipInWrite(item, t); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java index 48fe54179..09c8807f7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java @@ -43,7 +43,7 @@ class OrderedComposite { * * @param items */ - public void setItems(List items) { + public void setItems(List items) { unordered.clear(); ordered.clear(); for (S s : items) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java index 422e60377..f494520c0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java @@ -31,8 +31,8 @@ import org.springframework.batch.repeat.ExitStatus; * @author Lucas Ward * */ -public class StepListenerSupport implements StepExecutionListener, ChunkListener, - ItemReadListener, ItemWriteListener { +public class StepListenerSupport implements StepExecutionListener, ChunkListener, + ItemReadListener, ItemWriteListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.StepListener#afterStep(StepExecution stepExecution) @@ -69,7 +69,7 @@ public class StepListenerSupport implements StepExecutionListener, ChunkListe /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemReadListener#afterRead(java.lang.Object) */ - public void afterRead(Object item) { + public void afterRead(T item) { } /* (non-Javadoc) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java index 394e4acfc..819f63354 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java @@ -30,7 +30,7 @@ import org.springframework.batch.core.listener.ItemListenerSupport; * @author Lucas Ward * */ -public class DefaultItemFailureHandler extends ItemListenerSupport { +public class DefaultItemFailureHandler extends ItemListenerSupport { protected static final Log logger = LogFactory .getLog(DefaultItemFailureHandler.class); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStepHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStepHandler.java index 7755c3eda..b37830ba0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStepHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStepHandler.java @@ -60,7 +60,7 @@ public class ItemOrientedStepHandler implements StepHandler { private final RepeatOperations repeatOperations; - final private MulticasterBatchListener listener = new MulticasterBatchListener(); + final private MulticasterBatchListener listener = new MulticasterBatchListener(); /** * @param itemReader @@ -291,7 +291,7 @@ public class ItemOrientedStepHandler implements StepHandler { * Public getter for the listener. * @return the listener */ - protected MulticasterBatchListener getListener() { + protected MulticasterBatchListener getListener() { return listener; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java index e5eb5d8ce..ef469f65e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java @@ -15,12 +15,15 @@ */ package org.springframework.batch.core.listener; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.springframework.batch.core.ItemReadListener; -import org.springframework.batch.core.listener.CompositeItemReadListener; /** * @author Lucas Ward @@ -28,14 +31,14 @@ import org.springframework.batch.core.listener.CompositeItemReadListener; */ public class CompositeItemReadListenerTests { - ItemReadListener listener; - CompositeItemReadListener compositeListener; + ItemReadListener listener; + CompositeItemReadListener compositeListener; + @SuppressWarnings("unchecked") @Before public void setUp() throws Exception { - listener = createMock(ItemReadListener.class); - compositeListener = new CompositeItemReadListener(); + compositeListener = new CompositeItemReadListener(); compositeListener.register(listener); } @@ -68,8 +71,12 @@ public class CompositeItemReadListenerTests { } @Test - public void testSetListners() throws Exception { - compositeListener.setListeners(new ItemReadListener[] {listener}); + public void testSetListeners() throws Exception { + compositeListener.setListeners(new ArrayList>() { + { + add(listener); + } + }); listener.beforeRead(); replay(listener); compositeListener.beforeRead(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java index 1b812810c..c983c3c8f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java @@ -74,7 +74,7 @@ public class CompositeItemWriteListenerTests { } @Test - public void testSetListners() throws Exception { + public void testSetListeners() throws Exception { compositeListener.setListeners(new ArrayList>() { { add(listener); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java index 0f7a466de..efd133ebc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java @@ -16,12 +16,12 @@ package org.springframework.batch.core.listener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import junit.framework.TestCase; import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.JobInstance; /** @@ -36,10 +36,10 @@ public class CompositeJobExecutionListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#setListeners(org.springframework.batch.core.JobExecutionListener[])}. + * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#setListeners(List)} */ public void testSetListeners() { - listener.setListeners(new JobExecutionListener[] { new JobExecutionListenerSupport() { + listener.setListeners(Arrays.asList(new JobExecutionListenerSupport() { public void afterJob(JobExecution jobExecution) { list.add("fail"); } @@ -47,14 +47,15 @@ public class CompositeJobExecutionListenerTests extends TestCase { public void afterJob(JobExecution jobExecution) { list.add("continue"); } - } }); + })); listener.afterJob(null); assertEquals(2, list.size()); } /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#register(org.springframework.batch.core.JobExecutionListener)}. + * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#register(org.springframework.batch.core.JobExecutionListener)} + * . */ public void testSetListener() { listener.register(new JobExecutionListenerSupport() { @@ -68,7 +69,8 @@ public class CompositeJobExecutionListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#beforeJob(JobExecution)}. + * {@link org.springframework.batch.core.listener.CompositeExecutionJobListener#beforeJob(JobExecution)} + * . */ public void testOpen() { listener.register(new JobExecutionListenerSupport() { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java index 55b91c6d4..6c8986237 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java @@ -18,12 +18,12 @@ package org.springframework.batch.core.listener; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import java.util.Arrays; import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.StepListener; import org.springframework.batch.repeat.ExitStatus; /** @@ -32,7 +32,7 @@ import org.springframework.batch.repeat.ExitStatus; */ public class MulticasterBatchListenerTests { - private MulticasterBatchListener multicast = new MulticasterBatchListener(); + private MulticasterBatchListener multicast = new MulticasterBatchListener(); private int count = 0; @@ -43,20 +43,15 @@ public class MulticasterBatchListenerTests { multicast.register(new CountingStepListenerSupport()); } - /** - * Test method for - * {@link org.springframework.batch.core.listener.MulticasterBatchListener#setListeners(org.springframework.batch.core.StepListener[])} - * . - */ @Test public void testSetListeners() { - multicast.setListeners(new StepListener[] { new StepListenerSupport() { + multicast.setListeners(Arrays.asList(new StepListenerSupport() { @Override public ExitStatus afterStep(StepExecution stepExecution) { count++; return super.afterStep(stepExecution); } - } }); + })); multicast.afterStep(null); // setListeners is cumulative (should be OK if used for DI) assertEquals(2, count); @@ -69,7 +64,7 @@ public class MulticasterBatchListenerTests { */ @Test public void testRegister() { - multicast.register(new StepListenerSupport() { + multicast.register(new StepListenerSupport() { @Override public ExitStatus afterStep(StepExecution stepExecution) { count++; @@ -502,7 +497,7 @@ public class MulticasterBatchListenerTests { * @author Dave Syer * */ - private final class CountingStepListenerSupport extends StepListenerSupport { + private final class CountingStepListenerSupport extends StepListenerSupport { @Override public void onReadError(Exception ex) { count++; @@ -536,7 +531,7 @@ public class MulticasterBatchListenerTests { * (java.lang.Object) */ @Override - public void afterRead(Object item) { + public void afterRead(Integer item) { count++; if (error) { throw new RuntimeException("listener error"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java index 4fc572c34..343bfc9fb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java @@ -134,7 +134,7 @@ public class SimpleStepFactoryBeanTests { throw new RuntimeException("Error!"); } }); - factory.setListeners(new StepListener[] { new ItemListenerSupport() { + factory.setListeners(new StepListener[] { new ItemListenerSupport() { @Override public void onReadError(Exception ex) { listened.add(ex);