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

IN PROGRESS - BATCH-709: Change all collections to use generics

Browse Source
This commit is contained in:
robokaso
2008-07-16 09:02:16 +00:00
parent 5d57ea2f0f
commit 2520f08dd0
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java
View File

@@ -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<Object> 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<Object> iterator = listeners.reverse(); iterator.hasNext();) {
ChunkListener listener = (ChunkListener) iterator.next();
listener.beforeChunk();
}

8
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeExecutionJobListener.java
View File

@@ -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<Object> 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<Object> 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<Object> 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<Object> iterator = listeners.reverse(); iterator.hasNext();) {
JobExecutionListener listener = (JobExecutionListener) iterator.next();
listener.onInterrupt(jobExecution);
}

6
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java
View File

@@ -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<Object> 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<Object> 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<Object> iterator = listeners.iterator(); iterator.hasNext();) {
ItemReadListener listener = (ItemReadListener) iterator.next();
listener.onReadError(ex);
}

6
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
View File

@@ -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<Object> 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<Object> 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<Object> iterator = listeners.reverse(); iterator.hasNext();) {
ItemWriteListener listener = (ItemWriteListener) iterator.next();
listener.onWriteError(ex, item);
}

4
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java
View File

@@ -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<Object> 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<Object> iterator = listeners.iterator(); iterator.hasNext();) {
SkipListener listener = (SkipListener) iterator.next();
listener.onSkipInWrite(item, t);
}

6
spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java
View File

@@ -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<Object> 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<Object> 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<Object> iterator = list.reverse(); iterator.hasNext();) {
StepExecutionListener listener = (StepExecutionListener) iterator.next();
ExitStatus close = listener.onErrorInStep(stepExecution, e);
status = status != null ? status.and(close) : close;

15
spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java
View File

@@ -31,11 +31,12 @@ import org.springframework.core.Ordered;
*/
class OrderedComposite {
private List unordered = new ArrayList();
private List<Object> unordered = new ArrayList<Object>();
private Collection ordered = new TreeSet(new OrderComparator());
@SuppressWarnings("unchecked")
private Collection<Object> ordered = new TreeSet<Object>(new OrderComparator());
private List list = new ArrayList();
private List<Object> list = new ArrayList<Object>();
/**
* 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<Object> iterator() {
return new ArrayList<Object>(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<Object> reverse() {
ArrayList<Object> result = new ArrayList<Object>(list);
Collections.reverse(result);
return result.iterator();
}