Batch Boot Runner only supports one job.

Needed to update TaskJobLauncher to support only one job.
Updated tests accordingly
Re-added Added tests removed from M3 release

Author: cppwfs

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<Job> jobs;
 
-	private String jobNames;
+	private String jobName;
 
 	private JobRegistry jobRegistry;
 
@@ -65,14 +65,14 @@ public TaskJobLauncherApplicationRunnerFactoryBean(JobLauncher jobLauncher,
 		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 TaskJobLauncherApplicationRunner getObject() {
 				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);
 

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 void testAutoBuiltDataSourceWithTaskJobLauncherCLROrder() {
 	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 @@ private void validateJobNames(AssertableApplicationContext context, String jobNa
 				.getBean(TaskJobLauncherApplicationRunner.class);
 
 		Object names = ReflectionTestUtils.getField(jobLauncherApplicationRunner,
-				"jobNames");
+				"jobName");
 		assertThat(names).isEqualTo(jobNames);
 	}
 

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 void testMapBased() {
 	@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 void testMultipleJobs() {
 		Set<Long> jobExecutionIds = taskExplorer.getJobExecutionIdsByTaskExecutionId(
 				page.iterator().next().getExecutionId());
 
-		assertThat(jobExecutionIds.size()).isEqualTo(2);
+		assertThat(jobExecutionIds.size()).isEqualTo(1);
 		Iterator<Long> jobExecutionIdsIterator = jobExecutionIds.iterator();
 		assertThat((long) taskExplorer
 				.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next()))
 						.isEqualTo(1);
-		assertThat((long) taskExplorer
-				.getTaskExecutionIdByJobExecutionId(jobExecutionIdsIterator.next()))
-						.isEqualTo(1);
+
 	}
 
 	@Test

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java

@@ -136,7 +136,7 @@ public void testRepositoryNotInitialized() {
 				applicationContextRunner);
 	}
 
-//	@Test
+	@Test
 	public void testMultipleConfigurers() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(
@@ -150,7 +150,7 @@ public void testMultipleConfigurers() {
 				applicationContextRunner);
 	}
 
-//	@Test
+	@Test
 	public void testMultipleDataSources() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java

@@ -28,6 +28,7 @@
 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.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<FinishedSpan> finishedSpans = finishedSpans();
 

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 RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon
 				.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();
-	}
 }

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 void testBatchJobApp(CapturedOutput capturedOutput) throws Exception {
 
 		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);