Skip to content

Commit ff88216

Browse files
committed
Replace deprecated SimpleJobLauncher with TaskExecutorJobLauncher
resolves spring-attic#6059 Signed-off-by: Glenn Renfro <[email protected]>
1 parent 54aca00 commit ff88216

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowTaskConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import javax.sql.DataSource;
2121

2222
import org.springframework.batch.core.explore.JobExplorer;
23-
import org.springframework.batch.core.launch.support.SimpleJobLauncher;
23+
import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
2424
import org.springframework.batch.core.repository.JobRepository;
2525
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
2626
import org.springframework.beans.BeanUtils;
@@ -115,7 +115,7 @@ public JobService jobService(DataSource dataSource, PlatformTransactionManager p
115115
factoryBean.setEnvironment(environment);
116116
factoryBean.setDataSource(dataSource);
117117
factoryBean.setTransactionManager(platformTransactionManager);
118-
factoryBean.setJobLauncher(new SimpleJobLauncher());
118+
factoryBean.setJobLauncher(new TaskExecutorJobLauncher());
119119
factoryBean.setJobExplorer(jobExplorer);
120120
factoryBean.setJobRepository(jobRepository);
121121
factoryBean.setSerializer(new AllInOneExecutionContextSerializer());

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/batch/AbstractSimpleJobServiceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.junit.jupiter.api.Test;
3131
import org.springframework.batch.core.launch.JobExecutionNotRunningException;
3232
import org.springframework.batch.core.launch.NoSuchJobExecutionException;
33+
import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
3334
import org.testcontainers.containers.JdbcDatabaseContainer;
3435

3536
import org.springframework.batch.core.BatchStatus;
@@ -40,7 +41,6 @@
4041
import org.springframework.batch.core.explore.JobExplorer;
4142
import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
4243
import org.springframework.batch.core.launch.NoSuchJobInstanceException;
43-
import org.springframework.batch.core.launch.support.SimpleJobLauncher;
4444
import org.springframework.batch.core.repository.JobRepository;
4545
import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
4646
import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
@@ -374,7 +374,7 @@ public JobService jobService(DataSource dataSource,
374374
factoryBean.setEnvironment(environment);
375375
factoryBean.setDataSource(dataSource);
376376
factoryBean.setTransactionManager(platformTransactionManager);
377-
factoryBean.setJobLauncher(new SimpleJobLauncher());
377+
factoryBean.setJobLauncher(new TaskExecutorJobLauncher());
378378
factoryBean.setJobExplorer(jobExplorer);
379379
factoryBean.setJobRepository(jobRepository);
380380
factoryBean.setSerializer(new AllInOneExecutionContextSerializer());

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteServiceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.batch.core.JobParametersIncrementer;
3333
import org.springframework.batch.core.JobParametersValidator;
3434
import org.springframework.batch.core.launch.JobLauncher;
35-
import org.springframework.batch.core.launch.support.SimpleJobLauncher;
35+
import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
3636
import org.springframework.batch.core.repository.JobRepository;
3737
import org.springframework.batch.test.JobLauncherTestUtils;
3838
import org.springframework.beans.factory.annotation.Autowired;
@@ -185,7 +185,7 @@ public static class DefaultTaskDeleteServiceNoChunkTests extends DefaultTaskDele
185185
}
186186

187187
JobLauncher jobLauncher(JobRepository jobRepository) {
188-
SimpleJobLauncher launcher = new SimpleJobLauncher();
188+
TaskExecutorJobLauncher launcher = new TaskExecutorJobLauncher();
189189
launcher.setJobRepository(jobRepository);
190190
launcher.setTaskExecutor(task -> {
191191
});

0 commit comments

Comments
 (0)