Fix resource handling in integration tests

Author: fmbenhassine

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java

@@ -34,7 +34,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.io.Resource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.WritableResource;
 import org.springframework.jdbc.support.JdbcTransactionManager;
 
@@ -45,7 +45,7 @@ public class MultiLineJobConfiguration {
 
 	@Bean
 	@StepScope
-	public MultiLineTradeItemReader itemReader(@Value("#{jobParameters[inputFile]}") Resource resource) {
+	public MultiLineTradeItemReader itemReader(@Value("#{jobParameters[inputFile]}") FileSystemResource resource) {
 		FlatFileItemReader<FieldSet> delegate = new FlatFileItemReaderBuilder<FieldSet>().name("delegateItemReader")
 			.resource(resource)
 			.lineTokenizer(new DelimitedLineTokenizer())

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeJobConfiguration.java

@@ -41,7 +41,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.io.Resource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.WritableResource;
 import org.springframework.jdbc.support.JdbcTransactionManager;
 
@@ -56,7 +56,7 @@ public class MultiRecordTypeJobConfiguration {
 	@Bean
 	@StepScope
 	public FlatFileItemReader itemReader(PatternMatchingCompositeLineMapper lineMapper,
-			@Value("#{jobParameters[inputFile]}") Resource resource) {
+			@Value("#{jobParameters[inputFile]}") FileSystemResource resource) {
 		return new FlatFileItemReaderBuilder().name("itemReader").resource(resource).lineMapper(lineMapper).build();
 	}
 

spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multiline/job/multiLine.xml

@@ -14,10 +14,14 @@
 		</batch:step>
 	</batch:job>
 
+    <bean id="inputResource" class="org.springframework.core.io.FileSystemResource" scope="step">
+        <constructor-arg type="java.lang.String" value="#{jobParameters[inputFile]}" />
+    </bean>
+
 	<bean id="itemReader" class="org.springframework.batch.samples.file.multiline.MultiLineTradeItemReader" scope="step">
 		<property name="delegate">
 			<bean class="org.springframework.batch.item.file.FlatFileItemReader">
-				<property name="resource" value="#{jobParameters[inputFile]}" />
+				<property name="resource" ref="inputResource" />
 				<property name="lineMapper">
 					<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
 						<property name="lineTokenizer">

spring-batch-samples/src/main/resources/org/springframework/batch/samples/file/multirecordtype/job/multiRecordType.xml

@@ -14,8 +14,12 @@
 		</batch:step>
 	</batch:job>
 
-	<bean id="itemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
-		<property name="resource" value="#{jobParameters[inputFile]}" />
+    <bean id="inputResource" class="org.springframework.core.io.FileSystemResource" scope="step">
+        <constructor-arg type="java.lang.String" value="#{jobParameters[inputFile]}" />
+    </bean>
+
+	<bean id="itemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
+		<property name="resource" ref="inputResource" />
 		<property name="lineMapper" ref="prefixMatchingLineMapper"/>
 	</bean>
 

spring-batch-samples/src/main/resources/org/springframework/batch/samples/headerfooter/job/headerFooterSample.xml

@@ -55,9 +55,9 @@
 	<bean id="footerCallback" class="org.springframework.batch.samples.support.SummaryFooterCallback" />
 	<bean id="headerCopier"
 		class="org.springframework.batch.samples.support.HeaderCopyCallback" />
-	<bean id="inputResource" class="org.springframework.core.io.ClassPathResource">
+	<bean id="inputResource" class="org.springframework.core.io.FileSystemResource">
 		<constructor-arg type="java.lang.String"
-			value="org/springframework/batch/samples/headerfooter/data/input.txt" />
+			value="src/main/resources/org/springframework/batch/samples/headerfooter/data/input.txt" />
 	</bean>
 	<bean id="outputResource" class="org.springframework.core.io.FileSystemResource">
 		<constructor-arg type="java.lang.String"

spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multiline/MultiLineFunctionalTests.java

@@ -32,7 +32,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -48,7 +47,7 @@
 		"/simple-job-launcher-context.xml" })
 class MultiLineFunctionalTests {
 
-	private static final String INPUT_FILE = "org/springframework/batch/samples/file/multiline/data/multiLine.txt";
+	private static final String INPUT_FILE = "src/main/resources/org/springframework/batch/samples/file/multiline/data/multiLine.txt";
 
 	private static final String OUTPUT_FILE = "target/test-outputs/multiLineOutput.txt";
 
@@ -66,7 +65,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
-		Path inputFile = new ClassPathResource(INPUT_FILE).getFile().toPath();
+		Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
 		Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
 		Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
 	}
@@ -86,7 +85,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
-		Path inputFile = new ClassPathResource(INPUT_FILE).getFile().toPath();
+		Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
 		Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
 		Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
 	}

spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeFunctionalTests.java

@@ -32,7 +32,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -50,7 +49,7 @@ class MultiRecordTypeFunctionalTests {
 
 	private static final String OUTPUT_FILE = "target/test-outputs/multiRecordTypeOutput.txt";
 
-	private static final String INPUT_FILE = "org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt";
+	private static final String INPUT_FILE = "src/main/resources/org/springframework/batch/samples/file/multirecordtype/data/multiRecordType.txt";
 
 	@Autowired
 	private JobOperatorTestUtils jobOperatorTestUtils;
@@ -67,7 +66,7 @@ void testLaunchJobWithXmlConfig() throws Exception {
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
-		Path inputFile = new ClassPathResource(INPUT_FILE).getFile().toPath();
+		Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
 		Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
 		Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
 	}
@@ -87,7 +86,7 @@ public void testLaunchJobWithJavaConfig() throws Exception {
 
 		// then
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
-		Path inputFile = new ClassPathResource(INPUT_FILE).getFile().toPath();
+		Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
 		Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
 		Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
 	}

spring-batch-samples/src/test/java/org/springframework/batch/samples/file/patternmatching/PatternMatchingJobFunctionalTests.java

@@ -23,7 +23,6 @@
 
 import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -35,15 +34,15 @@ class PatternMatchingJobFunctionalTests {
 
 	private static final String ACTUAL = "target/test-outputs/multilineOrderOutput.txt";
 
-	private static final String EXPECTED = "org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt";
+	private static final String EXPECTED = "src/main/resources/org/springframework/batch/samples/file/patternmatching/data/multilineOrderOutput.txt";
 
 	@Autowired
 	private JobOperatorTestUtils jobOperatorTestUtils;
 
 	@Test
 	void testJobLaunch() throws Exception {
 		this.jobOperatorTestUtils.startJob();
-		Path expectedFile = new ClassPathResource(EXPECTED).getFile().toPath();
+		Path expectedFile = new FileSystemResource(EXPECTED).getFile().toPath();
 		Path actualFile = new FileSystemResource(ACTUAL).getFile().toPath();
 		assertLinesMatch(Files.lines(expectedFile), Files.lines(actualFile));
 	}