Updated to do some polishing after rebase and merge

Author: cppwfs

.vscode/launch.json

@@ -162,11 +162,6 @@
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit-jupiter.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

.vscode/settings.json

@@ -44,7 +44,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/amqp-example-job.xml", "/job-runner-context.xml" })
-public class AMQPJobFunctionalTests {
+class AMQPJobFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;

spring-batch-sample-apps/tasklet-sample-app/.vscode/launch.json

@@ -42,7 +42,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml",
 		"/job-runner-context.xml" })
-public class CompositeItemWriterSampleFunctionalTests {
+class CompositeItemWriterSampleFunctionalTests {
 
 	private static final String GET_TRADES = "SELECT isin, quantity, price, customer FROM TRADE order by isin";
 

spring-batch-sample-apps/tasklet-sample-app/.vscode/settings.json

@@ -43,7 +43,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/customerFilterJob.xml", "/job-runner-context.xml" })
-public class CustomerFilterJobFunctionalTests {
+class CustomerFilterJobFunctionalTests {
 
 	private static final String GET_CUSTOMERS = "select NAME, CREDIT from CUSTOMER order by NAME";
 
@@ -64,8 +64,7 @@ public void setDataSource(DataSource dataSource) {
 	}
 
 	@BeforeEach
-
-	public void onSetUp() throws Exception {
+	void onSetUp() {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 		JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
 		jdbcTemplate.update("update CUSTOMER set credit=100000");
@@ -78,7 +77,7 @@ public void onSetUp() throws Exception {
 	}
 
 	@AfterEach
-	public void tearDown() throws Exception {
+	void tearDown() {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 		JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
 	}

spring-batch-samples/pom.xml

@@ -16,33 +16,20 @@
 
 package org.springframework.batch.sample;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.Test;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.springframework.test.util.AssertionErrors.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Functional test for graceful shutdown. A batch container is started in a new thread,
@@ -57,7 +44,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" })
-public class DatabaseShutdownFunctionalTests {
+class DatabaseShutdownFunctionalTests {
 
 	/** Logger */
 	protected final Log logger = LogFactory.getLog(getClass());

spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java

@@ -31,7 +31,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/delegatingJob.xml", "/job-runner-context.xml" })
-public class DelegatingJobFunctionalTests {
+class DelegatingJobFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;

spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java

@@ -32,7 +32,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/footballJob.xml", "/job-runner-context.xml" })
-public class FootballJobFunctionalTests {
+class FootballJobFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;

spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java

@@ -41,7 +41,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" })
-public class GracefulShutdownFunctionalTests {
+class GracefulShutdownFunctionalTests {
 
 	/** Logger */
 	private final Log logger = LogFactory.getLog(getClass());

spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java

@@ -42,7 +42,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
@@ -88,7 +87,7 @@ void testUpdateCredit(@Autowired Job job) throws Exception {
 
 		assertEquals(inputs.size(), outputs.size());
 		int itemCount = inputs.size();
-		assertTrue("No entries were available in the input", itemCount > 0);
+		assertTrue(itemCount > 0, "No entries were available in the input");
 
 		inputs.iterator();
 		for (int i = 0; i < itemCount; i++) {

spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java

@@ -42,7 +42,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
@@ -88,7 +87,7 @@ void testUpdateCredit(@Autowired Job job) throws Exception {
 
 		assertEquals(inputs.size(), outputs.size());
 		int itemCount = inputs.size();
-		assertTrue("Input from reader has no entries.", itemCount > 0);
+		assertTrue(itemCount > 0, "Input from reader has no entries.");
 
 		inputs.iterator();
 		for (int i = 0; i < itemCount; i++) {

spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java

@@ -47,7 +47,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/restartSample.xml", "/job-runner-context.xml" })
-public class RestartFunctionalTests {
+class RestartFunctionalTests {
 
 	private JdbcTemplate jdbcTemplate;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java

@@ -41,7 +41,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		classes = { DataSourceConfiguration.class, RetrySampleConfiguration.class, JobRunnerConfiguration.class })
-public class RetrySampleConfigurationTests {
+class RetrySampleConfigurationTests {
 
 	@Autowired
 	private GeneratingTradeItemReader itemGenerator;

spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java

@@ -44,7 +44,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/tradeJob.xml", "/job-runner-context.xml" })
-public class TradeJobFunctionalTests {
+class TradeJobFunctionalTests {
 
 	private static final String GET_TRADES = "select ISIN, QUANTITY, PRICE, CUSTOMER, ID, VERSION from TRADE order by ISIN";
 
@@ -69,7 +69,7 @@ public void setDataSource(DataSource dataSource) {
 	}
 
 	@BeforeEach
-	public void onSetUp() throws Exception {
+	void onSetUp() {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 		List<Map<String, Object>> list = jdbcTemplate.queryForList("select NAME, CREDIT from CUSTOMER");
 
@@ -79,7 +79,7 @@ public void onSetUp() throws Exception {
 	}
 
 	@AfterEach
-	public void tearDown() throws Exception {
+	void tearDown() {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 	}
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java

@@ -42,13 +42,8 @@ class CustomItemReaderTests {
 
 	private ItemReader<String> itemReader;
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see junit.framework.TestCase#setUp()
-	 */
 	@BeforeEach
-	public void setUp() throws Exception {
+	void setUp() {
 		List<String> items = new ArrayList<>();
 		items.add("1");
 		items.add("2");

spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java

@@ -28,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class ExceptionThrowingItemReaderProxyTests {
+class ExceptionThrowingItemReaderProxyTests {
 
 	// expected call count before exception is thrown (exception should be thrown in next
 	// iteration)

spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleConfigurationTests.java

@@ -24,33 +24,33 @@
 
 public class OutputFileListenerTests {
 
-	private OutputFileListener listener = new OutputFileListener();
+	private final OutputFileListener listener = new OutputFileListener();
 
-	private StepExecution stepExecution = new StepExecution("foo", new JobExecution(0L), 1L);
+	private final StepExecution stepExecution = new StepExecution("foo", new JobExecution(0L), 1L);
 
 	@Test
-	public void testCreateOutputNameFromInput() {
+	void testCreateOutputNameFromInput() {
 		listener.createOutputNameFromInput(stepExecution);
 		assertEquals("{outputFile=file:./target/output/foo.csv}", stepExecution.getExecutionContext().toString());
 	}
 
 	@Test
-	public void testSetPath() {
+	void testSetPath() {
 		listener.setPath("spam/");
 		listener.createOutputNameFromInput(stepExecution);
 		assertEquals("{outputFile=spam/foo.csv}", stepExecution.getExecutionContext().toString());
 	}
 
 	@Test
-	public void testSetOutputKeyName() {
+	void testSetOutputKeyName() {
 		listener.setPath("");
 		listener.setOutputKeyName("spam");
 		listener.createOutputNameFromInput(stepExecution);
 		assertEquals("{spam=foo.csv}", stepExecution.getExecutionContext().toString());
 	}
 
 	@Test
-	public void testSetInputKeyName() {
+	void testSetInputKeyName() {
 		listener.setPath("");
 		listener.setInputKeyName("spam");
 		stepExecution.getExecutionContext().putString("spam", "bar");