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

@@ -41,7 +41,7 @@ public class GroovyJobFunctionalTests {
 	private JobLauncherTestUtils jobLauncherTestUtils;
 
 	@BeforeEach
-	public void removeOldData() throws IOException {
+	void removeOldData() throws IOException {
 		FileUtils.deleteDirectory(new File("target/groovyJob"));
 	}
 

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

@@ -34,7 +34,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/headerFooterSample.xml", "/job-runner-context.xml" })
-public class HeaderFooterSampleFunctionalTests {
+class HeaderFooterSampleFunctionalTests {
 
 	@Autowired
 	@Qualifier("inputResource")

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

@@ -39,7 +39,7 @@
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml" })
-public class JobOperatorFunctionalTests {
+class JobOperatorFunctionalTests {
 
 	private static final Log LOG = LogFactory.getLog(JobOperatorFunctionalTests.class);
 
@@ -53,7 +53,7 @@ public class JobOperatorFunctionalTests {
 	private JobRegistry jobRegistry;
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	void setUp() throws Exception {
 		if (!jobRegistry.getJobNames().contains(job.getName())) {
 			jobRegistry.register(new ReferenceJobFactory(job));
 		}
@@ -113,7 +113,7 @@ private void stopAndCheckStatus(long executionId) throws Exception {
 		// there is just a single step in the test job
 		Map<Long, String> summaries = operator.getStepExecutionSummaries(executionId);
 		LOG.info(summaries);
-		Assertions.assertTrue(summaries.values().toString().contains(BatchStatus.STOPPED.toString()));
+		assertTrue(summaries.values().toString().contains(BatchStatus.STOPPED.toString()));
 	}
 
 	@Test
@@ -122,7 +122,7 @@ void testMultipleSimultaneousInstances() throws Exception {
 
 		Set<String> names = operator.getJobNames();
 		assertEquals(1, names.size());
-		Assertions.assertTrue(names.contains(jobName));
+		assertTrue(names.contains(jobName));
 
 		long exec1 = operator.startNextInstance(jobName);
 		long exec2 = operator.startNextInstance(jobName);
@@ -134,8 +134,8 @@ void testMultipleSimultaneousInstances() throws Exception {
 		Thread.sleep(1000);
 
 		Set<Long> executions = operator.getRunningExecutions(jobName);
-		Assertions.assertTrue(executions.contains(exec1));
-		Assertions.assertTrue(executions.contains(exec2));
+		assertTrue(executions.contains(exec1));
+		assertTrue(executions.contains(exec2));
 
 		int count = 0;
 		boolean running = operator.getSummary(exec1).contains("STARTED")

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

@@ -41,7 +41,7 @@
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class JobStepFunctionalTests {
+class JobStepFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;

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

@@ -37,7 +37,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/loopFlowSample.xml", "/job-runner-context.xml" })
-public class LoopFlowSampleFunctionalTests {
+class LoopFlowSampleFunctionalTests {
 
 	@Autowired
 	private ItemTrackingTradeItemWriter itemWriter;

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

@@ -49,7 +49,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/mailJob.xml", "/job-runner-context.xml" })
-public class MailJobFunctionalTests {
+class MailJobFunctionalTests {
 
 	private static final String email = "[email protected]";
 
@@ -86,14 +86,14 @@ public void setDataSource(DataSource dataSource) {
 	}
 
 	@BeforeEach
-	public void before() {
+	void before() {
 		mailSender.clear();
 		errorHandler.clear();
 		jdbcTemplate.update("create table USERS (ID INTEGER, NAME VARCHAR(40), EMAIL VARCHAR(20))");
 	}
 
 	@AfterEach
-	public void after() throws Exception {
+	void after() {
 		JdbcTestUtils.dropTables(jdbcTemplate, "USERS");
 	}
 

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

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

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

@@ -31,7 +31,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/multilineOrderJob.xml", "/job-runner-context.xml" })
-public class MultilineOrderJobFunctionalTests {
+class MultilineOrderJobFunctionalTests {
 
 	private static final String ACTUAL = "target/test-outputs/multilineOrderOutput.txt";
 

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

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