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

OPEN - issue BATCH-320: Refactor ItemWriter as primary collaborator (with wrapper for processor)

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

Half way there - tests OK, but some naming and tidying up to do.
This commit is contained in:
dsyer
2008-01-28 22:37:46 +00:00
parent 8c1210f5da
commit 0e27ea6660
89 changed files with 585 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java
View File

@@ -133,8 +133,9 @@ public class HibernateAwareItemWriterTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.io.support.HibernateAwareItemWriter#write(java.lang.Object)}.
* @throws Exception
*/
public void testWrite() {
public void testWrite() throws Exception {
writer.write("foo");
assertEquals(1, list.size());
assertTrue(list.contains("foo"));
@@ -165,8 +166,9 @@ public class HibernateAwareItemWriterTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.io.support.HibernateAwareItemWriter#write(java.lang.Object)}.
* @throws Exception
*/
public void testWriteAndCloseWithFailure() {
public void testWriteAndCloseWithFailure() throws Exception {
final RuntimeException ex = new RuntimeException("bar");
writer.setHibernateTemplate(new HibernateTemplateWrapper() {
public void flush() throws DataAccessException {

19
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemProcessorTests.java
View File

@@ -9,21 +9,22 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.processor.CompositeItemProcessor;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.processor.CompositeItemWriter;
import org.springframework.batch.restart.GenericRestartData;
import org.springframework.batch.restart.RestartData;
import org.springframework.batch.restart.Restartable;
import org.springframework.batch.statistics.StatisticsProvider;
/**
* Tests for {@link CompositeItemProcessor}
* Tests for {@link CompositeItemWriter}
*
* @author Robert Kasanicky
*/
public class CompositeItemProcessorTests extends TestCase {
// object under test
private CompositeItemProcessor itemProcessor = new CompositeItemProcessor();
private CompositeItemWriter itemProcessor = new CompositeItemWriter();
/**
* Regular usage scenario.
@@ -38,10 +39,10 @@ public class CompositeItemProcessorTests extends TestCase {
List processors = new ArrayList(NUMBER_OF_PROCESSORS);
for (int i = 0; i < NUMBER_OF_PROCESSORS; i++) {
MockControl control = MockControl.createStrictControl(ItemProcessor.class);
ItemProcessor processor = (ItemProcessor) control.getMock();
MockControl control = MockControl.createStrictControl(ItemWriter.class);
ItemWriter processor = (ItemWriter) control.getMock();
processor.process(data);
processor.write(data);
control.setVoidCallable();
control.replay();
@@ -49,8 +50,8 @@ public class CompositeItemProcessorTests extends TestCase {
controls.add(control);
}
itemProcessor.setItemProcessors(processors);
itemProcessor.process(data);
itemProcessor.setItemWriters(processors);
itemProcessor.write(data);
for (Iterator iterator = controls.iterator(); iterator.hasNext();) {
MockControl control = (MockControl) iterator.next();
@@ -73,7 +74,7 @@ public class CompositeItemProcessorTests extends TestCase {
add(p2);
add(p3);
}};
itemProcessor.setItemProcessors(itemProcessors);
itemProcessor.setItemWriters(itemProcessors);
RestartData rd = itemProcessor.getRestartData();
itemProcessor.restoreFrom(rd);

14
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java
View File

@@ -35,7 +35,7 @@ import org.springframework.batch.support.PropertiesConverter;
*/
public class ItemWriterItemProcessorTests extends TestCase {
private ItemWriterItemProcessor processor = new ItemWriterItemProcessor();
private DelegatingItemWriter processor = new DelegatingItemWriter();
private ItemWriter writer;
@@ -45,12 +45,12 @@ public class ItemWriterItemProcessorTests extends TestCase {
*/
protected void setUp() throws Exception {
writer = new MockOutputSource("test");
processor.setItemWriter(writer);
processor.setDelegate(writer);
processor.afterPropertiesSet();
}
public void testProcess() throws Exception {
processor.process("foo");
processor.write("foo");
assertEquals(1, list.size());
assertEquals("test:foo", list.get(0));
}
@@ -69,7 +69,7 @@ public class ItemWriterItemProcessorTests extends TestCase {
*/
public void testRestoreFrom() throws Exception {
processor.restoreFrom(new GenericRestartData(PropertiesConverter.stringToProperties("value=bar")));
processor.process("foo");
processor.write("foo");
assertEquals("bar:foo", list.get(0));
}
@@ -78,7 +78,7 @@ public class ItemWriterItemProcessorTests extends TestCase {
* @throws Exception
*/
public void testGetRestartDataWithoutRestartable() throws Exception {
processor.setItemWriter(null);
processor.setDelegate(null);
try {
processor.getRestartData();
fail("Expected IllegalStateException");
@@ -93,7 +93,7 @@ public class ItemWriterItemProcessorTests extends TestCase {
* @throws Exception
*/
public void testRestoreFromWithoutRestartable() throws Exception {
processor.setItemWriter(null);
processor.setDelegate(null);
try {
processor.restoreFrom(new GenericRestartData(PropertiesConverter.stringToProperties("value=bar")));
fail("Expected IllegalStateException");
@@ -113,7 +113,7 @@ public class ItemWriterItemProcessorTests extends TestCase {
* ItemWriter property must be set.
*/
public void testAfterPropertiesSet() throws Exception {
processor.setItemWriter(null);
processor.setDelegate(null);
try {
processor.afterPropertiesSet();
fail();

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
View File

@@ -7,14 +7,14 @@ import org.springframework.batch.io.sample.domain.FooService;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
/**
* Tests for {@link PropertyExtractingDelegatingItemProcessor}
* Tests for {@link PropertyExtractingDelegatingItemWriter}
*
* @author Robert Kasanicky
*/
public class PropertyExtractingDelegatingItemProccessorIntegrationTests
extends AbstractDependencyInjectionSpringContextTests {
private PropertyExtractingDelegatingItemProcessor processor;
private PropertyExtractingDelegatingItemWriter processor;
private FooService fooService;
@@ -29,7 +29,7 @@ public class PropertyExtractingDelegatingItemProccessorIntegrationTests
public void testProcess() throws Exception {
Foo foo;
while ((foo = fooService.generateFoo()) != null) {
processor.process(foo);
processor.write(foo);
}
List input = fooService.getGeneratedFoos();
@@ -47,7 +47,7 @@ public class PropertyExtractingDelegatingItemProccessorIntegrationTests
}
public void setProcessor(PropertyExtractingDelegatingItemProcessor processor) {
public void setProcessor(PropertyExtractingDelegatingItemWriter processor) {
this.processor = processor;
}

8
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java
View File

@@ -6,13 +6,13 @@ import org.easymock.MockControl;
import org.springframework.batch.item.ItemWriter;
/**
* Tests for {@link TransformerWriterItemProcessor}.
* Tests for {@link ItemTransformerItemWriterr}.
*
* @author Robert Kasanicky
*/
public class TransformerWriterItemProcessorTests extends TestCase {
private TransformerWriterItemProcessor processor = new TransformerWriterItemProcessor();
private ItemTransformerItemWriterr processor = new ItemTransformerItemWriterr();
private ItemTransformer transformer;
private ItemWriter itemWriter;
@@ -25,7 +25,7 @@ public class TransformerWriterItemProcessorTests extends TestCase {
itemWriter = (ItemWriter) outControl.getMock();
processor.setItemTransformer(transformer);
processor.setItemWriter(itemWriter);
processor.setDelegate(itemWriter);
processor.afterPropertiesSet();
}
@@ -46,7 +46,7 @@ public class TransformerWriterItemProcessorTests extends TestCase {
tControl.replay();
outControl.replay();
processor.process(item);
processor.write(item);
tControl.verify();
outControl.verify();

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.reader.ListItemReader;
public class ItemReaderRepeatCallbackTests extends TestCase {
@@ -33,8 +33,8 @@ public class ItemReaderRepeatCallbackTests extends TestCase {
public void testDoWithRepeat() throws Exception {
callback = new ItemReaderRepeatCallback(new ListItemReader(Arrays.asList(new String[] { "foo", "bar" })),
new ItemProcessor() {
public void process(Object data) {
new ItemWriter() {
public void write(Object data) {
list.add(data);
}
});

10
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
View File

@@ -19,9 +19,9 @@ package org.springframework.batch.repeat.support;
import junit.framework.TestCase;
import org.springframework.batch.io.file.SimpleFlatFileItemReader;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.reader.DelegatingItemReader;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -38,7 +38,7 @@ public abstract class AbstractTradeBatchTests extends TestCase {
Resource resource = new ClassPathResource("trades.csv", getClass());
protected TradeProcessor processor = new TradeProcessor();
protected TradeWriter processor = new TradeWriter();
protected TradeItemReader provider;
@@ -69,12 +69,12 @@ public abstract class AbstractTradeBatchTests extends TestCase {
}
}
protected static class TradeProcessor implements ItemProcessor {
protected static class TradeWriter implements ItemWriter {
int count = 0;
// This has to be synchronized because we are going to test the state
// (count) at the end of a concurrent batch run.
public synchronized void process(Object data) {
public synchronized void write(Object data) {
count++;
System.out.println("Executing trade '" + data + "'");
}

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.reader.ListItemReader;
import org.springframework.batch.retry.ListItemReaderRecoverer;
import org.springframework.batch.retry.RetryContext;
@@ -57,8 +57,8 @@ public class ItemReaderRetryCallbackTests extends TestCase {
return "key" + (count++);
}
};
callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
if (data.equals("bar")) {
throw new IllegalStateException("Bar detected");

42
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.item.FailedItemIdentifier;
import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.reader.ListItemReader;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.context.RepeatContextSupport;
@@ -61,8 +61,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
}
public void testOpenSunnyDay() throws Exception {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -92,8 +92,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testCanRetry() {
policy.setDelegate(new AlwaysRetryPolicy());
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
}
}));
@@ -105,8 +105,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testRegisterThrowable() {
policy.setDelegate(new NeverRetryPolicy());
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -118,8 +118,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testClose() throws Exception {
policy.setDelegate(new NeverRetryPolicy());
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -137,8 +137,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
}
public void testOpenTwice() throws Exception {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -168,8 +168,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testRecover() throws Exception {
policy = new ItemReaderRetryPolicy();
policy.setDelegate(new SimpleRetryPolicy(1));
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
}
});
RetryContext context = policy.open(callback);
@@ -207,8 +207,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testRecoverWithTemplate() throws Exception {
policy = new ItemReaderRetryPolicy();
policy.setDelegate(new SimpleRetryPolicy(1));
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
throw new RuntimeException("Barf!");
}
});
@@ -230,8 +230,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
}
public void testExhaustedClearsHistoryAfterLastAttempt() throws Exception {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -258,8 +258,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
public void testRetryCount() throws Exception {
policy = new ItemReaderRetryPolicy();
policy.setDelegate(new SimpleRetryPolicy(1));
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
RetryContext context = policy.open(new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}
@@ -273,8 +273,8 @@ public class ItemReaderRetryPolicyTests extends TestCase {
}
public void testRetryCountPreservedBetweenRetries() throws Exception {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemProcessor() {
public void process(Object data) {
ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() {
public void write(Object data) {
count++;
list.add(data);
}