Fix null handling and re-enable tests after Batch migration

Add null check for properties in TaskJobLauncherApplicationRunner to
handle cases where StringUtils.splitArrayElementsIntoProperties returns
null instead of an empty Properties object. This prevents potential
NullPointerException when running jobs without command line arguments.

Re-enable previously disabled tests that are now compatible with Spring
Batch 6.x infrastructure package changes. These tests were temporarily
disabled during the migration and have been verified to work correctly
with the new API.

Disable incrementExistingExecution test as Spring Batch 7.x currently
does not allow incrementers to set the `identifying` flag to true. This
test will remain disabled until the upstream framework supports this
functionality.

Update test configurations to properly initialize `JobRegistry` beans
and adjust imports to align with Spring Batch 7.x autoconfiguration
requirements.

Author: cppwfs

spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunner.java

@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -107,7 +108,11 @@ public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
 	@Override
 	public void run(String... args) throws JobExecutionException {
 		logger.info("Running default command line with: " + Arrays.asList(args));
-		launchJobFromProperties(StringUtils.splitArrayElementsIntoProperties(args, "="));
+		Properties properties = StringUtils.splitArrayElementsIntoProperties(args, "=");
+		if (properties == null) {
+			properties = new Properties();
+		}
+		launchJobFromProperties(properties);
 		monitorJobExecutions();
 	}
 

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerCoreTests.java

@@ -21,6 +21,7 @@
 
 import javax.sql.DataSource;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
@@ -77,6 +78,19 @@ void basicExecution() {
 		});
 	}
 
+	@Disabled("Disabled until Spring Batch allows a incrementer to set identifyable to true.")
+	@Test
+	void incrementExistingExecution() {
+		this.contextRunner.run((context) -> {
+			JobLauncherApplicationRunnerContext jobLauncherContext = new JobLauncherApplicationRunnerContext(context);
+			Job job = jobLauncherContext.configureJob().incrementer(new RunIdIncrementer()).build();
+
+			jobLauncherContext.runner.execute(job, new JobParameters());
+			jobLauncherContext.runner.execute(job, new JobParameters());
+			assertThat(jobLauncherContext.jobInstances()).hasSize(2);
+		});
+	}
+
 	@Test
 	void runDifferentInstances() {
 		this.contextRunner.run((context) -> {

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java

@@ -26,8 +26,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
+import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository;
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
@@ -37,6 +39,7 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
@@ -83,7 +86,6 @@ public void tearDown() {
 		}
 	}
 
-	@Disabled
 	@Test
 	public void testTaskJobLauncherCLRSuccessFail() {
 		String[] enabledArgs = new String[] { "--spring.cloud.task.batch.failOnJobFailure=true" };
@@ -103,7 +105,6 @@ public void testTaskJobLauncherCLRSuccessFailWithAnnotation() {
 				TaskJobLauncherApplicationRunnerTests.JobWithFailureAnnotatedConfiguration.class, enabledArgs);
 	}
 
-	@Disabled
 	@Test
 	public void testTaskJobLauncherCLRSuccessFailWithTaskExecutor() {
 		String[] enabledArgs = new String[] { "--spring.cloud.task.batch.failOnJobFailure=true",
@@ -112,7 +113,6 @@ public void testTaskJobLauncherCLRSuccessFailWithTaskExecutor() {
 				TaskJobLauncherApplicationRunnerTests.JobWithFailureTaskExecutorConfiguration.class, enabledArgs);
 	}
 
-	@Disabled
 	@Test
 	public void testNoTaskJobLauncher() {
 		String[] enabledArgs = new String[] { "--spring.cloud.task.batch.failOnJobFailure=true",
@@ -123,7 +123,6 @@ public void testNoTaskJobLauncher() {
 		assertThat(jobRepository.getJobNames().size()).isEqualTo(0);
 	}
 
-	@Disabled
 	@Test
 	public void testTaskJobLauncherPickOneJob() {
 		String[] enabledArgs = new String[] { "--spring.cloud.task.batch.fail-on-job-failure=true",
@@ -141,7 +140,6 @@ public void testTaskJobLauncherPickOneJob() {
 		validateContext();
 	}
 
-	@Disabled
 	@Test
 	public void testApplicationRunnerSetToFalse() {
 		String[] enabledArgs = new String[] {};
@@ -198,8 +196,10 @@ public int getEventCounter() {
 	}
 
 	@EnableTask
-	@Import({ EmbeddedDataSourceConfiguration.class, JobExecutionEventListener.class })
-	@ImportAutoConfiguration({ SimpleTaskAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
+	@Import({ JobExecutionEventListener.class })
+	@EnableAutoConfiguration(exclude = TaskJobLauncherAutoConfiguration.class)
+	@EnableBatchProcessing
+	@Configuration
 	public static class JobConfiguration {
 
 		@Bean
@@ -212,6 +212,11 @@ public Job job(JobRepository jobRepository, PlatformTransactionManager transacti
 				.build();
 		}
 
+		@Bean
+		public JobRegistry jobRegistry() {
+			return new MapJobRegistry();
+		}
+
 		@Bean
 		public PlatformTransactionManager transactionManager() {
 			return new ResourcelessTransactionManager();
@@ -233,6 +238,11 @@ public BatchProperties batchProperties() {
 			return new BatchProperties();
 		}
 
+		@Bean
+		public JobRegistry jobRegistry() {
+			return new MapJobRegistry();
+		}
+
 		@Bean
 		DataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource dataSource) {
 			DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
@@ -246,8 +256,8 @@ DataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource dataSo
 	@EnableJdbcJobRepository
 	@ImportAutoConfiguration({ PropertyPlaceholderAutoConfiguration.class, BatchAutoConfiguration.class,
 			TaskBatchAutoConfiguration.class, TaskJobLauncherAutoConfiguration.class, SingleTaskConfiguration.class,
-			SimpleTaskAutoConfiguration.class, TransactionManagerTestConfiguration.class })
-	@Import(EmbeddedDataSourceConfiguration.class)
+			SimpleTaskAutoConfiguration.class, SimpleTaskAutoConfiguration.class })
+	@Import({ EmbeddedDataSourceConfiguration.class, TransactionManagerTestConfiguration.class })
 	@EnableTask
 	public static class JobWithFailureConfiguration {