From 2520f08dd02b46960c3d9f1fab3f8a01fbf9ce60 Mon Sep 17 00:00:00 2001 From: robokaso Date: Wed, 16 Jul 2008 09:02:16 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../core/listener/CompositeChunkListener.java | 4 ++-- .../listener/CompositeExecutionJobListener.java | 8 ++++---- .../core/listener/CompositeItemReadListener.java | 6 +++--- .../core/listener/CompositeItemWriteListener.java | 6 +++--- .../core/listener/CompositeSkipListener.java | 4 ++-- .../listener/CompositeStepExecutionListener.java | 6 +++--- .../batch/core/listener/OrderedComposite.java | 15 ++++++++------- 7 files changed, 25 insertions(+), 24 deletions(-) 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 9e5d12f6f..a1f5ea25b 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 @@ -53,7 +53,7 @@ public class CompositeChunkListener implements ChunkListener { * @see org.springframework.batch.core.ChunkListener#afterChunk() */ public void afterChunk() { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { ChunkListener listener = (ChunkListener) iterator.next(); listener.afterChunk(); } @@ -65,7 +65,7 @@ public class CompositeChunkListener implements ChunkListener { * @see org.springframework.batch.core.ChunkListener#beforeChunk() */ public void beforeChunk() { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { ChunkListener listener = (ChunkListener) 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 94263ff0d..e6607b161 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 @@ -53,7 +53,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { * @see org.springframework.batch.core.JobExecutionListener#afterJob(org.springframework.batch.core.JobExecution) */ public void afterJob(JobExecution jobExecution) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { JobExecutionListener listener = (JobExecutionListener) iterator.next(); listener.afterJob(jobExecution); } @@ -65,7 +65,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { * @see org.springframework.batch.core.JobExecutionListener#beforeJob(org.springframework.batch.core.JobExecution) */ public void beforeJob(JobExecution jobExecution) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { JobExecutionListener listener = (JobExecutionListener) iterator.next(); listener.beforeJob(jobExecution); } @@ -78,7 +78,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { * java.lang.Throwable) */ public void onError(JobExecution jobExecution, Throwable e) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { JobExecutionListener listener = (JobExecutionListener) iterator.next(); listener.onError(jobExecution, e); } @@ -91,7 +91,7 @@ public class CompositeExecutionJobListener implements JobExecutionListener { * @see org.springframework.batch.core.JobExecutionListener#onInterrupt(org.springframework.batch.core.JobExecution) */ public void onInterrupt(JobExecution jobExecution) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { JobExecutionListener listener = (JobExecutionListener) 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 aa64f86e1..fa0b6a761 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 @@ -53,7 +53,7 @@ public class CompositeItemReadListener implements ItemReadListener { * @see org.springframework.batch.core.ItemReadListener#afterRead(java.lang.Object) */ public void afterRead(Object item) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { ItemReadListener listener = (ItemReadListener) iterator.next(); listener.afterRead(item); } @@ -65,7 +65,7 @@ public class CompositeItemReadListener implements ItemReadListener { * @see org.springframework.batch.core.ItemReadListener#beforeRead() */ public void beforeRead() { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { ItemReadListener listener = (ItemReadListener) iterator.next(); listener.beforeRead(); } @@ -77,7 +77,7 @@ 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();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { ItemReadListener listener = (ItemReadListener) 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 b3c4ca216..e6f5e0a22 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 @@ -53,7 +53,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * @see org.springframework.batch.core.ItemWriteListener#afterWrite(java.lang.Object) */ public void afterWrite(Object item) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { ItemWriteListener listener = (ItemWriteListener) iterator.next(); listener.afterWrite(item); } @@ -65,7 +65,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * @see org.springframework.batch.core.ItemWriteListener#beforeWrite(java.lang.Object) */ public void beforeWrite(Object item) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { ItemWriteListener listener = (ItemWriteListener) iterator.next(); listener.beforeWrite(item); } @@ -78,7 +78,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * java.lang.Object) */ public void onWriteError(Exception ex, Object item) { - for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { + for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { ItemWriteListener listener = (ItemWriteListener) iterator.next(); listener.onWriteError(ex, item); } 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 5e8c6f81f..e0b0bed4b 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 @@ -52,7 +52,7 @@ 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();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { SkipListener listener = (SkipListener) iterator.next(); listener.onSkipInRead(t); } @@ -65,7 +65,7 @@ public class CompositeSkipListener implements SkipListener { * java.lang.Throwable) */ public void onSkipInWrite(Object item, Throwable t) { - for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { + for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { SkipListener listener = (SkipListener) iterator.next(); listener.onSkipInWrite(item, t); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java index 87a49ee5d..1c258bd29 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java @@ -56,7 +56,7 @@ public class CompositeStepExecutionListener implements StepExecutionListener { */ public ExitStatus afterStep(StepExecution stepExecution) { ExitStatus status = null; - for (Iterator iterator = list.reverse(); iterator.hasNext();) { + for (Iterator iterator = list.reverse(); iterator.hasNext();) { StepExecutionListener listener = (StepExecutionListener) iterator.next(); ExitStatus close = listener.afterStep(stepExecution); status = status != null ? status.and(close) : close; @@ -70,7 +70,7 @@ public class CompositeStepExecutionListener implements StepExecutionListener { * @see org.springframework.batch.core.StepExecutionListener#beforeStep(StepExecution) */ public void beforeStep(StepExecution stepExecution) { - for (Iterator iterator = list.iterator(); iterator.hasNext();) { + for (Iterator iterator = list.iterator(); iterator.hasNext();) { StepExecutionListener listener = (StepExecutionListener) iterator.next(); listener.beforeStep(stepExecution); } @@ -84,7 +84,7 @@ public class CompositeStepExecutionListener implements StepExecutionListener { */ public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) { ExitStatus status = null; - for (Iterator iterator = list.reverse(); iterator.hasNext();) { + for (Iterator iterator = list.reverse(); iterator.hasNext();) { StepExecutionListener listener = (StepExecutionListener) iterator.next(); ExitStatus close = listener.onErrorInStep(stepExecution, e); status = status != null ? status.and(close) : close; 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 74a6cbf4b..22b80518a 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 @@ -31,11 +31,12 @@ import org.springframework.core.Ordered; */ class OrderedComposite { - private List unordered = new ArrayList(); + private List unordered = new ArrayList(); - private Collection ordered = new TreeSet(new OrderComparator()); + @SuppressWarnings("unchecked") + private Collection ordered = new TreeSet(new OrderComparator()); - private List list = new ArrayList(); + private List list = new ArrayList(); /** * Public setter for the listeners. @@ -76,8 +77,8 @@ class OrderedComposite { * first, followed by any unordered ones. * @return an iterator over the list of items */ - public Iterator iterator() { - return new ArrayList(list).iterator(); + public Iterator iterator() { + return new ArrayList(list).iterator(); } /** @@ -85,8 +86,8 @@ class OrderedComposite { * last, after any unordered ones. * @return an iterator over the list of items */ - public Iterator reverse() { - ArrayList result = new ArrayList(list); + public Iterator reverse() { + ArrayList result = new ArrayList(list); Collections.reverse(result); return result.iterator(); }