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

Merged MapTaskExecutionTests into TaskExecutionDaoTests

Browse Source 
Removes duplicated code.

Resolves #427
This commit is contained in:
Glenn Renfro
2023-02-24 17:31:45 -05:00
parent 4feaca28bf
commit f7d52e6f12
17 changed files with 164 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ public class JobConfiguration {
TaskRepository taskRepository, @Autowired(required = false) ThreadPoolTaskExecutor executor)
throws Exception {
Resource resource = this.resourceLoader
.getResource("maven://io.spring.cloud:partitioned-batch-job:3.0.0-SNAPSHOT");
.getResource("maven://io.spring.cloud:partitioned-batch-job:3.0.0-SNAPSHOT");
DeployerPartitionHandler partitionHandler = new DeployerPartitionHandler(taskLauncher, jobExplorer, resource,
"workerStep", taskRepository, executor);
@@ -161,14 +161,18 @@ public class JobConfiguration {
@Bean
public Step step1(PartitionHandler partitionHandler) throws Exception {
return new StepBuilder("step1").repository(this.jobRepository)
.partitioner(workerStep().getName(), partitioner()).step(workerStep())
.partitionHandler(partitionHandler).build();
.partitioner(workerStep().getName(), partitioner())
.step(workerStep())
.partitionHandler(partitionHandler)
.build();
}
@Bean
public Step workerStep() {
return new StepBuilder("workerStep").repository(this.jobRepository).tasklet(workerTasklet(null))
.transactionManager(this.transactionManager).build();
return new StepBuilder("workerStep").repository(this.jobRepository)
.tasklet(workerTasklet(null))
.transactionManager(this.transactionManager)
.build();
}
@Bean
@@ -176,7 +180,8 @@ public class JobConfiguration {
public Job partitionedJob(PartitionHandler partitionHandler) throws Exception {
Random random = new Random();
return new JobBuilder("partitionedJob" + random.nextInt()).repository(this.jobRepository)
.start(step1(partitionHandler)).build();
.start(step1(partitionHandler))
.build();
}
}

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

@@ -117,7 +117,8 @@ public class TaskPartitionerTests {
Page<TaskExecution> taskExecutions = this.taskExplorer.findAll(PageRequest.of(0, 10));
assertThat(taskExecutions.getTotalElements()).as("Five rows are expected").isEqualTo(5);
assertThat(this.taskExplorer.getTaskExecutionCountByTaskName("PartitionedBatchJobTask"))
.as("Only One master is expected").isEqualTo(1);
.as("Only One master is expected")
.isEqualTo(1);
for (TaskExecution taskExecution : taskExecutions) {
assertThat(taskExecution.getExitCode().intValue()).as("return code should be 0").isEqualTo(0);
}
@@ -130,8 +131,9 @@ public class TaskPartitionerTests {
public org.h2.tools.Server initH2TCPServer() {
Server server;
try {
server = Server.createTcpServer("-tcp", "-ifNotExists", "-tcpAllowOthers", "-tcpPort",
String.valueOf(randomPort)).start();
server = Server
.createTcpServer("-tcp", "-ifNotExists", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort))
.start();
}
catch (SQLException e) {
throw new IllegalStateException(e);