diff --git a/spring-cloud-task-samples/single-step-batch-job/README.adoc b/spring-cloud-task-samples/single-step-batch-job/README.adoc index 166580be..ecdfd540 100644 --- a/spring-cloud-task-samples/single-step-batch-job/README.adoc +++ b/spring-cloud-task-samples/single-step-batch-job/README.adoc @@ -1,4 +1,4 @@ -= Timestamp Task += Single Step Batch JOb This is a Spring Cloud Task application that autoconfigures a single step Spring Batch job based on the profiles that are active. diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index a14eedaa..ae03a172 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -46,7 +46,6 @@ org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot diff --git a/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java index 5a185a17..4389f114 100644 --- a/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java +++ b/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import javax.sql.DataSource; + import org.h2.tools.Server; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -40,7 +41,6 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.util.SocketUtils; - import static org.assertj.core.api.Assertions.assertThat; /** @@ -71,8 +71,8 @@ public class BatchJobApplicationTests { private File outputFile; @BeforeEach - public void setup() { - outputFile = new File("./result.txt"); + public void setup() throws Exception { + outputFile = new File("result.txt"); initH2TCPServer(); } @@ -130,29 +130,26 @@ public class BatchJobApplicationTests { validateFileResult(); } - public Server initH2TCPServer() { - Server server = null; - try { - if (defaultServer == null) { - server = Server.createTcpServer("-ifNotExists", "-tcp", - "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)) - .start(); - defaultServer = server; - DriverManagerDataSource dataSource = new DriverManagerDataSource(); - dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME); - dataSource.setUrl(DATASOURCE_URL); - dataSource.setUsername(DATASOURCE_USER_NAME); - dataSource.setPassword(DATASOURCE_USER_PASSWORD); - ClassPathResource setupResource = new ClassPathResource( - "schema-h2.sql"); - ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator( - setupResource); - resourceDatabasePopulator.execute(dataSource); - } - } - catch (SQLException e) { - throw new IllegalStateException(e); + public Server initH2TCPServer() throws SQLException { + Server server; + + if (defaultServer == null) { + server = Server.createTcpServer("-ifNotExists", "-tcp", + "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)) + .start(); + defaultServer = server; + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(DATASOURCE_DRIVER_CLASS_NAME); + dataSource.setUrl(DATASOURCE_URL); + dataSource.setUsername(DATASOURCE_USER_NAME); + dataSource.setPassword(DATASOURCE_USER_PASSWORD); + ClassPathResource setupResource = new ClassPathResource( + "schema-h2.sql"); + ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator( + setupResource); + resourceDatabasePopulator.execute(dataSource); } + return defaultServer; }