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

IN PROGRESS - issue BATCH-179: Separate input and output in samples

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

Applied patch from JIRA and fixed remaining issue in output source (need to create missing directory)
This commit is contained in:
dsyer
2007-11-05 09:28:18 +00:00
parent 9dc7981c5d
commit 497bd15a77
16 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileOutputSource.java
View File

@@ -456,6 +456,10 @@ public class FlatFileOutputSource extends AbstractTransactionalIoSource implemen
throw new BatchEnvironmentException("Resource already exists: " + resource);
}
}
String parent = file.getParent();
if (parent!=null) {
new File(parent).mkdirs();
}
file.createNewFile();
}

5
samples/20070122.testStream.ParallelCustomerReportStep.TEMP.txt
View File

@@ -1,5 +0,0 @@
Trade: [isin=UK21341EAH41,quantity=211,price=31.11,customer=customer1]
Trade: [isin=UK21341EAH42,quantity=212,price=32.11,customer=customer2]
Trade: [isin=UK21341EAH43,quantity=213,price=33.11,customer=customer3]
Trade: [isin=UK21341EAH44,quantity=214,price=34.11,customer=customer4]
Trade: [isin=UK21341EAH45,quantity=215,price=35.11,customer=customer5]

2
samples/20070122.testStream.multilineStep.txt
View File

@@ -1,2 +0,0 @@
[Trade: [isin=UK21341EAH45,quantity=978,price=98.34,customer=customer1], Trade: [isin=UK21341EAH46,quantity=112,price=18.12,customer=customer2]]
[Trade: [isin=UK21341EAH47,quantity=245,price=12.78,customer=customer2], Trade: [isin=UK21341EAH48,quantity=108,price=9.25,customer=customer3], Trade: [isin=UK21341EAH49,quantity=854,price=23.39,customer=customer4]]

1
samples/20070122.testStream.xmlFileStep.xml
View File

@@ -1 +0,0 @@
<?xml version='1.0' encoding='utf-8'?><purchaseOrders xsi:schemaLocation="http://adsj.accenture.com/purchaseorders purchaseorders.xsd" xmlns="http://adsj.accenture.com/purchaseorders" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><order><customer><name>Gladys Kravitz</name><address>Anytown, PA</address><age>34</age><moo>0</moo><poo>0</poo></customer><date>2003-01-07 08:16:00.0 CST</date><lineItems><lineItem><description>Burnham's Celestial Handbook, Vol 1</description><perUnitOunces>5.0</perUnitOunces><price>21.79</price><quantity>2</quantity></lineItem><lineItem><description>Burnham's Celestial Handbook, Vol 2</description><perUnitOunces>5.0</perUnitOunces><price>19.89</price><quantity>2</quantity></lineItem></lineItems></order><order><customer><name>John Smith</name><address>Chicago, IL</address><age>46</age><moo>0</moo><poo>0</poo></customer><date>2003-01-07 08:16:02.0 CST</date><lineItems><lineItem><description>XmlBeans in Action</description><perUnitOunces>3.0</perUnitOunces><price>41.29</price><quantity>1</quantity></lineItem><lineItem><description>JSR-173</description><perUnitOunces>1.0</perUnitOunces><price>11.99</price><quantity>5</quantity></lineItem><lineItem><description>Teach Yourself XML in 21 days</description><perUnitOunces>1.0</perUnitOunces><price>35.49</price><quantity>1</quantity></lineItem></lineItems></order><order><customer><name>Peter Newman</name><address>Cleveland, OH</address><age>23</age><moo>0</moo><poo>0</poo></customer><date>2003-01-07 08:16:35.0 CST</date><lineItems><lineItem><description>Java 6</description><perUnitOunces>2.0</perUnitOunces><price>12.79</price><quantity>3</quantity></lineItem></lineItems></order></purchaseOrders>

17
samples/20070122.teststream.multilineOrderStep.TEMP.txt
View File

@@ -1,17 +0,0 @@
BEGIN_ORDER:13100345 2007/02/15
CUSTOMER:20014539 Peter Smith
ADDRESS:Oak Street 31/A Small Town00235
BILLING:VISA VISA-12345678903
ITEM:104439104137.49
ITEM:2134776319221.99
END_ORDER:267.34
BEGIN_ORDER:13100346 2007/02/15
CUSTOMER:72155919
ADDRESS:St. Andrews Road 31 London 55342
BILLING:AMEX AMEX-72345678903
ITEM:10443191011070.50
ITEM:213472721921.79
ITEM:104433930179.95
ITEM:213474731955.29
ITEM:1044359501339.99
END_ORDER:14043.74

1
samples/20070918.testStream.xmlFileStep.output.xml
View File

@@ -1 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?><trades><trade><isin>XYZ0001</isin><quantity>5</quantity><price>11.39</price><customer>Customer1</customer></trade><trade><isin>XYZ0002</isin><quantity>2</quantity><price>72.99</price><customer>Customer2c</customer></trade><trade><isin>XYZ0003</isin><quantity>9</quantity><price>99.99</price><customer>Customer3</customer></trade><trade><isin>XYZ0001</isin><quantity>5</quantity><price>11.39</price><customer>Customer1</customer></trade><trade><isin>XYZ0002</isin><quantity>2</quantity><price>72.99</price><customer>Customer2c</customer></trade><trade><isin>XYZ0003</isin><quantity>9</quantity><price>99.99</price><customer>Customer3</customer></trade><trade><isin>XYZ0001</isin><quantity>5</quantity><price>11.39</price><customer>Customer1</customer></trade><trade><isin>XYZ0002</isin><quantity>2</quantity><price>72.99</price><customer>Customer2c</customer></trade><trade><isin>XYZ0003</isin><quantity>9</quantity><price>99.99</price><customer>Customer3</customer></trade></trades>

