SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed BatchConfigurer and @EnableBatchProcessing from tests and samples

Browse Source 
TaskJobLauncherApplicationRunnerTests updated

Signed-off-by: Glenn Renfro <grenfro@vmware.com>

Updated Integration tests

Updated Tests for samples
This commit is contained in:
Glenn Renfro
2022-09-21 09:45:33 -04:00
parent 25cf280f78
commit b46278be5d
21 changed files with 281 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-task-samples/batch-events/src/main/java/io/spring/cloud/BatchEventsApplication.java
View File

@@ -21,7 +21,6 @@ import java.util.Arrays;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.job.builder.JobBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.scope.context.ChunkContext;
@@ -42,7 +41,6 @@ import org.springframework.transaction.PlatformTransactionManager;
@EnableTask
@SpringBootApplication
@EnableBatchProcessing
public class BatchEventsApplication {
public static void main(String[] args) {

2
spring-cloud-task-samples/batch-job/src/main/java/io/spring/BatchJobApplication.java
View File

@@ -16,14 +16,12 @@
package io.spring;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.task.configuration.EnableTask;
@EnableTask
@SpringBootApplication
@EnableBatchProcessing
public class BatchJobApplication {
public static void main(String[] args) {

2
spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/PartitionedBatchJobApplication.java
View File

@@ -16,14 +16,12 @@
package io.spring;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.task.configuration.EnableTask;
@EnableTask
@SpringBootApplication
@EnableBatchProcessing
public class PartitionedBatchJobApplication {
public static void main(String[] args) {

9
spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.task.partitioner;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Properties;
import javax.sql.DataSource;
@@ -29,6 +30,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
import org.springframework.boot.sql.init.DatabaseInitializationMode;
import org.springframework.boot.sql.init.DatabaseInitializationSettings;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.task.repository.TaskExecution;
import org.springframework.cloud.task.repository.TaskExplorer;
@@ -91,6 +95,11 @@ public class TaskPartitionerTests {
template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT");
template.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION");
template.execute("DROP TABLE IF EXISTS BATCH_JOB_INSTANCE");
DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
settings.setSchemaLocations(Arrays.asList("classpath:org/springframework/batch/core/schema-h2.sql"));
settings.setMode(DatabaseInitializationMode.ALWAYS);
DataSourceScriptDatabaseInitializer dbInit = new DataSourceScriptDatabaseInitializer(this.dataSource, settings);
boolean result = dbInit.initializeDatabase();
}
@Test

2
spring-cloud-task-samples/single-step-batch-job/src/main/java/io/spring/SingleStepBatchJobApplication.java
View File

@@ -16,14 +16,12 @@
package io.spring;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.task.configuration.EnableTask;
@EnableTask
@SpringBootApplication
@EnableBatchProcessing
public class SingleStepBatchJobApplication {
public static void main(String[] args) {