diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherApplicationRunnerFactoryBean.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherApplicationRunnerFactoryBean.java index e689a0b6..d9bbaea1 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherApplicationRunnerFactoryBean.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherApplicationRunnerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class TaskJobLauncherApplicationRunnerFactoryBean private List jobs; - private String jobNames; + private String jobName; private JobRegistry jobRegistry; @@ -65,14 +65,14 @@ public class TaskJobLauncherApplicationRunnerFactoryBean this.jobLauncher = jobLauncher; this.jobExplorer = jobExplorer; this.jobs = jobs; - this.jobNames = taskBatchProperties.getJobNames(); + this.jobName = taskBatchProperties.getJobNames(); this.jobRegistry = jobRegistry; this.taskBatchProperties = taskBatchProperties; - if (StringUtils.hasText(batchProperties.getJob().getNames())) { - this.jobNames = batchProperties.getJob().getNames(); + if (StringUtils.hasText(batchProperties.getJob().getName())) { + this.jobName = batchProperties.getJob().getName(); } else { - this.jobNames = taskBatchProperties.getJobNames(); + this.jobName = taskBatchProperties.getJobNames(); } this.order = taskBatchProperties.getCommandLineRunnerOrder(); this.jobRepository = jobRepository; @@ -88,8 +88,8 @@ public class TaskJobLauncherApplicationRunnerFactoryBean this.jobLauncher, this.jobExplorer, this.jobRepository, this.taskBatchProperties); taskJobLauncherApplicationRunner.setJobs(this.jobs); - if (StringUtils.hasText(this.jobNames)) { - taskJobLauncherApplicationRunner.setJobNames(this.jobNames); + if (StringUtils.hasText(this.jobName)) { + taskJobLauncherApplicationRunner.setJobName(this.jobName); } taskJobLauncherApplicationRunner.setJobRegistry(this.jobRegistry); diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java index f478a9a8..22ea4373 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,10 +70,10 @@ public class TaskJobLauncherAutoConfigurationTests { public void testAutoBuiltDataSourceWithBatchJobNames() { this.contextRunner .withPropertyValues("spring.cloud.task.batch.fail-on-job-failure=true", - "spring.batch.job.names=job1,job2", - "spring.cloud.task.batch.jobNames=foobar") + "spring.batch.job.name=job1", + "spring.cloud.task.batch.jobName=foobar") .run(context -> { - validateJobNames(context, "job1,job2"); + validateJobNames(context, "job1"); }); } @@ -93,7 +93,7 @@ public class TaskJobLauncherAutoConfigurationTests { .getBean(TaskJobLauncherApplicationRunner.class); Object names = ReflectionTestUtils.getField(jobLauncherApplicationRunner, - "jobNames"); + "jobName"); assertThat(names).isEqualTo(jobNames); } diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java index 628632d7..10fbbad1 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -217,7 +217,7 @@ public class TaskBatchExecutionListenerTests { @Test public void testMultipleJobs() { this.applicationContext = SpringApplication.run(MultipleJobConfiguration.class, - ARGS); + "--spring.batch.job.name=job1"); TaskExplorer taskExplorer = this.applicationContext.getBean(TaskExplorer.class); @@ -227,14 +227,12 @@ public class TaskBatchExecutionListenerTests { Set jobExecutionIds = taskExplorer.getJobExecutionIdsByTaskExecutionId( page.iterator().next().getExecutionId()); - assertThat(jobExecutionIds.size()).isEqualTo(2); + assertThat(jobExecutionIds.size()).isEqualTo(1); Iterator jobExecutionIdsIterator = jobExecutionIds.iterator(); assertThat((long) taskExplorer .getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())) .isEqualTo(1); - assertThat((long) taskExplorer - .getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next())) - .isEqualTo(1); + } @Test diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java index eea72277..494b6200 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java @@ -136,7 +136,7 @@ public class SimpleTaskAutoConfigurationTests { applicationContextRunner); } -// @Test + @Test public void testMultipleConfigurers() { ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of( @@ -150,7 +150,7 @@ public class SimpleTaskAutoConfigurationTests { applicationContextRunner); } -// @Test + @Test public void testMultipleDataSources() { ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of( diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java index 992f661d..bd1a5abf 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java @@ -28,6 +28,7 @@ import io.micrometer.tracing.Tracer; import io.micrometer.tracing.brave.bridge.BraveFinishedSpan; import io.micrometer.tracing.exporter.FinishedSpan; import io.micrometer.tracing.test.simple.SpansAssert; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,13 +42,14 @@ import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfigura import org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -//@AutoConfigureObservability +@AutoConfigureObservability @SpringBootTest(classes = ObservationIntegrationTests.Config.class) class ObservationIntegrationTests { @@ -57,7 +59,7 @@ class ObservationIntegrationTests { @Autowired MeterRegistry meterRegistry; -// @Test + @Test void testSuccessfulObservation() { List finishedSpans = finishedSpans(); diff --git a/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java b/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java index 67c244f7..a81c4894 100644 --- a/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java +++ b/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,19 +58,4 @@ public class JobConfiguration { .build()) .build(); } - - @Bean - public Job job2() { - return this.jobBuilderFactory.get("job2") - .start(this.stepBuilderFactory.get("job2step1") - .tasklet(new Tasklet() { - @Override - public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { - logger.info("Job2 was run"); - return RepeatStatus.FINISHED; - } - }) - .build()) - .build(); - } } diff --git a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java index 4f1a5fb9..94aa7c61 100644 --- a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java +++ b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,10 +58,6 @@ public class BatchJobApplicationTests { assertThat(i).isGreaterThan(0); - int j = output.indexOf(JOB_ASSOCIATION_MESSAGE, i + 1); - - assertThat(j).isGreaterThan(i); - String taskTitle = "Demo Batch Job Task"; Pattern pattern = Pattern.compile(taskTitle);