2
samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
View File

@@ -89,7 +89,7 @@
</bean>
<bean id="customerFileLocator" class="org.springframework.core.io.FileSystemResource">
<constructor-arg type="java.lang.String" value="20070122.testStream.ParallelCustomerReportStep.TEMP.txt" />
<constructor-arg type="java.lang.String" value="target/test-outputs/20070122.testStream.ParallelCustomerReportStep.TEMP.txt" />
</bean>
<bean id="fileLocator" class="org.springframework.core.io.ClassPathResource">

2
samples/src/main/resources/jobs/multilineJob.xml
View File

@@ -35,7 +35,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource"
value="file:20070122.testStream.multilineStep.txt" />
value="file:target/test-outputs/20070122.testStream.multilineStep.txt" />
</bean>
</property>
</bean>

2
samples/src/main/resources/jobs/multilineOrderJob.xml
View File

@@ -145,7 +145,7 @@
</bean>
<bean id="fileOutputLocator" class="org.springframework.core.io.FileSystemResource">
<constructor-arg type="java.lang.String" value="20070122.teststream.multilineOrderStep.TEMP.txt" />
<constructor-arg type="java.lang.String" value="target/test-outputs/20070122.teststream.multilineOrderStep.TEMP.txt" />
</bean>
<bean parent="customEditorConfigurer"/>

2
samples/src/main/resources/jobs/simpleTaskletJob.xml
View File

@@ -59,7 +59,7 @@
<bean id="fileLocator"
class="org.springframework.core.io.ClassPathResource">
<constructor-arg type="java.lang.String"
value="/data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt" />
value="data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt" />
</bean>
<bean id="tradeTokenizer"

2
samples/src/main/resources/jobs/tradeJob.xml
View File

@@ -117,7 +117,7 @@
<bean id="customerFileLocator"
class="org.springframework.core.io.FileSystemResource">
<constructor-arg type="java.lang.String"
value="20070122.testStream.CustomerReportStep.TEMP.txt" />
value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
</bean>
<!-- register the step scope with the application context -->

2
samples/src/main/resources/jobs/xmlStaxJob.xml
View File

@@ -51,7 +51,7 @@
</bean>
<bean class="org.springframework.batch.io.file.support.StaxEventWriterOutputSource" id="tradeStaxWriter">
<property name="resource" value="file:20070918.testStream.xmlFileStep.output.xml" />
<property name="resource" value="file:target/test-outputs/20070918.testStream.xmlFileStep.output.xml" />
<property name="serializer" ref="tradeMarshallingSerializer" />
<property name="rootTagName" value="trades" />
<property name="overwriteOutput" value="true" />

2
samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java
View File

@@ -79,7 +79,7 @@ public class CompositeProcessorSampleFunctionalTests extends AbstractValidatingB
private void checkOutputFile() throws FileNotFoundException, IOException {
List outputLines = IOUtils.readLines(
new FileInputStream("20070122.testStream.ParallelCustomerReportStep.TEMP.txt"));
new FileInputStream("target/test-outputs/20070122.testStream.ParallelCustomerReportStep.TEMP.txt"));
String output = "";
for (Iterator iterator = outputLines.listIterator(); iterator.hasNext();) {

2
samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java
View File

@@ -27,7 +27,7 @@ public class MultilineJobFunctionalTests extends AbstractValidatingBatchLauncher
"[Trade: [isin=UK21341EAH45,quantity=978,price=98.34,customer=customer1], Trade: [isin=UK21341EAH46,quantity=112,price=18.12,customer=customer2]]" +
"[Trade: [isin=UK21341EAH47,quantity=245,price=12.78,customer=customer2], Trade: [isin=UK21341EAH48,quantity=108,price=9.25,customer=customer3], Trade: [isin=UK21341EAH49,quantity=854,price=23.39,customer=customer4]]";
private Resource output = new FileSystemResource("20070122.testStream.multilineStep.txt");
private Resource output = new FileSystemResource("target/test-outputs/20070122.testStream.multilineStep.txt");
// @Override
protected String[] getConfigLocations() {

2
samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java
View File

@@ -46,7 +46,7 @@ public class MultilineOrderJobFunctionalTests extends AbstractValidatingBatchLau
"END_ORDER:14043.74 ";
private Resource fileOutputLocator = new FileSystemResource("20070122.teststream.multilineOrderStep.TEMP.txt");
private Resource fileOutputLocator = new FileSystemResource("target/test-outputs/20070122.teststream.multilineOrderStep.TEMP.txt");
// @Override
protected String[] getConfigLocations() {

2
samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java
View File

@@ -24,7 +24,7 @@ import org.custommonkey.xmlunit.XMLUnit;
public class XmlStaxJobFunctionalTests extends AbstractValidatingBatchLauncherTests {
private static final String OUTPUT_FILE = "20070918.testStream.xmlFileStep.output.xml";
private static final String OUTPUT_FILE = "target/test-outputs/20070918.testStream.xmlFileStep.output.xml";
private static final String EXPECTED_OUTPUT_FILE = "src/main/resources/data/staxJob/output/expected-output.xml";
// @Override