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

OPEN - issue BATCH-865: CompositeItemProcessor should handle null properly

Browse Source 
http://jira.springframework.org/browse/BATCH-865

If any processor returns null, then the composite will now return null.
This commit is contained in:
lucasward
2008-10-04 02:02:44 +00:00
parent 8bb08468d9
commit 56a12d0e77
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java
View File

@@ -25,6 +25,9 @@ public class CompositeItemProcessor<I, O> implements ItemProcessor<I, O>, Initia
Object result = item;
for(ItemProcessor transformer: itemProcessors){
if(result == null){
return null;
}
result = transformer.process(result);
}
return (O) result;

33
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java
View File

@@ -9,6 +9,7 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.item.ItemProcessor;
@@ -23,17 +24,17 @@ public class CompositeItemProcessorTests {
private CompositeItemProcessor<Object, Object> composite = new CompositeItemProcessor<Object, Object>();
private ItemProcessor<Object, Object> transformer1;
private ItemProcessor<Object, Object> transformer2;
private ItemProcessor<Object, Object> processor1;
private ItemProcessor<Object, Object> processor2;
@SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
transformer1 = createMock(ItemProcessor.class);
transformer2 = createMock(ItemProcessor.class);
processor1 = createMock(ItemProcessor.class);
processor2 = createMock(ItemProcessor.class);
composite.setItemProcessors(new ArrayList<ItemProcessor>() {{
add(transformer1); add(transformer2);
add(processor1); add(processor2);
}});
composite.afterPropertiesSet();
@@ -49,17 +50,17 @@ public class CompositeItemProcessorTests {
Object itemAfterFirstTransfromation = new Object();
Object itemAfterSecondTransformation = new Object();
expect(transformer1.process(item)).andReturn(itemAfterFirstTransfromation);
expect(processor1.process(item)).andReturn(itemAfterFirstTransfromation);
expect(transformer2.process(itemAfterFirstTransfromation)).andReturn(itemAfterSecondTransformation);
expect(processor2.process(itemAfterFirstTransfromation)).andReturn(itemAfterSecondTransformation);
replay(transformer1);
replay(transformer2);
replay(processor1);
replay(processor2);
assertSame(itemAfterSecondTransformation, composite.process(item));
verify(transformer1);
verify(transformer2);
verify(processor1);
verify(processor2);
}
/**
@@ -91,4 +92,14 @@ public class CompositeItemProcessorTests {
}
}
@Test
public void testFilteredItemInFirstProcessor() throws Exception{
Object item = new Object();
expect(processor1.process(item)).andReturn(null);
replay(processor1, processor2);
Assert.assertEquals(null,composite.process(item));
verify(processor1,processor2);
}
}