diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java index 5de3c3ec9..6d4852064 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java @@ -42,7 +42,7 @@ import org.springframework.batch.item.stream.SimpleStreamManager; import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.interceptor.RepeatListenerAdapter; +import org.springframework.batch.repeat.interceptor.RepeatListenerSupport; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; @@ -146,7 +146,7 @@ public class ChunkedStepTests extends TestCase { jobExecution.setId(new Long(1)); final StepExecution stepExecution = new StepExecution("testStep", jobExecution); - template.setListener(new RepeatListenerAdapter() { + template.setListener(new RepeatListenerSupport() { public void open(RepeatContext context) { assertNotNull(StepSynchronizationManager.getContext().getStepExecution()); assertEquals(stepExecution, StepSynchronizationManager.getContext().getStepExecution()); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java index 05c3c8a5d..8c78cb10b 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java @@ -48,14 +48,14 @@ import org.springframework.batch.item.exception.ResetFailedException; import org.springframework.batch.item.exception.StreamException; import org.springframework.batch.item.reader.AbstractItemReader; import org.springframework.batch.item.reader.ListItemReader; -import org.springframework.batch.item.stream.ItemStreamAdapter; +import org.springframework.batch.item.stream.ItemStreamSupport; import org.springframework.batch.item.stream.SimpleStreamManager; import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.exception.handler.DefaultExceptionHandler; import org.springframework.batch.repeat.exception.handler.ExceptionHandler; -import org.springframework.batch.repeat.interceptor.RepeatListenerAdapter; +import org.springframework.batch.repeat.interceptor.RepeatListenerSupport; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.support.PropertiesConverter; @@ -185,7 +185,7 @@ public class ItemOrientedStepTests extends TestCase { jobExecution.setId(new Long(1)); final StepExecution stepExecution = new StepExecution(step, jobExecution); - template.setListener(new RepeatListenerAdapter() { + template.setListener(new RepeatListenerSupport() { public void open(RepeatContext context) { assertNotNull(StepSynchronizationManager.getContext().getStepExecution()); assertEquals(stepExecution, StepSynchronizationManager.getContext().getStepExecution()); @@ -430,7 +430,7 @@ public class ItemOrientedStepTests extends TestCase { assertEquals(0, map.size()); } - private class MockRestartableItemReader extends ItemStreamAdapter implements ItemReader { + private class MockRestartableItemReader extends ItemStreamSupport implements ItemReader { private boolean getExecutionAttributesCalled = false; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java index b41ffa8ec..74a93ce7b 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java @@ -17,7 +17,7 @@ import org.springframework.batch.execution.step.support.JobRepositorySupport; import org.springframework.batch.io.exception.BatchCriticalException; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.interceptor.RepeatListenerAdapter; +import org.springframework.batch.repeat.interceptor.RepeatListenerSupport; public class TaskletStepTests extends TestCase { @@ -71,7 +71,7 @@ public class TaskletStepTests extends TestCase { public void testSuccessfulExecutionWithListener() throws Exception { TaskletStep step = new TaskletStep(new StubTasklet(false, false), new JobRepositorySupport()); - step.setListener(new RepeatListenerAdapter() { + step.setListener(new RepeatListenerSupport() { public void open(RepeatContext context) { list.add("open"); } diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java index 5f40b363c..10cdc719e 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java @@ -31,7 +31,7 @@ import org.springframework.batch.item.reader.ItemReaderAdapter; import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.item.writer.ItemWriterAdapter; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.interceptor.RepeatListenerAdapter; +import org.springframework.batch.repeat.interceptor.RepeatListenerSupport; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; @@ -76,7 +76,7 @@ public class RepeatOperationsStepTests extends TestCase { public void testSuccessfulRepeatOperationsHolder() throws Exception { RepeatTemplate repeatTemplate = new RepeatTemplate(); final List list = new ArrayList(); - repeatTemplate.setListener(new RepeatListenerAdapter() { + repeatTemplate.setListener(new RepeatListenerSupport() { public void onError(RepeatContext context, Throwable e) { list.add(e); } @@ -108,7 +108,7 @@ public class RepeatOperationsStepTests extends TestCase { public void testSuccessfulRepeatOperationsHolderWithStepOperations() throws Exception { RepeatTemplate chunkTemplate = new RepeatTemplate(); final List list = new ArrayList(); - chunkTemplate.setListener(new RepeatListenerAdapter() { + chunkTemplate.setListener(new RepeatListenerSupport() { public void before(RepeatContext context) { list.add(context); } @@ -116,7 +116,7 @@ public class RepeatOperationsStepTests extends TestCase { chunkTemplate.setCompletionPolicy(new SimpleCompletionPolicy(2)); RepeatTemplate stepTemplate = new RepeatTemplate(); final List steps = new ArrayList(); - stepTemplate.setListener(new RepeatListenerAdapter() { + stepTemplate.setListener(new RepeatListenerSupport() { public void before(RepeatContext context) { steps.add(context); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java index 3c45ba45c..2b3f7f739 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java @@ -142,7 +142,7 @@ public class FlatFileItemWriter extends AbstractTransactionalIoSource implements */ public void write(Object data) throws Exception { FieldSet fieldSet = fieldSetUnmapper.unmapItem(data); - getOutputState().write(lineAggregator.aggregate(fieldSet ) + LINE_SEPARATOR); + getOutputState().write(lineAggregator.aggregate(fieldSet) + LINE_SEPARATOR); } /** @@ -247,13 +247,6 @@ public class FlatFileItemWriter extends AbstractTransactionalIoSource implements long restartCount = 0; boolean shouldDeleteIfExists = true; - - /** - * - */ - public OutputState() { - initializeBufferedWriter(); - } /** * Return the byte offset position of the cursor in the output file as a diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemStreamItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemStreamItemWriter.java index 9ac1273fb..6696932e1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemStreamItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemStreamItemWriter.java @@ -17,13 +17,13 @@ package org.springframework.batch.item.writer; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.stream.ItemStreamAdapter; +import org.springframework.batch.item.stream.ItemStreamSupport; /** * Base class for {@link ItemWriter} implementations. * @author Dave Syer * */ -public abstract class AbstractItemStreamItemWriter extends ItemStreamAdapter implements ItemWriter { +public abstract class AbstractItemStreamItemWriter extends ItemStreamSupport implements ItemWriter { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java index d43153f6c..4c03c912b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java @@ -4,7 +4,7 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.exception.StreamException; -import org.springframework.batch.item.stream.ItemStreamAdapter; +import org.springframework.batch.item.stream.ItemStreamSupport; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -49,7 +49,7 @@ public class DelegatingItemWriter implements ItemWriter, ItemStream, Initializin if (writer instanceof ItemStream) { this.stream = (ItemStream) writer; } else { - this.stream = new ItemStreamAdapter(); + this.stream = new ItemStreamSupport(); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java index 1f9b7c402..2835630e0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java @@ -273,6 +273,9 @@ public class FlatFileItemWriterTests extends TestCase { public void testDefaultStreamContext() throws Exception { inputSource = new FlatFileItemWriter(); + inputSource.setResource(new FileSystemResource(outputFile)); + inputSource.setFieldSetUnmapper(new PassThroughFieldSetMapper()); + inputSource.afterPropertiesSet(); inputSource.open(); ExecutionContext streamContext = inputSource.getExecutionContext(); assertNotNull(streamContext);