From 497bd15a77b35f8bcece61263b89b29253eea646 Mon Sep 17 00:00:00 2001 From: dsyer Date: Mon, 5 Nov 2007 09:28:18 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-179: Separate input and output in samples 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) --- .../io/file/support/FlatFileOutputSource.java | 4 ++++ ...stStream.ParallelCustomerReportStep.TEMP.txt | 5 ----- samples/20070122.testStream.multilineStep.txt | 2 -- samples/20070122.testStream.xmlFileStep.xml | 1 - ...70122.teststream.multilineOrderStep.TEMP.txt | 17 ----------------- .../20070918.testStream.xmlFileStep.output.xml | 1 - .../jobs/compositeProcessorSampleJob.xml | 2 +- .../src/main/resources/jobs/multilineJob.xml | 2 +- .../main/resources/jobs/multilineOrderJob.xml | 2 +- .../main/resources/jobs/simpleTaskletJob.xml | 2 +- samples/src/main/resources/jobs/tradeJob.xml | 2 +- samples/src/main/resources/jobs/xmlStaxJob.xml | 2 +- ...CompositeProcessorSampleFunctionalTests.java | 2 +- .../sample/MultilineJobFunctionalTests.java | 2 +- .../MultilineOrderJobFunctionalTests.java | 2 +- .../batch/sample/XmlStaxJobFunctionalTests.java | 2 +- 16 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 samples/20070122.testStream.ParallelCustomerReportStep.TEMP.txt delete mode 100644 samples/20070122.testStream.multilineStep.txt delete mode 100644 samples/20070122.testStream.xmlFileStep.xml delete mode 100644 samples/20070122.teststream.multilineOrderStep.TEMP.txt delete mode 100644 samples/20070918.testStream.xmlFileStep.output.xml diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileOutputSource.java b/infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileOutputSource.java index c41d675dd..08c1b2dd5 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileOutputSource.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileOutputSource.java @@ -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(); } diff --git a/samples/20070122.testStream.ParallelCustomerReportStep.TEMP.txt b/samples/20070122.testStream.ParallelCustomerReportStep.TEMP.txt deleted file mode 100644 index e1c0cdf5a..000000000 --- a/samples/20070122.testStream.ParallelCustomerReportStep.TEMP.txt +++ /dev/null @@ -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] diff --git a/samples/20070122.testStream.multilineStep.txt b/samples/20070122.testStream.multilineStep.txt deleted file mode 100644 index 72a5c17e7..000000000 --- a/samples/20070122.testStream.multilineStep.txt +++ /dev/null @@ -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]] diff --git a/samples/20070122.testStream.xmlFileStep.xml b/samples/20070122.testStream.xmlFileStep.xml deleted file mode 100644 index e698f4395..000000000 --- a/samples/20070122.testStream.xmlFileStep.xml +++ /dev/null @@ -1 +0,0 @@ -Gladys Kravitz
Anytown, PA
34002003-01-07 08:16:00.0 CSTBurnham's Celestial Handbook, Vol 15.021.792Burnham's Celestial Handbook, Vol 25.019.892John Smith
Chicago, IL
46002003-01-07 08:16:02.0 CSTXmlBeans in Action3.041.291JSR-1731.011.995Teach Yourself XML in 21 days1.035.491Peter Newman
Cleveland, OH
23002003-01-07 08:16:35.0 CSTJava 62.012.793 \ No newline at end of file diff --git a/samples/20070122.teststream.multilineOrderStep.TEMP.txt b/samples/20070122.teststream.multilineOrderStep.TEMP.txt deleted file mode 100644 index b70ccda2a..000000000 --- a/samples/20070122.teststream.multilineOrderStep.TEMP.txt +++ /dev/null @@ -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 diff --git a/samples/20070918.testStream.xmlFileStep.output.xml b/samples/20070918.testStream.xmlFileStep.output.xml deleted file mode 100644 index 50a39a9c9..000000000 --- a/samples/20070918.testStream.xmlFileStep.output.xml +++ /dev/null @@ -1 +0,0 @@ -XYZ0001511.39Customer1XYZ0002272.99Customer2cXYZ0003999.99Customer3XYZ0001511.39Customer1XYZ0002272.99Customer2cXYZ0003999.99Customer3XYZ0001511.39Customer1XYZ0002272.99Customer2cXYZ0003999.99Customer3 \ No newline at end of file diff --git a/samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/samples/src/main/resources/jobs/compositeProcessorSampleJob.xml index 5bd75978d..3be252acf 100644 --- a/samples/src/main/resources/jobs/compositeProcessorSampleJob.xml +++ b/samples/src/main/resources/jobs/compositeProcessorSampleJob.xml @@ -89,7 +89,7 @@ - + diff --git a/samples/src/main/resources/jobs/multilineJob.xml b/samples/src/main/resources/jobs/multilineJob.xml index bd729151b..c474b4841 100644 --- a/samples/src/main/resources/jobs/multilineJob.xml +++ b/samples/src/main/resources/jobs/multilineJob.xml @@ -35,7 +35,7 @@ scope="step"> + value="file:target/test-outputs/20070122.testStream.multilineStep.txt" /> diff --git a/samples/src/main/resources/jobs/multilineOrderJob.xml b/samples/src/main/resources/jobs/multilineOrderJob.xml index c5f39c412..9f5fe3405 100644 --- a/samples/src/main/resources/jobs/multilineOrderJob.xml +++ b/samples/src/main/resources/jobs/multilineOrderJob.xml @@ -145,7 +145,7 @@ - + diff --git a/samples/src/main/resources/jobs/simpleTaskletJob.xml b/samples/src/main/resources/jobs/simpleTaskletJob.xml index 0adb267f9..67731eece 100644 --- a/samples/src/main/resources/jobs/simpleTaskletJob.xml +++ b/samples/src/main/resources/jobs/simpleTaskletJob.xml @@ -59,7 +59,7 @@ + value="data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt" /> + value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" /> diff --git a/samples/src/main/resources/jobs/xmlStaxJob.xml b/samples/src/main/resources/jobs/xmlStaxJob.xml index eae25c183..d4c2f95fd 100644 --- a/samples/src/main/resources/jobs/xmlStaxJob.xml +++ b/samples/src/main/resources/jobs/xmlStaxJob.xml @@ -51,7 +51,7 @@ - + diff --git a/samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java b/samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java index 0580c8ec3..5a7811426 100644 --- a/samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java +++ b/samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java @@ -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();) { diff --git a/samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java b/samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java index 93262f607..f8ef7abce 100644 --- a/samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java +++ b/samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java @@ -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() { diff --git a/samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java b/samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java index a3151a624..fb75c5248 100644 --- a/samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java +++ b/samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java @@ -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() { diff --git a/samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java b/samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java index 24bdc95bd..3be3150b3 100644 --- a/samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java +++ b/samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java @@ -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