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

IN PROGRESS - issue BATCH-212: Merge InputSource with ItemProvider

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/BATCH-212

Rename class and method names (Provider -> Reader)
This commit is contained in:
dsyer
2007-12-17 14:12:24 +00:00
parent 67a7a2de5b
commit fe54a6f38d
26 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java
View File

@@ -168,7 +168,7 @@ public class ItemOrientedTasklet implements Tasklet, Skippable,
/**
* @param itemProvider
*/
public void setItemProvider(ItemReader itemProvider) {
public void setItemReader(ItemReader itemProvider) {
this.itemProvider = itemProvider;
}

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
View File

@@ -104,7 +104,7 @@ public class SimpleJobTests extends TestCase {
return true;
}
});
module.setItemProvider(provider);
module.setItemReader(provider);
module.setItemProcessor(processor);
module.afterPropertiesSet();
return module;

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

@@ -66,7 +66,7 @@ public class DefaultStepExecutorTests extends TestCase {
private RepeatTemplate template;
private ItemReader getProvider(String[] args) {
private ItemReader getReader(String[] args) {
return new ListItemReader(Arrays.asList(args));
}
@@ -78,7 +78,7 @@ public class DefaultStepExecutorTests extends TestCase {
private Tasklet getTasklet(String[] strings) throws Exception {
ItemOrientedTasklet module = new ItemOrientedTasklet();
module.setItemProcessor(processor);
module.setItemProvider(getProvider(strings));
module.setItemReader(getReader(strings));
module.afterPropertiesSet();
return module;
}

18
spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java
View File

@@ -73,7 +73,7 @@ public class ItemOrientedTaskletTests extends TestCase {
module = new ItemOrientedTasklet();
// set up module
module.setItemProvider(itemProvider);
module.setItemReader(itemProvider);
module.setItemProcessor(itemProcessor);
module.afterPropertiesSet();
@@ -145,14 +145,14 @@ public class ItemOrientedTaskletTests extends TestCase {
}
public void testSkippableReader() throws Exception {
module.setItemProvider(new SkippableItemReader());
module.setItemReader(new SkippableItemReader());
module.setItemRecoverer(null);
module.skip();
assertEquals(1, list.size());
}
public void testSkippablReaderProcessor() throws Exception {
module.setItemProvider(new SkippableItemReader());
module.setItemReader(new SkippableItemReader());
module.setItemProcessor(new SkippableItemProcessor());
module.setItemRecoverer(null);
module.skip();
@@ -160,7 +160,7 @@ public class ItemOrientedTaskletTests extends TestCase {
}
public void testStatisticsProvider() throws Exception {
module.setItemProvider(new SkippableItemReader());
module.setItemReader(new SkippableItemReader());
Properties stats = module.getStatistics();
assertEquals(1, stats.size());
assertEquals("bar", stats.getProperty("foo"));
@@ -174,7 +174,7 @@ public class ItemOrientedTaskletTests extends TestCase {
}
public void testStatisticsProviderProcessor() throws Exception {
module.setItemProvider(new SkippableItemReader());
module.setItemReader(new SkippableItemReader());
module.setItemProcessor(new SkippableItemProcessor());
Properties stats = module.getStatistics();
assertEquals(2, stats.size());
@@ -184,7 +184,7 @@ public class ItemOrientedTaskletTests extends TestCase {
public void testStatisticsProviderProcessorMergeDuplicates()
throws Exception {
module.setItemProvider(new SkippableItemReader());
module.setItemReader(new SkippableItemReader());
module.setItemProcessor(new SkippableItemProcessor(
"foo=bar\nspam=bucket"));
Properties stats = module.getStatistics();
@@ -207,7 +207,7 @@ public class ItemOrientedTaskletTests extends TestCase {
}
});
module.setItemProvider(new AbstractItemReader() {
module.setItemReader(new AbstractItemReader() {
public Object read() throws Exception {
return "bar";
}
@@ -245,7 +245,7 @@ public class ItemOrientedTaskletTests extends TestCase {
return true;
}
});
module.setItemProvider(new AbstractItemReader() {
module.setItemReader(new AbstractItemReader() {
public Object read() throws Exception {
return "foo";
}
@@ -278,7 +278,7 @@ public class ItemOrientedTaskletTests extends TestCase {
}
public void testInitialisationWithNullProvider() throws Exception {
module.setItemProvider(null);
module.setItemReader(null);
try {
module.afterPropertiesSet();
} catch (IllegalArgumentException e) {

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java
View File

@@ -102,7 +102,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase {
// create and set up module
module = new RestartableItemOrientedTasklet();
module.setItemProvider(itemProvider);
module.setItemReader(itemProvider);
module.setItemProcessor(itemProcessor);
// get restart data
@@ -120,7 +120,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase {
// create and set up module
module = new RestartableItemOrientedTasklet();
module.setItemProvider(itemProvider);
module.setItemReader(itemProvider);
module.setItemProcessor(itemProcessor);
// get restart data
@@ -135,7 +135,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase {
// create and set up module
module = new RestartableItemOrientedTasklet();
module.setItemProvider(null);
module.setItemReader(null);
module.setItemProcessor(null);
// get restart data

2
spring-batch-execution/src/test/resources/job-configuration.xml
View File

@@ -17,7 +17,7 @@
<constructor-arg>
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ListItemReader">
<constructor-arg value="foo,bar,spam"/>

2
spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
View File

@@ -19,7 +19,7 @@
<constructor-arg>
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ListItemReader">
<constructor-arg value="foo,bar,spam"/>