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

OPEN - issue BATCH-349: ItemStreamAdapter isn't an Adapter

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

Adapter -> Support (unless it was an Adapter)
This commit is contained in:
dsyer
2008-02-25 16:10:53 +00:00
parent 66581d700e
commit ad6511fb94
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java
View File

@@ -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());

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
View File

@@ -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;

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java
View File

@@ -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");
}

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java
View File

@@ -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);
}

9
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
View File

@@ -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

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemStreamItemWriter.java
View File

@@ -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 {
}

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java
View File

@@ -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();
}
}

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java
View File

@@ -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);